commit 5236eb968ec21c693d463d0494e39b00c1bc174d
author H. Peter Anvin <hpa@linux.intel.com> Mon Jun 24 11:01:09 2013 -0700
committer H. Peter Anvin <hpa@linux.intel.com> Mon Jun 24 11:01:09 2013 -0700
tree 1bb6abc27df94dad156225b7d2ec31d04fd9cdd7
parent 33e5ff634f07dec26b7ed1fd7f9e32978fe1f2b2
parent 2b4bc78956bdcc2bb4c49b3af955be776817e897

Merge remote-tracking branch 'trace/tip/x86/trace' into x86/trace

Fix from Steven Rostedt.

arch/x86/kernel/entry_64.S

diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
index 11eef43..53d6398 100644
--- a/arch/x86/kernel/entry_64.S
+++ b/arch/x86/kernel/entry_64.S
@@ -1188,10 +1188,15 @@
 	kvm_posted_intr_ipi smp_kvm_posted_intr_ipi
 #endif
 
+#ifdef CONFIG_X86_MCE_THRESHOLD
 apicinterrupt THRESHOLD_APIC_VECTOR \
 	threshold_interrupt smp_threshold_interrupt
+#endif
+
+#ifdef CONFIG_X86_THERMAL_VECTOR
 apicinterrupt THERMAL_APIC_VECTOR \
 	thermal_interrupt smp_thermal_interrupt
+#endif
 
 #ifdef CONFIG_SMP
 apicinterrupt CALL_FUNCTION_SINGLE_VECTOR \