Merge branch 'x86-syscall-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

* 'x86-syscall-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86: Move <asm/asm-offsets.h> from trace_syscalls.c to asm/syscall.h
  x86, um: Fix typo in 32-bit system call modifications
  um: Use $(srctree) not $(KBUILD_SRC)
  x86, um: Mark system call tables readonly
  x86, um: Use the same style generated syscall tables as native
  um: Generate headers before generating user-offsets.s
  um: Run host archheaders, allow use of host generated headers
  kbuild, headers.sh: Don't make archheaders explicitly
  x86, syscall: Allow syscall offset to be symbolic
  x86, syscall: Re-fix typo in comment
  x86: Simplify syscallhdr.sh
  x86: Generate system call tables and unistd_*.h from tables
  checksyscalls: Use arch/x86/syscalls/syscall_32.tbl as source
  x86: Machine-readable syscall tables and scripts to process them
  trace: Include <asm/asm-offsets.h> in trace_syscalls.c
  x86-64, ia32: Move compat_ni_syscall into C and its own file
  x86-64, syscall: Adjust comment spacing and remove typo
  kbuild: Add support for an "archheaders" target
  kbuild: Add support for installing generated asm headers

1 files changed, 14 insertions, 23 deletions

diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
index 22d0e21b4dd7..4af9fd2450a5 100644
--- a/arch/x86/kernel/entry_32.S
+++ b/arch/x86/kernel/entry_32.S
@@ -81,8 +81,6 @@
  * enough to patch inline, increasing performance.
  */
 
-#define nr_syscalls ((syscall_table_size)/4)
-
 #ifdef CONFIG_PREEMPT
 #define preempt_stop(clobbers)  DISABLE_INTERRUPTS(clobbers); TRACE_IRQS_OFF
 #else
@@ -423,7 +421,7 @@ sysenter_past_esp:
         testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
         jnz sysenter_audit
 sysenter_do_call:
-        cmpl $(nr_syscalls), %eax
+        cmpl $(NR_syscalls), %eax
         jae syscall_badsys
         call *sys_call_table(,%eax,4)
         movl %eax,PT_EAX(%esp)
@@ -504,7 +502,7 @@ ENTRY(system_call)
                                         # system call tracing in operation / emulation
         testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
         jnz syscall_trace_entry
-        cmpl $(nr_syscalls), %eax
+        cmpl $(NR_syscalls), %eax
         jae syscall_badsys
 syscall_call:
         call *sys_call_table(,%eax,4)
@@ -654,7 +652,7 @@ syscall_trace_entry:
         movl %esp, %eax
         call syscall_trace_enter
         /* What it returned is what we'll actually use.  */
-        cmpl $(nr_syscalls), %eax
+        cmpl $(NR_syscalls), %eax
         jnae syscall_call
         jmp syscall_exit
 END(syscall_trace_entry)
@@ -694,29 +692,28 @@ END(syscall_badsys)
  * System calls that need a pt_regs pointer.
  */
 #define PTREGSCALL0(name) \
-        ALIGN; \
-ptregs_##name: \
+ENTRY(ptregs_##name) ;  \
         leal 4(%esp),%eax; \
-        jmp sys_##name;
+        jmp sys_##name; \
+ENDPROC(ptregs_##name)
 
 #define PTREGSCALL1(name) \
-        ALIGN; \
-ptregs_##name: \
+ENTRY(ptregs_##name) ; \
         leal 4(%esp),%edx; \
         movl (PT_EBX+4)(%esp),%eax; \
-        jmp sys_##name;
+        jmp sys_##name; \
+ENDPROC(ptregs_##name)
 
 #define PTREGSCALL2(name) \
-        ALIGN; \
-ptregs_##name: \
+ENTRY(ptregs_##name) ; \
         leal 4(%esp),%ecx; \
         movl (PT_ECX+4)(%esp),%edx; \
         movl (PT_EBX+4)(%esp),%eax; \
-        jmp sys_##name;
+        jmp sys_##name; \
+ENDPROC(ptregs_##name)
 
 #define PTREGSCALL3(name) \
-        ALIGN; \
-ptregs_##name: \
+ENTRY(ptregs_##name) ; \
         CFI_STARTPROC; \
         leal 4(%esp),%eax; \
         pushl_cfi %eax; \
@@ -741,8 +738,7 @@ PTREGSCALL2(vm86)
 PTREGSCALL1(vm86old)
 
 /* Clone is an oddball.  The 4th arg is in %edi */
-        ALIGN;
-ptregs_clone:
+ENTRY(ptregs_clone)
         CFI_STARTPROC
         leal 4(%esp),%eax
         pushl_cfi %eax
@@ -1213,11 +1209,6 @@ return_to_handler:
         jmp *%ecx
 #endif
 
-.section .rodata,"a"
-#include "syscall_table_32.S"
-
-syscall_table_size=(.-sys_call_table)
-
 /*
  * Some functions should be protected against kprobes
  */