Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal

[karo-tx-linux.git] / arch / x86 / kernel / entry_32.S

diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
index 8831176aa5ef09d9ffd99976be4777cbf67bf505..8f3e2dec1df32aa2bafa5cfbd1dbd0ce35e7cdf2 100644 (file)
--- a/arch/x86/kernel/entry_32.S
+++ b/arch/x86/kernel/entry_32.S
@@ -699,51 +699,6 @@ END(syscall_badsys)
  */
        .popsection
 
-/*
- * System calls that need a pt_regs pointer.
- */
-#define PTREGSCALL0(name) \
-ENTRY(ptregs_##name) ;  \
-       leal 4(%esp),%eax; \
-       jmp sys_##name; \
-ENDPROC(ptregs_##name)
-
-#define PTREGSCALL1(name) \
-ENTRY(ptregs_##name) ; \
-       leal 4(%esp),%edx; \
-       movl (PT_EBX+4)(%esp),%eax; \
-       jmp sys_##name; \
-ENDPROC(ptregs_##name)
-
-#define PTREGSCALL2(name) \
-ENTRY(ptregs_##name) ; \
-       leal 4(%esp),%ecx; \
-       movl (PT_ECX+4)(%esp),%edx; \
-       movl (PT_EBX+4)(%esp),%eax; \
-       jmp sys_##name; \
-ENDPROC(ptregs_##name)
-
-#define PTREGSCALL3(name) \
-ENTRY(ptregs_##name) ; \
-       CFI_STARTPROC; \
-       leal 4(%esp),%eax; \
-       pushl_cfi %eax; \
-       movl PT_EDX(%eax),%ecx; \
-       movl PT_ECX(%eax),%edx; \
-       movl PT_EBX(%eax),%eax; \
-       call sys_##name; \
-       addl $4,%esp; \
-       CFI_ADJUST_CFA_OFFSET -4; \
-       ret; \
-       CFI_ENDPROC; \
-ENDPROC(ptregs_##name)
-
-PTREGSCALL1(iopl)
-PTREGSCALL0(sigreturn)
-PTREGSCALL0(rt_sigreturn)
-PTREGSCALL2(vm86)
-PTREGSCALL1(vm86old)
-
 .macro FIXUP_ESPFIX_STACK
 /*
  * Switch back for ESPFIX stack to the normal zerobased stack