NR_syscalls macro holds the number of system call exist in m68k architecture. This macro is currently the part of asm/unistd.h file. We have to change the value of NR_syscalls, if we add or delete a system call. One of patch in this patch series has a script which will generate a uapi header based on syscall.tbl file. The syscall.tbl file contains the number of system call information. So we have two option to update NR_syscalls value. 1. Update NR_syscalls in asm/unistd.h manually by counting the no.of system calls. No need to update NR_syscalls untill we either add a new system call or delete an existing system call. 2. We can keep this feature it above mentioned script, that'll count the number of syscalls and keep it in a generated file. In this case we don't need to explicitly update NR_syscalls in asm/unistd.h file. The 2nd option will be the recommended one. For that, I moved the NR_syscalls macro from asm/unistd.h to uapi/asm/unistd.h. The macro name also changed form NR_syscalls to __NR_syscalls for making the name convention same across all architecture. While __NR_syscalls isn't strictly part of the uapi, having it as part of the generated header to simplifies the implementation. Signed-off-by: Firoz Khan <firoz.khan@xxxxxxxxxx> --- arch/m68k/68000/entry.S | 4 ++-- arch/m68k/coldfire/entry.S | 2 +- arch/m68k/include/asm/unistd.h | 3 --- arch/m68k/include/uapi/asm/unistd.h | 2 ++ arch/m68k/kernel/entry.S | 4 ++-- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/arch/m68k/68000/entry.S b/arch/m68k/68000/entry.S index 259b366..91522e9 100644 --- a/arch/m68k/68000/entry.S +++ b/arch/m68k/68000/entry.S @@ -49,7 +49,7 @@ do_trace: addql #4,%sp movel %sp@(PT_OFF_ORIG_D0),%d1 movel #-ENOSYS,%d0 - cmpl #NR_syscalls,%d1 + cmpl #__NR_syscalls,%d1 jcc 1f lsl #2,%d1 lea sys_call_table, %a0 @@ -80,7 +80,7 @@ ENTRY(system_call) movel %d1,%a2 btst #(TIF_SYSCALL_TRACE%8),%a2@(TINFO_FLAGS+(31-TIF_SYSCALL_TRACE)/8) jne do_trace - cmpl #NR_syscalls,%d0 + cmpl #__NR_syscalls,%d0 jcc badsys lsl #2,%d0 lea sys_call_table,%a0 diff --git a/arch/m68k/coldfire/entry.S b/arch/m68k/coldfire/entry.S index 52d312d..efe777d 100644 --- a/arch/m68k/coldfire/entry.S +++ b/arch/m68k/coldfire/entry.S @@ -64,7 +64,7 @@ ENTRY(system_call) move #0x2000,%sr /* enable intrs again */ GET_CURRENT(%d2) - cmpl #NR_syscalls,%d0 + cmpl #__NR_syscalls,%d0 jcc enosys lea sys_call_table,%a0 lsll #2,%d0 /* movel %a0@(%d0:l:4),%d3 */ diff --git a/arch/m68k/include/asm/unistd.h b/arch/m68k/include/asm/unistd.h index 30d0d3f..52111fb 100644 --- a/arch/m68k/include/asm/unistd.h +++ b/arch/m68k/include/asm/unistd.h @@ -4,9 +4,6 @@ #include <uapi/asm/unistd.h> - -#define NR_syscalls 380 - #define __ARCH_WANT_OLD_READDIR #define __ARCH_WANT_OLD_STAT #define __ARCH_WANT_STAT64 diff --git a/arch/m68k/include/uapi/asm/unistd.h b/arch/m68k/include/uapi/asm/unistd.h index de3054f..b17ae53 100644 --- a/arch/m68k/include/uapi/asm/unistd.h +++ b/arch/m68k/include/uapi/asm/unistd.h @@ -387,4 +387,6 @@ #define __NR_pwritev2 378 #define __NR_statx 379 +#define __NR_syscalls 380 + #endif /* _UAPI_ASM_M68K_UNISTD_H_ */ diff --git a/arch/m68k/kernel/entry.S b/arch/m68k/kernel/entry.S index 97cd3ea..dab0cfd 100644 --- a/arch/m68k/kernel/entry.S +++ b/arch/m68k/kernel/entry.S @@ -161,7 +161,7 @@ do_trace_entry: RESTORE_SWITCH_STACK addql #4,%sp movel %sp@(PT_OFF_ORIG_D0),%d0 - cmpl #NR_syscalls,%d0 + cmpl #__NR_syscalls,%d0 jcs syscall badsys: movel #-ENOSYS,%sp@(PT_OFF_D0) @@ -206,7 +206,7 @@ ENTRY(system_call) | syscall trace? tstb %a1@(TINFO_FLAGS+2) jmi do_trace_entry - cmpl #NR_syscalls,%d0 + cmpl #__NR_syscalls,%d0 jcc badsys syscall: jbsr @(sys_call_table,%d0:l:4)@(0) -- 1.9.1
