Commit
ca444564a947034557a85357b3911d067cac4b8f
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>
Showing
9 changed files
with
7 additions
and
2 deletions
Side-by-side Diff
| ... |
... |
@@ -2,7 +2,6 @@ |
|
2
|
2 |
#define _ASM_X86_APIC_H |
|
3
|
3 |
|
|
4
|
4 |
#include <linux/cpumask.h> |
|
5
|
|
-#include <linux/delay.h> |
|
6
|
5 |
#include <linux/pm.h> |
|
7
|
6 |
|
|
8
|
7 |
#include <asm/alternative.h> |
| ... |
... |
@@ -10,7 +10,6 @@ |
|
10
|
10 |
|
|
11
|
11 |
#include <linux/spinlock.h> /* And spinlocks */ |
|
12
|
12 |
#include <asm/io.h> /* need byte IO */ |
|
13
|
|
-#include <linux/delay.h> |
|
14
|
13 |
|
|
15
|
14 |
#ifdef HAVE_REALLY_SLOW_DMA_CONTROLLER |
|
16
|
15 |
#define dma_outb outb_p |
| ... |
... |
@@ -16,6 +16,7 @@ |
|
16
|
16 |
#include <linux/kprobes.h> |
|
17
|
17 |
#include <linux/nmi.h> |
|
18
|
18 |
#include <linux/module.h> |
|
|
19 |
+#include <linux/delay.h> |
|
19
|
20 |
|
|
20
|
21 |
#ifdef CONFIG_HARDLOCKUP_DETECTOR |
|
21
|
22 |
u64 hw_nmi_get_sample_period(void) |
| ... |
... |
@@ -23,6 +23,7 @@ |
|
23
|
23 |
#include <linux/io.h> |
|
24
|
24 |
#include <linux/pci.h> |
|
25
|
25 |
#include <linux/kdebug.h> |
|
|
26 |
+#include <linux/delay.h> |
|
26
|
27 |
|
|
27
|
28 |
#include <asm/uv/uv_mmrs.h> |
|
28
|
29 |
#include <asm/uv/uv_hub.h> |
| ... |
... |
@@ -8,6 +8,7 @@ |
|
8
|
8 |
#include <linux/seq_file.h> |
|
9
|
9 |
#include <linux/smp.h> |
|
10
|
10 |
#include <linux/ftrace.h> |
|
|
11 |
+#include <linux/delay.h> |
|
11
|
12 |
|
|
12
|
13 |
#include <asm/apic.h> |
|
13
|
14 |
#include <asm/io_apic.h> |
| ... |
... |
@@ -6,6 +6,7 @@ |
|
6
|
6 |
#include <linux/dmi.h> |
|
7
|
7 |
#include <linux/sched.h> |
|
8
|
8 |
#include <linux/tboot.h> |
|
|
9 |
+#include <linux/delay.h> |
|
9
|
10 |
#include <acpi/reboot.h> |
|
10
|
11 |
#include <asm/io.h> |
|
11
|
12 |
#include <asm/apic.h> |
| ... |
... |
@@ -11,6 +11,7 @@ |
|
11
|
11 |
#include <linux/debugfs.h> |
|
12
|
12 |
#include <linux/kernel.h> |
|
13
|
13 |
#include <linux/slab.h> |
|
|
14 |
+#include <linux/delay.h> |
|
14
|
15 |
|
|
15
|
16 |
#include <asm/mmu_context.h> |
|
16
|
17 |
#include <asm/uv/uv.h> |
| ... |
... |
@@ -41,6 +41,7 @@ |
|
41
|
41 |
#include <linux/bitops.h> |
|
42
|
42 |
#include <media/rc-core.h> |
|
43
|
43 |
#include <linux/pci_ids.h> |
|
|
44 |
+#include <linux/delay.h> |
|
44
|
45 |
|
|
45
|
46 |
#include "ite-cir.h" |
|
46
|
47 |
|
| ... |
... |
@@ -138,6 +138,7 @@ |
|
138
|
138 |
#include <linux/spinlock.h> |
|
139
|
139 |
#include <linux/stat.h> |
|
140
|
140 |
#include <linux/bitops.h> |
|
|
141 |
+#include <linux/delay.h> |
|
141
|
142 |
|
|
142
|
143 |
#include <asm/io.h> |
|
143
|
144 |
#include <asm/system.h> |
Ingo Molnar