Remove NR_syscalls from asm/unistd.h as there is no users to use NR_syscalls macro in mips kernel.
Remove __NR_Linux_syscalls from uapi/asm/unistd.h as there is no users to use NR_syscalls macro in mips kernel.
MAX_SYSCALL_NO can also remove as there is commit 2957c9e61ee9 ("[MIPS] IRIX: Goodbye and thanks for all the fish"), eight years ago.
Signed-off-by: Firoz Khan firoz.khan@linaro.org --- arch/mips/include/asm/unistd.h | 8 -------- arch/mips/include/uapi/asm/unistd.h | 15 --------------- arch/mips/kernel/scall32-o32.S | 3 --- 3 files changed, 26 deletions(-)
diff --git a/arch/mips/include/asm/unistd.h b/arch/mips/include/asm/unistd.h index c68b8ae..d7ee846 100644 --- a/arch/mips/include/asm/unistd.h +++ b/arch/mips/include/asm/unistd.h @@ -14,14 +14,6 @@
#include <uapi/asm/unistd.h>
-#ifdef CONFIG_MIPS32_N32 -#define NR_syscalls (__NR_N32_Linux + __NR_N32_Linux_syscalls) -#elif defined(CONFIG_64BIT) -#define NR_syscalls (__NR_64_Linux + __NR_64_Linux_syscalls) -#else -#define NR_syscalls (__NR_O32_Linux + __NR_O32_Linux_syscalls) -#endif - #ifndef __ASSEMBLY__
#define __ARCH_WANT_NEW_STAT diff --git a/arch/mips/include/uapi/asm/unistd.h b/arch/mips/include/uapi/asm/unistd.h index 6914be5..c897195 100644 --- a/arch/mips/include/uapi/asm/unistd.h +++ b/arch/mips/include/uapi/asm/unistd.h @@ -395,11 +395,6 @@ #define __NR_syscalls 368 #endif
-/* - * Offset of the last Linux o32 flavoured syscall - */ -#define __NR_Linux_syscalls __NR_syscalls - #endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */
#define __NR_O32_Linux 4000 @@ -745,11 +740,6 @@ #define __NR_syscalls 328 #endif
-/* - * Offset of the last Linux 64-bit flavoured syscall - */ -#define __NR_Linux_syscalls __NR_syscalls - #endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */
#define __NR_64_Linux 5000 @@ -1099,11 +1089,6 @@ #define __NR_syscalls 332 #endif
-/* - * Offset of the last N32 flavoured syscall - */ -#define __NR_Linux_syscalls __NR_syscalls - #endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */
#define __NR_N32_Linux 6000 diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S index 91d3c8c..fea6edb 100644 --- a/arch/mips/kernel/scall32-o32.S +++ b/arch/mips/kernel/scall32-o32.S @@ -22,9 +22,6 @@ #include <asm/war.h> #include <asm/asm-offsets.h>
-/* Highest syscall used of any syscall flavour */ -#define MAX_SYSCALL_NO __NR_O32_Linux + __NR_O32_Linux_syscalls - .align 5 NESTED(handle_sys, PT_SIZE, sp) .set noat