- patches.arch/x86_mce_intel_decode_physical_address.patch:

[linux-flexiantxendom0-3.2.10.git] / arch / x86 / kernel / entry_64.S

diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
index d773a99..1909873 100644 (file)
--- a/arch/x86/kernel/entry_64.S
+++ b/arch/x86/kernel/entry_64.S
@@ -1276,7 +1276,7 @@ ENTRY(arch_unwind_init_running)
 END(arch_unwind_init_running)
 #endif
 
-#ifdef CONFIG_PARAVIRT_XEN
+#ifdef CONFIG_XEN
 zeroentry xen_hypervisor_callback xen_do_hypervisor_callback
 
 /*
@@ -1373,34 +1373,7 @@ ENTRY(xen_failsafe_callback)
        CFI_ENDPROC
 END(xen_failsafe_callback)
 
-#endif /* CONFIG_PARAVIRT_XEN */
-
-#ifdef CONFIG_KDB
-
-#ifdef CONFIG_SMP
-apicinterrupt KDB_VECTOR \
-       kdb_interrupt, smp_kdb_interrupt
-#endif /* CONFIG_SMP */
-
-ENTRY(kdb_call)
-       INTR_FRAME
-       cld
-       pushq $-1                       # orig_eax
-       CFI_ADJUST_CFA_OFFSET 8
-       SAVE_ALL
-       movq $1,%rdi                    # KDB_REASON_ENTER
-       movq $0,%rsi                    # error_code
-       movq %rsp,%rdx                  # struct pt_regs
-       call kdb
-       RESTORE_ALL
-       addq $8,%rsp                    # forget orig_eax
-       CFI_ADJUST_CFA_OFFSET -8
-       iretq
-       CFI_ENDPROC
-END(kdb_call)
-
-#endif /* CONFIG_KDB */
-
+#endif /* CONFIG_XEN */
 
 /*
  * Some functions should be protected against kprobes
@@ -1410,7 +1383,7 @@ END(kdb_call)
 paranoidzeroentry_ist debug do_debug DEBUG_STACK
 paranoidzeroentry_ist int3 do_int3 DEBUG_STACK
 paranoiderrorentry stack_segment do_stack_segment
-#ifdef CONFIG_PARAVIRT_XEN
+#ifdef CONFIG_XEN
 zeroentry xen_debug do_debug
 zeroentry xen_int3 do_int3
 errorentry xen_stack_segment do_stack_segment