diff options
Diffstat (limited to 'arch/x86_64')
-rw-r--r-- | arch/x86_64/kernel/acpi/sleep.c | 1 | ||||
-rw-r--r-- | arch/x86_64/kernel/apic.c | 1 | ||||
-rw-r--r-- | arch/x86_64/kernel/crash.c | 1 | ||||
-rw-r--r-- | arch/x86_64/kernel/i8259.c | 3 | ||||
-rw-r--r-- | arch/x86_64/kernel/io_apic.c | 1 | ||||
-rw-r--r-- | arch/x86_64/kernel/mpparse.c | 1 | ||||
-rw-r--r-- | arch/x86_64/kernel/nmi.c | 1 | ||||
-rw-r--r-- | arch/x86_64/kernel/process.c | 1 | ||||
-rw-r--r-- | arch/x86_64/kernel/smp.c | 1 | ||||
-rw-r--r-- | arch/x86_64/kernel/smpboot.c | 3 | ||||
-rw-r--r-- | arch/x86_64/kernel/time.c | 1 | ||||
-rw-r--r-- | arch/x86_64/kernel/traps.c | 3 |
12 files changed, 2 insertions, 16 deletions
diff --git a/arch/x86_64/kernel/acpi/sleep.c b/arch/x86_64/kernel/acpi/sleep.c index 148f6f7ea315..867a0ebee177 100644 --- a/arch/x86_64/kernel/acpi/sleep.c +++ b/arch/x86_64/kernel/acpi/sleep.c | |||
@@ -34,7 +34,6 @@ | |||
34 | #include <linux/slab.h> | 34 | #include <linux/slab.h> |
35 | #include <linux/pci.h> | 35 | #include <linux/pci.h> |
36 | #include <linux/bootmem.h> | 36 | #include <linux/bootmem.h> |
37 | #include <linux/irq.h> | ||
38 | #include <linux/acpi.h> | 37 | #include <linux/acpi.h> |
39 | #include <asm/mpspec.h> | 38 | #include <asm/mpspec.h> |
40 | #include <asm/io.h> | 39 | #include <asm/io.h> |
diff --git a/arch/x86_64/kernel/apic.c b/arch/x86_64/kernel/apic.c index a759f4e74557..b6e7715d877f 100644 --- a/arch/x86_64/kernel/apic.c +++ b/arch/x86_64/kernel/apic.c | |||
@@ -18,7 +18,6 @@ | |||
18 | #include <linux/init.h> | 18 | #include <linux/init.h> |
19 | 19 | ||
20 | #include <linux/mm.h> | 20 | #include <linux/mm.h> |
21 | #include <linux/irq.h> | ||
22 | #include <linux/delay.h> | 21 | #include <linux/delay.h> |
23 | #include <linux/bootmem.h> | 22 | #include <linux/bootmem.h> |
24 | #include <linux/smp_lock.h> | 23 | #include <linux/smp_lock.h> |
diff --git a/arch/x86_64/kernel/crash.c b/arch/x86_64/kernel/crash.c index d7fa4248501c..535e04466079 100644 --- a/arch/x86_64/kernel/crash.c +++ b/arch/x86_64/kernel/crash.c | |||
@@ -11,7 +11,6 @@ | |||
11 | #include <linux/types.h> | 11 | #include <linux/types.h> |
12 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
13 | #include <linux/smp.h> | 13 | #include <linux/smp.h> |
14 | #include <linux/irq.h> | ||
15 | #include <linux/reboot.h> | 14 | #include <linux/reboot.h> |
16 | #include <linux/kexec.h> | 15 | #include <linux/kexec.h> |
17 | 16 | ||
diff --git a/arch/x86_64/kernel/i8259.c b/arch/x86_64/kernel/i8259.c index 909fc63c03b6..b2a238b5a17e 100644 --- a/arch/x86_64/kernel/i8259.c +++ b/arch/x86_64/kernel/i8259.c | |||
@@ -18,15 +18,12 @@ | |||
18 | #include <asm/atomic.h> | 18 | #include <asm/atomic.h> |
19 | #include <asm/system.h> | 19 | #include <asm/system.h> |
20 | #include <asm/io.h> | 20 | #include <asm/io.h> |
21 | #include <asm/irq.h> | ||
22 | #include <asm/hw_irq.h> | 21 | #include <asm/hw_irq.h> |
23 | #include <asm/pgtable.h> | 22 | #include <asm/pgtable.h> |
24 | #include <asm/delay.h> | 23 | #include <asm/delay.h> |
25 | #include <asm/desc.h> | 24 | #include <asm/desc.h> |
26 | #include <asm/apic.h> | 25 | #include <asm/apic.h> |
27 | 26 | ||
28 | #include <linux/irq.h> | ||
29 | |||
30 | /* | 27 | /* |
31 | * Common place to define all x86 IRQ vectors | 28 | * Common place to define all x86 IRQ vectors |
32 | * | 29 | * |
diff --git a/arch/x86_64/kernel/io_apic.c b/arch/x86_64/kernel/io_apic.c index 0645dc835527..961b519bda56 100644 --- a/arch/x86_64/kernel/io_apic.c +++ b/arch/x86_64/kernel/io_apic.c | |||
@@ -21,7 +21,6 @@ | |||
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include <linux/mm.h> | 23 | #include <linux/mm.h> |
24 | #include <linux/irq.h> | ||
25 | #include <linux/interrupt.h> | 24 | #include <linux/interrupt.h> |
26 | #include <linux/init.h> | 25 | #include <linux/init.h> |
27 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
diff --git a/arch/x86_64/kernel/mpparse.c b/arch/x86_64/kernel/mpparse.c index 11642526c5b7..f16d38d09daf 100644 --- a/arch/x86_64/kernel/mpparse.c +++ b/arch/x86_64/kernel/mpparse.c | |||
@@ -14,7 +14,6 @@ | |||
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include <linux/mm.h> | 16 | #include <linux/mm.h> |
17 | #include <linux/irq.h> | ||
18 | #include <linux/init.h> | 17 | #include <linux/init.h> |
19 | #include <linux/delay.h> | 18 | #include <linux/delay.h> |
20 | #include <linux/config.h> | 19 | #include <linux/config.h> |
diff --git a/arch/x86_64/kernel/nmi.c b/arch/x86_64/kernel/nmi.c index 330b35794055..4388b8a5bae7 100644 --- a/arch/x86_64/kernel/nmi.c +++ b/arch/x86_64/kernel/nmi.c | |||
@@ -14,7 +14,6 @@ | |||
14 | 14 | ||
15 | #include <linux/config.h> | 15 | #include <linux/config.h> |
16 | #include <linux/mm.h> | 16 | #include <linux/mm.h> |
17 | #include <linux/irq.h> | ||
18 | #include <linux/delay.h> | 17 | #include <linux/delay.h> |
19 | #include <linux/bootmem.h> | 18 | #include <linux/bootmem.h> |
20 | #include <linux/smp_lock.h> | 19 | #include <linux/smp_lock.h> |
diff --git a/arch/x86_64/kernel/process.c b/arch/x86_64/kernel/process.c index 687ed357e685..b5a89c0bdf59 100644 --- a/arch/x86_64/kernel/process.c +++ b/arch/x86_64/kernel/process.c | |||
@@ -32,7 +32,6 @@ | |||
32 | #include <linux/a.out.h> | 32 | #include <linux/a.out.h> |
33 | #include <linux/interrupt.h> | 33 | #include <linux/interrupt.h> |
34 | #include <linux/delay.h> | 34 | #include <linux/delay.h> |
35 | #include <linux/irq.h> | ||
36 | #include <linux/ptrace.h> | 35 | #include <linux/ptrace.h> |
37 | #include <linux/utsname.h> | 36 | #include <linux/utsname.h> |
38 | #include <linux/random.h> | 37 | #include <linux/random.h> |
diff --git a/arch/x86_64/kernel/smp.c b/arch/x86_64/kernel/smp.c index 801db885955c..9db9dda161b4 100644 --- a/arch/x86_64/kernel/smp.c +++ b/arch/x86_64/kernel/smp.c | |||
@@ -12,7 +12,6 @@ | |||
12 | #include <linux/init.h> | 12 | #include <linux/init.h> |
13 | 13 | ||
14 | #include <linux/mm.h> | 14 | #include <linux/mm.h> |
15 | #include <linux/irq.h> | ||
16 | #include <linux/delay.h> | 15 | #include <linux/delay.h> |
17 | #include <linux/spinlock.h> | 16 | #include <linux/spinlock.h> |
18 | #include <linux/smp_lock.h> | 17 | #include <linux/smp_lock.h> |
diff --git a/arch/x86_64/kernel/smpboot.c b/arch/x86_64/kernel/smpboot.c index 5b7aadbef5f9..e12d7baeb33e 100644 --- a/arch/x86_64/kernel/smpboot.c +++ b/arch/x86_64/kernel/smpboot.c | |||
@@ -44,7 +44,6 @@ | |||
44 | #include <linux/mm.h> | 44 | #include <linux/mm.h> |
45 | #include <linux/kernel_stat.h> | 45 | #include <linux/kernel_stat.h> |
46 | #include <linux/smp_lock.h> | 46 | #include <linux/smp_lock.h> |
47 | #include <linux/irq.h> | ||
48 | #include <linux/bootmem.h> | 47 | #include <linux/bootmem.h> |
49 | #include <linux/thread_info.h> | 48 | #include <linux/thread_info.h> |
50 | #include <linux/module.h> | 49 | #include <linux/module.h> |
@@ -58,6 +57,8 @@ | |||
58 | #include <asm/tlbflush.h> | 57 | #include <asm/tlbflush.h> |
59 | #include <asm/proto.h> | 58 | #include <asm/proto.h> |
60 | #include <asm/nmi.h> | 59 | #include <asm/nmi.h> |
60 | #include <asm/irq.h> | ||
61 | #include <asm/hw_irq.h> | ||
61 | 62 | ||
62 | /* Number of siblings per CPU package */ | 63 | /* Number of siblings per CPU package */ |
63 | int smp_num_siblings = 1; | 64 | int smp_num_siblings = 1; |
diff --git a/arch/x86_64/kernel/time.c b/arch/x86_64/kernel/time.c index 6526a19f70ee..2373cb8b8625 100644 --- a/arch/x86_64/kernel/time.c +++ b/arch/x86_64/kernel/time.c | |||
@@ -18,7 +18,6 @@ | |||
18 | #include <linux/interrupt.h> | 18 | #include <linux/interrupt.h> |
19 | #include <linux/init.h> | 19 | #include <linux/init.h> |
20 | #include <linux/mc146818rtc.h> | 20 | #include <linux/mc146818rtc.h> |
21 | #include <linux/irq.h> | ||
22 | #include <linux/time.h> | 21 | #include <linux/time.h> |
23 | #include <linux/ioport.h> | 22 | #include <linux/ioport.h> |
24 | #include <linux/module.h> | 23 | #include <linux/module.h> |
diff --git a/arch/x86_64/kernel/traps.c b/arch/x86_64/kernel/traps.c index 77658f7f4e84..1dfeb07d31cc 100644 --- a/arch/x86_64/kernel/traps.c +++ b/arch/x86_64/kernel/traps.c | |||
@@ -47,9 +47,6 @@ | |||
47 | #include <asm/proto.h> | 47 | #include <asm/proto.h> |
48 | #include <asm/nmi.h> | 48 | #include <asm/nmi.h> |
49 | 49 | ||
50 | #include <linux/irq.h> | ||
51 | |||
52 | |||
53 | extern struct gate_struct idt_table[256]; | 50 | extern struct gate_struct idt_table[256]; |
54 | 51 | ||
55 | asmlinkage void divide_error(void); | 52 | asmlinkage void divide_error(void); |