When we get nanoMIPS support we'll be introducing the p32 ABI, and there's a reasonable chance that the equivalent p64 ABI may come along in the future. Using 'n64' now would avoid confusion in that case where we may have 2 different 64-bit ABIs.
Suggested-by: Paul Burton paul.burton@mips.com Signed-off-by: Firoz Khan firoz.khan@linaro.org --- arch/mips/include/uapi/asm/unistd.h | 4 ++-- arch/mips/kernel/Makefile | 2 +- arch/mips/kernel/ftrace.c | 4 ++-- arch/mips/kernel/{scall64-64.S => scall64-n64.S} | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) rename arch/mips/kernel/{scall64-64.S => scall64-n64.S} (99%)
diff --git a/arch/mips/include/uapi/asm/unistd.h b/arch/mips/include/uapi/asm/unistd.h index c897195..baea6e4 100644 --- a/arch/mips/include/uapi/asm/unistd.h +++ b/arch/mips/include/uapi/asm/unistd.h @@ -742,8 +742,8 @@
#endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */
-#define __NR_64_Linux 5000 -#define __NR_64_Linux_syscalls 328 +#define __NR_N64_Linux 5000 +#define __NR_N64_Linux_syscalls 328
#if _MIPS_SIM == _MIPS_SIM_NABI32
diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile index 210c280..25af613 100644 --- a/arch/mips/kernel/Makefile +++ b/arch/mips/kernel/Makefile @@ -72,7 +72,7 @@ obj-$(CONFIG_IRQ_GT641XX) += irq-gt641xx.o
obj-$(CONFIG_KPROBES) += kprobes.o obj-$(CONFIG_32BIT) += scall32-o32.o -obj-$(CONFIG_64BIT) += scall64-64.o +obj-$(CONFIG_64BIT) += scall64-n64.o obj-$(CONFIG_MIPS32_COMPAT) += linux32.o ptrace32.o signal32.o obj-$(CONFIG_MIPS32_N32) += binfmt_elfn32.o scall64-n32.o signal_n32.o obj-$(CONFIG_MIPS32_O32) += binfmt_elfo32.o scall64-o32.o signal_o32.o diff --git a/arch/mips/kernel/ftrace.c b/arch/mips/kernel/ftrace.c index b122cbb..d91a6e7 100644 --- a/arch/mips/kernel/ftrace.c +++ b/arch/mips/kernel/ftrace.c @@ -403,8 +403,8 @@ unsigned long __init arch_syscall_addr(int nr) if (nr >= __NR_N32_Linux && nr <= __NR_N32_Linux + __NR_N32_Linux_syscalls) return (unsigned long)sysn32_call_table[nr - __NR_N32_Linux]; #endif - if (nr >= __NR_64_Linux && nr <= __NR_64_Linux + __NR_64_Linux_syscalls) - return (unsigned long)sys_call_table[nr - __NR_64_Linux]; + if (nr >= __NR_N64_Linux && nr <= __NR_N64_Linux + __NR_N64_Linux_syscalls) + return (unsigned long)sys_call_table[nr - __NR_N64_Linux]; #ifdef CONFIG_MIPS32_O32 if (nr >= __NR_O32_Linux && nr <= __NR_O32_Linux + __NR_O32_Linux_syscalls) return (unsigned long)sys32_call_table[nr - __NR_O32_Linux]; diff --git a/arch/mips/kernel/scall64-64.S b/arch/mips/kernel/scall64-n64.S similarity index 99% rename from arch/mips/kernel/scall64-64.S rename to arch/mips/kernel/scall64-n64.S index 358d959..497cd62 100644 --- a/arch/mips/kernel/scall64-64.S +++ b/arch/mips/kernel/scall64-n64.S @@ -53,8 +53,8 @@ NESTED(handle_sys64, PT_SIZE, sp) bnez t0, syscall_trace_entry
syscall_common: - dsubu t2, v0, __NR_64_Linux - sltiu t0, t2, __NR_64_Linux_syscalls + 1 + dsubu t2, v0, __NR_N64_Linux + sltiu t0, t2, __NR_N64_Linux_syscalls + 1 beqz t0, illegal_syscall
dsll t0, t2, 3 # offset into table