diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-03-04 11:47:17 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-04 11:48:28 +0100 |
commit | 73af76dfd1f998dba71d8e8e785cbe77a990bf17 (patch) | |
tree | f0396f6b9730078188e6db382d838b763a61bd6c | |
parent | Merge branch 'x86/core' into x86/mce2 (diff) | |
download | linux-73af76dfd1f998dba71d8e8e785cbe77a990bf17.tar.xz linux-73af76dfd1f998dba71d8e8e785cbe77a990bf17.zip |
x86, mce: fix build failure in arch/x86/kernel/cpu/mcheck/threshold.c
Impact: build fix
The APIC code rewrite in the x86 tree broke the x86/mce branch:
arch/x86/kernel/cpu/mcheck/threshold.c: In function ‘mce_threshold_interrupt’:
arch/x86/kernel/cpu/mcheck/threshold.c:24: error: implicit declaration of function ‘ack_APIC_irq’
Also tidy up the file a bit while at it.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r-- | arch/x86/kernel/cpu/mcheck/threshold.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/threshold.c b/arch/x86/kernel/cpu/mcheck/threshold.c index e4b8a3833fc5..23ee9e730f78 100644 --- a/arch/x86/kernel/cpu/mcheck/threshold.c +++ b/arch/x86/kernel/cpu/mcheck/threshold.c @@ -1,9 +1,13 @@ -/* Common corrected MCE threshold handler code */ -#include <linux/kernel.h> +/* + * Common corrected MCE threshold handler code: + */ #include <linux/interrupt.h> -#include <asm/mce.h> +#include <linux/kernel.h> + #include <asm/irq_vectors.h> +#include <asm/apic.h> #include <asm/idle.h> +#include <asm/mce.h> static void default_threshold_interrupt(void) { |