| Message ID | 1542189798-27713-3-git-send-email-firoz.khan@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | powerpc: system call table generation support | expand |
On Wed, Nov 14, 2018 at 11:04 AM Firoz Khan <firoz.khan@linaro.org> wrote: > diff --git a/arch/powerpc/include/asm/systbl.h b/arch/powerpc/include/asm/systbl.h > index 01b5171..c4321b9 100644 > --- a/arch/powerpc/include/asm/systbl.h > +++ b/arch/powerpc/include/asm/systbl.h > @@ -76,7 +76,6 @@ > SYSCALL_SPU(ssetmask) > SYSCALL_SPU(setreuid) > SYSCALL_SPU(setregid) > -#define compat_sys_sigsuspend sys_sigsuspend > SYS32ONLY(sigsuspend) I think the macro here is just a workaround for the fact that SYS32ONLY() always prepends the name with 'compat_' for the compat version, and there is no other macro to do this. After the conversion, this can easily be done using the regular table, as you need separate names for the 32-bit entries anyway. > SYSX(sys_ni_syscall,compat_sys_s > diff --git a/arch/powerpc/platforms/cell/spu_callbacks.c b/arch/powerpc/platforms/cell/spu_callbacks.c > index 8ae8620..7517a43 100644 > --- a/arch/powerpc/platforms/cell/spu_callbacks.c > +++ b/arch/powerpc/platforms/cell/spu_callbacks.c > @@ -47,6 +47,7 @@ > #define COMPAT_SPU_NEW(func) sys_##func, > #define SYSX_SPU(f, f3264, f32) f, > > +#define compat_sys_sigsuspend sys_sigsuspend > #include <asm/systbl.h> > }; The spu_callbacks.c and systbl_chk.c files don't need this macro, but that doesn't matter once you drop this patch. Arnd
diff --git a/arch/powerpc/include/asm/systbl.h b/arch/powerpc/include/asm/systbl.h index 01b5171..c4321b9 100644 --- a/arch/powerpc/include/asm/systbl.h +++ b/arch/powerpc/include/asm/systbl.h @@ -76,7 +76,6 @@ SYSCALL_SPU(ssetmask) SYSCALL_SPU(setreuid) SYSCALL_SPU(setregid) -#define compat_sys_sigsuspend sys_sigsuspend SYS32ONLY(sigsuspend) SYSX(sys_ni_syscall,compat_sys_sigpending,sys_sigpending) SYSCALL_SPU(sethostname) diff --git a/arch/powerpc/kernel/systbl.S b/arch/powerpc/kernel/systbl.S index 919a327..9ff1913 100644 --- a/arch/powerpc/kernel/systbl.S +++ b/arch/powerpc/kernel/systbl.S @@ -47,4 +47,5 @@ .globl sys_call_table sys_call_table: +#define compat_sys_sigsuspend sys_sigsuspend #include <asm/systbl.h> diff --git a/arch/powerpc/kernel/systbl_chk.c b/arch/powerpc/kernel/systbl_chk.c index 4653258..db97da7 100644 --- a/arch/powerpc/kernel/systbl_chk.c +++ b/arch/powerpc/kernel/systbl_chk.c @@ -56,5 +56,6 @@ #define getrlimit ugetrlimit START_TABLE +#define compat_sys_sigsuspend sys_sigsuspend #include <asm/systbl.h> END_TABLE NR_syscalls diff --git a/arch/powerpc/platforms/cell/spu_callbacks.c b/arch/powerpc/platforms/cell/spu_callbacks.c index 8ae8620..7517a43 100644 --- a/arch/powerpc/platforms/cell/spu_callbacks.c +++ b/arch/powerpc/platforms/cell/spu_callbacks.c @@ -47,6 +47,7 @@ #define COMPAT_SPU_NEW(func) sys_##func, #define SYSX_SPU(f, f3264, f32) f, +#define compat_sys_sigsuspend sys_sigsuspend #include <asm/systbl.h> };
Move the macro definition for compat_sys_sigsuspend from asm/systbl.h to the file which it is getting included. One of the patch in this patch series is generating uapi header and syscall table files. In order to come up with a common implimentation across all architecture, we need to do this change. This change will simplify the implementation of system call table generation script and help to come up a common implementation across all architecture. Signed-off-by: Firoz Khan <firoz.khan@linaro.org> --- arch/powerpc/include/asm/systbl.h | 1 - arch/powerpc/kernel/systbl.S | 1 + arch/powerpc/kernel/systbl_chk.c | 1 + arch/powerpc/platforms/cell/spu_callbacks.c | 1 + 4 files changed, 3 insertions(+), 1 deletion(-) -- 1.9.1