Merge branch 'audit.b51' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit...

[linux-2.6] / arch / x86 / kernel / entry_32.S

diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
index 5d80d53eaff8c048d7f4bd831eb21a51625f05b0..2a609dc3271c3dc2008ad740133f314e5ed177b6 100644 (file)
--- a/arch/x86/kernel/entry_32.S
+++ b/arch/x86/kernel/entry_32.S
@@ -1042,18 +1042,10 @@ ENTRY(xen_hypervisor_callback)
        cmpl $xen_iret_end_crit,%eax
        jae  1f
 
-       call xen_iret_crit_fixup
-       jmp  2f
-
-1:     cmpl $xen_sysexit_start_crit,%eax
-       jb   2f
-       cmpl $xen_sysexit_end_crit,%eax
-       jae  2f
-
-       jmp xen_sysexit_crit_fixup
+       jmp  xen_iret_crit_fixup
 
 ENTRY(xen_do_upcall)
-2:     mov %esp, %eax
+1:     mov %esp, %eax
        call xen_evtchn_do_upcall
        jmp  ret_from_intr
        CFI_ENDPROC