From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 4 Mar 2009 10:47:17 +0000 (+0100)
Subject: x86, mce: fix build failure in arch/x86/kernel/cpu/mcheck/threshold.c
X-Git-Tag: v2.6.30-rc1~2^2~50^2~5^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=73af76dfd1f998dba71d8e8e785cbe77a990bf17;p=linux.git

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>
---

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)
 {