From 1d411d7c09f1a3c2a95f96f8679571bc9b86ce63 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ZenIV.linux.org.uk>
Date: Mon, 12 Sep 2005 18:49:25 +0200
Subject: [PATCH] --- yaml --- r: 8633 b: refs/heads/master c:
 9cdd304b20b921507fa1670aaf751496627c8d9c h: refs/heads/master i:   8631:
 394f967af5d70ebe7035549e4debd2cc0d7f3a00 v: v3

---
 [refs]                                | 2 +-
 trunk/arch/x86_64/kernel/acpi/sleep.c | 1 -
 trunk/arch/x86_64/kernel/apic.c       | 1 -
 trunk/arch/x86_64/kernel/crash.c      | 1 -
 trunk/arch/x86_64/kernel/i8259.c      | 3 ---
 trunk/arch/x86_64/kernel/io_apic.c    | 1 -
 trunk/arch/x86_64/kernel/mpparse.c    | 1 -
 trunk/arch/x86_64/kernel/nmi.c        | 1 -
 trunk/arch/x86_64/kernel/process.c    | 1 -
 trunk/arch/x86_64/kernel/smp.c        | 1 -
 trunk/arch/x86_64/kernel/smpboot.c    | 3 ++-
 trunk/arch/x86_64/kernel/time.c       | 1 -
 trunk/arch/x86_64/kernel/traps.c      | 3 ---
 13 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index 01fb1e0236f2..f8839f5e63af 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff347b221512a83e7b08356729e3e2c14346e29e
+refs/heads/master: 9cdd304b20b921507fa1670aaf751496627c8d9c
diff --git a/trunk/arch/x86_64/kernel/acpi/sleep.c b/trunk/arch/x86_64/kernel/acpi/sleep.c
index 148f6f7ea315..867a0ebee177 100644
--- a/trunk/arch/x86_64/kernel/acpi/sleep.c
+++ b/trunk/arch/x86_64/kernel/acpi/sleep.c
@@ -34,7 +34,6 @@
 #include <linux/slab.h>
 #include <linux/pci.h>
 #include <linux/bootmem.h>
-#include <linux/irq.h>
 #include <linux/acpi.h>
 #include <asm/mpspec.h>
 #include <asm/io.h>
diff --git a/trunk/arch/x86_64/kernel/apic.c b/trunk/arch/x86_64/kernel/apic.c
index a759f4e74557..b6e7715d877f 100644
--- a/trunk/arch/x86_64/kernel/apic.c
+++ b/trunk/arch/x86_64/kernel/apic.c
@@ -18,7 +18,6 @@
 #include <linux/init.h>
 
 #include <linux/mm.h>
-#include <linux/irq.h>
 #include <linux/delay.h>
 #include <linux/bootmem.h>
 #include <linux/smp_lock.h>
diff --git a/trunk/arch/x86_64/kernel/crash.c b/trunk/arch/x86_64/kernel/crash.c
index d7fa4248501c..535e04466079 100644
--- a/trunk/arch/x86_64/kernel/crash.c
+++ b/trunk/arch/x86_64/kernel/crash.c
@@ -11,7 +11,6 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/smp.h>
-#include <linux/irq.h>
 #include <linux/reboot.h>
 #include <linux/kexec.h>
 
diff --git a/trunk/arch/x86_64/kernel/i8259.c b/trunk/arch/x86_64/kernel/i8259.c
index 909fc63c03b6..b2a238b5a17e 100644
--- a/trunk/arch/x86_64/kernel/i8259.c
+++ b/trunk/arch/x86_64/kernel/i8259.c
@@ -18,15 +18,12 @@
 #include <asm/atomic.h>
 #include <asm/system.h>
 #include <asm/io.h>
-#include <asm/irq.h>
 #include <asm/hw_irq.h>
 #include <asm/pgtable.h>
 #include <asm/delay.h>
 #include <asm/desc.h>
 #include <asm/apic.h>
 
-#include <linux/irq.h>
-
 /*
  * Common place to define all x86 IRQ vectors
  *
diff --git a/trunk/arch/x86_64/kernel/io_apic.c b/trunk/arch/x86_64/kernel/io_apic.c
index 0645dc835527..961b519bda56 100644
--- a/trunk/arch/x86_64/kernel/io_apic.c
+++ b/trunk/arch/x86_64/kernel/io_apic.c
@@ -21,7 +21,6 @@
  */
 
 #include <linux/mm.h>
