diff options
| author | Seiji Aguchi <seiji.aguchi@hds.com> | 2013-06-22 07:33:30 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-06-23 11:41:36 +0200 |
| commit | 33e5ff634f07dec26b7ed1fd7f9e32978fe1f2b2 (patch) | |
| tree | 8d29f6c7eb6343ac1a9b202b3346af321a18386b /arch/x86 | |
| parent | 83ab85140bc1492f92de263a1c30ea04a0f465f7 (diff) | |
| download | linux-33e5ff634f07dec26b7ed1fd7f9e32978fe1f2b2.tar.gz linux-33e5ff634f07dec26b7ed1fd7f9e32978fe1f2b2.tar.xz | |
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 <seiji.aguchi@hds.com>
Cc: rostedt@goodmis.org
Link: http://lkml.kernel.org/r/51C58B8A.2080808@hds.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kernel/entry_64.S | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index 11eef43f971f..53d639831a6c 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S @@ -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 \ |