diff options
author | H. Peter Anvin <hpa@linux.intel.com> | 2011-11-11 18:48:42 -0500 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2011-11-17 16:35:35 -0500 |
commit | e79a7fccfb2ab10f8753ac634a1c8473e870ae6c (patch) | |
tree | 9a9ebe1068f4d0a04e44c43ff2cf1833f0cda9d0 | |
parent | b7641d2c83aa10031bf45afd82619bfaaedcbc6f (diff) |
x86-64, ia32: Move compat_ni_syscall into C and its own file
Move compat_ni_syscall out of ia32entry.S and into its own .c file.
Although this is a trivial function, it is not performance-critical,
and this will simplify further cleanups.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
-rw-r--r-- | arch/x86/ia32/Makefile | 1 | ||||
-rw-r--r-- | arch/x86/ia32/ia32entry.S | 3 | ||||
-rw-r--r-- | arch/x86/ia32/nosyscall.c | 7 |
3 files changed, 8 insertions, 3 deletions
diff --git a/arch/x86/ia32/Makefile b/arch/x86/ia32/Makefile index 52d0ccfcf6ea..eea9a1c77d38 100644 --- a/arch/x86/ia32/Makefile +++ b/arch/x86/ia32/Makefile | |||
@@ -3,6 +3,7 @@ | |||
3 | # | 3 | # |
4 | 4 | ||
5 | obj-$(CONFIG_IA32_EMULATION) := ia32entry.o sys_ia32.o ia32_signal.o | 5 | obj-$(CONFIG_IA32_EMULATION) := ia32entry.o sys_ia32.o ia32_signal.o |
6 | obj-$(CONFIG_IA32_EMULATION) += nosyscall.o | ||
6 | 7 | ||
7 | sysv-$(CONFIG_SYSVIPC) := ipc32.o | 8 | sysv-$(CONFIG_SYSVIPC) := ipc32.o |
8 | obj-$(CONFIG_IA32_EMULATION) += $(sysv-y) | 9 | obj-$(CONFIG_IA32_EMULATION) += $(sysv-y) |
diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S index a6253ec1b284..59538a777695 100644 --- a/arch/x86/ia32/ia32entry.S +++ b/arch/x86/ia32/ia32entry.S | |||
@@ -453,9 +453,6 @@ ia32_badsys: | |||
453 | movq $-ENOSYS,%rax | 453 | movq $-ENOSYS,%rax |
454 | jmp ia32_sysret | 454 | jmp ia32_sysret |
455 | 455 | ||
456 | quiet_ni_syscall: | ||
457 | movq $-ENOSYS,%rax | ||
458 | ret | ||
459 | CFI_ENDPROC | 456 | CFI_ENDPROC |
460 | 457 | ||
461 | .macro PTREGSCALL label, func, arg | 458 | .macro PTREGSCALL label, func, arg |
diff --git a/arch/x86/ia32/nosyscall.c b/arch/x86/ia32/nosyscall.c new file mode 100644 index 000000000000..51ecd5b4e787 --- /dev/null +++ b/arch/x86/ia32/nosyscall.c | |||
@@ -0,0 +1,7 @@ | |||
1 | #include <linux/kernel.h> | ||
2 | #include <linux/errno.h> | ||
3 | |||
4 | long compat_ni_syscall(void) | ||
5 | { | ||
6 | return -ENOSYS; | ||
7 | } | ||