-#include <linux/irq.h>
 #include <linux/interrupt.h>
 #include <linux/init.h>
 #include <linux/delay.h>
diff --git a/trunk/arch/x86_64/kernel/mpparse.c b/trunk/arch/x86_64/kernel/mpparse.c
index 11642526c5b7..f16d38d09daf 100644
--- a/trunk/arch/x86_64/kernel/mpparse.c
+++ b/trunk/arch/x86_64/kernel/mpparse.c
@@ -14,7 +14,6 @@
  */
 
 #include <linux/mm.h>
-#include <linux/irq.h>
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/config.h>
diff --git a/trunk/arch/x86_64/kernel/nmi.c b/trunk/arch/x86_64/kernel/nmi.c
index 330b35794055..4388b8a5bae7 100644
--- a/trunk/arch/x86_64/kernel/nmi.c
+++ b/trunk/arch/x86_64/kernel/nmi.c
@@ -14,7 +14,6 @@
 
 #include <linux/config.h>
 #include <linux/mm.h>
-#include <linux/irq.h>
 #include <linux/delay.h>
 #include <linux/bootmem.h>
 #include <linux/smp_lock.h>
diff --git a/trunk/arch/x86_64/kernel/process.c b/trunk/arch/x86_64/kernel/process.c
index 687ed357e685..b5a89c0bdf59 100644
--- a/trunk/arch/x86_64/kernel/process.c
+++ b/trunk/arch/x86_64/kernel/process.c
@@ -32,7 +32,6 @@
 #include <linux/a.out.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
-#include <linux/irq.h>
 #include <linux/ptrace.h>
 #include <linux/utsname.h>
 #include <linux/random.h>
diff --git a/trunk/arch/x86_64/kernel/smp.c b/trunk/arch/x86_64/kernel/smp.c
index 801db885955c..9db9dda161b4 100644
--- a/trunk/arch/x86_64/kernel/smp.c
+++ b/trunk/arch/x86_64/kernel/smp.c
@@ -12,7 +12,6 @@
 #include <linux/init.h>
 
 #include <linux/mm.h>
-#include <linux/irq.h>
 #include <linux/delay.h>
 #include <linux/spinlock.h>
 #include <linux/smp_lock.h>
diff --git a/trunk/arch/x86_64/kernel/smpboot.c b/trunk/arch/x86_64/kernel/smpboot.c
index 5b7aadbef5f9..e12d7baeb33e 100644
--- a/trunk/arch/x86_64/kernel/smpboot.c
+++ b/trunk/arch/x86_64/kernel/smpboot.c
@@ -44,7 +44,6 @@
 #include <linux/mm.h>
 #include <linux/kernel_stat.h>
 #include <linux/smp_lock.h>
-#include <linux/irq.h>
 #include <linux/bootmem.h>
 #include <linux/thread_info.h>
 #include <linux/module.h>
@@ -58,6 +57,8 @@
 #include <asm/tlbflush.h>
 #include <asm/proto.h>
 #include <asm/nmi.h>
+#include <asm/irq.h>
+#include <asm/hw_irq.h>
 
 /* Number of siblings per CPU package */
 int smp_num_siblings = 1;
diff --git a/trunk/arch/x86_64/kernel/time.c b/trunk/arch/x86_64/kernel/time.c
index 6526a19f70ee..2373cb8b8625 100644
--- a/trunk/arch/x86_64/kernel/time.c
+++ b/trunk/arch/x86_64/kernel/time.c
@@ -18,7 +18,6 @@
 #include <linux/interrupt.h>
 #include <linux/init.h>
 #include <linux/mc146818rtc.h>
-#include <linux/irq.h>
 #include <linux/time.h>
 #include <linux/ioport.h>
 #include <linux/module.h>
diff --git a/trunk/arch/x86_64/kernel/traps.c b/trunk/arch/x86_64/kernel/traps.c
index 77658f7f4e84..1dfeb07d31cc 100644
--- a/trunk/arch/x86_64/kernel/traps.c
+++ b/trunk/arch/x86_64/kernel/traps.c
@@ -47,9 +47,6 @@
 #include <asm/proto.h>
 #include <asm/nmi.h>
 
-#include <linux/irq.h>
-
-
 extern struct gate_struct idt_table[256]; 
 
 asmlinkage void divide_error(void);