summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/apic/hw_nmi.c
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2011-03-25 15:20:14 +0100
committerIngo Molnar <mingo@elte.hu>2011-03-29 09:37:42 +0200
commitca444564a947034557a85357b3911d067cac4b8f (patch)
tree6c13c7d5fc9be1d65fc8b0d7aea5cb2cd50667d3 /arch/x86/kernel/apic/hw_nmi.c
parent89078d572eb9ce8d4c04264b8b0ba86de0d74c8f (diff)
downloadtalos-obmc-linux-ca444564a947034557a85357b3911d067cac4b8f.tar.gz
talos-obmc-linux-ca444564a947034557a85357b3911d067cac4b8f.zip
x86: Stop including <linux/delay.h> in two asm header files
Stop including <linux/delay.h> in x86 header files which don't need it. This will let the compiler complain when this header is not included by source files when it should, so that contributors can fix the problem before building on other architectures starts to fail. Credits go to Geert for the idea. Signed-off-by: Jean Delvare <khali@linux-fr.org> Cc: James E.J. Bottomley <James.Bottomley@suse.de> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Stephen Rothwell <sfr@canb.auug.org.au> LKML-Reference: <20110325152014.297890ec@endymion.delvare> [ this also fixes an upstream build bug in drivers/media/rc/ite-cir.c ] Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/apic/hw_nmi.c')
-rw-r--r--arch/x86/kernel/apic/hw_nmi.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/apic/hw_nmi.c b/arch/x86/kernel/apic/hw_nmi.c
index c4e557a1ebb6..5260fe91bcb6 100644
--- a/arch/x86/kernel/apic/hw_nmi.c
+++ b/arch/x86/kernel/apic/hw_nmi.c
@@ -16,6 +16,7 @@
#include <linux/kprobes.h>
#include <linux/nmi.h>
#include <linux/module.h>
+#include <linux/delay.h>
#ifdef CONFIG_HARDLOCKUP_DETECTOR
u64 hw_nmi_get_sample_period(void)
OpenPOWER on IntegriCloud