Skip to contentSkip to conversation

trace,x86: Add config option checking to definitions of mce handlers

PATCH New Seiji Aguchi 2 participants 2 messages Jun 22, 2013 – Jun 23, 2013 x86

lore
Share & tools
lore

Seiji Aguchi

author
#0 lore raw

PATCH 1/1 trace,x86: Add config option checking to definitions of mce handlers

In case CONFIG_X86_MCE_THRESHOLD and CONFIG_X86_THERMAL_VECTOR are disabled, kernel build fails as follows.

arch/x86/built-in.o: In function `trace_threshold_interrupt':
(.entry.text+0x122b): undefined reference to smp_trace_threshold_interrupt' arch/x86/built-in.o: In function trace_thermal_interrupt':
(.entry.text+0x132b): undefined reference to `smp_trace_thermal_interrupt'

In this case, trace_threshold_interrupt/trace_thermal_interrupt are not needed to define.
So, add config option checking to their definitions in entry_64.S.

Signed-off-by Seiji Aguchi <[email protected]>
---
 arch/x86/kernel/entry_64.S |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
arch/x86/kernel/entry_64.S +5 -0
index 11eef43..53d6398 100644
@@ -1188,10 +1188,15 @@ apicinterrupt3 POSTED_INTR_VECTOR \
 	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 \
Signature · 1 line
1.7.1
merge bot
#1 lore raw

[tip:x86/trace] x86/tracing: Add config option checking to the definitions of mce handlers

x86/tracing: Add config option checking to the definitions of mce handlers
Commit-ID:  33e5ff634f07dec26b7ed1fd7f9e32978fe1f2b2
Gitweb:     http://git.kernel.org/tip/33e5ff634f07dec26b7ed1fd7f9e32978fe1f2b2
Author:     Seiji Aguchi <[email protected]>
AuthorDate: Sat, 22 Jun 2013 07:33:30 -0400
Committer:  Ingo Molnar <[email protected]>
CommitDate: Sun, 23 Jun 2013 11:41:36 +0200

x86/tracing: Add config option checking to the definitions of mce handlers

In case CONFIG_X86_MCE_THRESHOLD and CONFIG_X86_THERMAL_VECTOR are disabled, kernel build fails as follows.

arch/x86/built-in.o: In function `trace_threshold_interrupt':
(.entry.text+0x122b): undefined reference to smp_trace_threshold_interrupt' arch/x86/built-in.o: In function trace_thermal_interrupt':
(.entry.text+0x132b): undefined reference to `smp_trace_thermal_interrupt'

In this case, trace_threshold_interrupt/trace_thermal_interrupt are not needed to define.

So, add config option checking to their definitions in entry_64.S.

Signed-off-by Seiji Aguchi <[email protected]>
Cc [email protected]
Link http://lkml.kernel.org/r/[email protected] open here
Signed-off-by Ingo Molnar <[email protected]>
---
 arch/x86/kernel/entry_64.S | 5 +++++
 1 file changed, 5 insertions(+)
arch/x86/kernel/entry_64.S +5 -0
index 11eef43..53d6398 100644
@@ -1188,10 +1188,15 @@ apicinterrupt3 POSTED_INTR_VECTOR \
 	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 \