[PATCH] Cleanup i386 <linux/init.h> abuses

The following patch cleans up the i386 usage of <linux/init.h>.
This remove <linux/init.h> from <asm-i386/system.h> which did not need
it, <asm-i386/highmem.h> which only had it due to an extern using
__init, which is not needed.

This adds <linux/init.h> to <asm-i386/bugs.h> which actually has
numerous __init functions and adds <linux/init.h> to 9 files inside of
arch/i386 which were indirectly including <linux/init.h> previously.

12 files changed, 12 insertions, 3 deletions

diff --git a/arch/i386/kernel/setup-visws.c b/arch/i386/kernel/setup-visws.c
index 1c8220b82216..4d603e9baa55 100644
--- a/arch/i386/kernel/setup-visws.c
+++ b/arch/i386/kernel/setup-visws.c
@@ -3,6 +3,8 @@
  *  Split out from setup.c by davej@suse.de
  */
 
+#include <linux/init.h>
+
 char visws_board_type = -1;
 char visws_board_rev = -1;
 
diff --git a/arch/i386/mm/ioremap.c b/arch/i386/mm/ioremap.c
index 18a7dda19cc0..f81fae4ff7a9 100644
--- a/arch/i386/mm/ioremap.c
+++ b/arch/i386/mm/ioremap.c
@@ -9,6 +9,7 @@
  */
 
 #include <linux/vmalloc.h>
+#include <linux/init.h>
 #include <asm/io.h>
 #include <asm/pgalloc.h>
 #include <asm/fixmap.h>
diff --git a/arch/i386/pci/acpi.c b/arch/i386/pci/acpi.c
index f04f8ab3d71f..995a61acb857 100644
--- a/arch/i386/pci/acpi.c
+++ b/arch/i386/pci/acpi.c
@@ -1,5 +1,6 @@
 #include <linux/pci.h>
 #include <linux/acpi.h>
+#include <linux/init.h>
 #include "pci.h"
 
 static int __init pci_acpi_init(void)
diff --git a/arch/i386/pci/common.c b/arch/i386/pci/common.c
index 275b05d5ee70..e62369561399 100644
--- a/arch/i386/pci/common.c
+++ b/arch/i386/pci/common.c
@@ -7,6 +7,7 @@
 #include <linux/sched.h>
 #include <linux/pci.h>
 #include <linux/ioport.h>
+#include <linux/init.h>
 
 #include <asm/segment.h>
 #include <asm/io.h>
diff --git a/arch/i386/pci/direct.c b/arch/i386/pci/direct.c
index 887326ccaaf8..aff679e20aaa 100644
--- a/arch/i386/pci/direct.c
+++ b/arch/i386/pci/direct.c
@@ -3,6 +3,7 @@
  */
 
 #include <linux/pci.h>
+#include <linux/init.h>
 #include "pci.h"
 
 /*
diff --git a/arch/i386/pci/fixup.c b/arch/i386/pci/fixup.c
index 3eafff9a005a..7165d0fd549f 100644
--- a/arch/i386/pci/fixup.c
+++ b/arch/i386/pci/fixup.c
@@ -3,6 +3,7 @@
  */
 
 #include <linux/pci.h>
+#include <linux/init.h>
 #include "pci.h"
 
 
diff --git a/arch/i386/pci/legacy.c b/arch/i386/pci/legacy.c
index a98197f0d105..0e5895e5e336 100644
--- a/arch/i386/pci/legacy.c
+++ b/arch/i386/pci/legacy.c
@@ -1,6 +1,7 @@
 /*
  * legacy.c - traditional, old school PCI bus probing
  */
+#include <linux/init.h>
 #include <linux/pci.h>
 #include "pci.h"
 
diff --git a/arch/i386/pci/numa.c b/arch/i386/pci/numa.c
index bbad54cc40db..3feb94f46c10 100644
--- a/arch/i386/pci/numa.c
+++ b/arch/i386/pci/numa.c
@@ -2,6 +2,7 @@
  * numa.c - Low-level PCI access for NUMA-Q machines
  */
 #include <linux/pci.h>
+#include <linux/init.h>
 
 #include "pci.h"
 
diff --git a/arch/i386/pci/pcbios.c b/arch/i386/pci/pcbios.c
index 4d3cec0fa304..8d3b0cb57ccb 100644
--- a/arch/i386/pci/pcbios.c
+++ b/arch/i386/pci/pcbios.c
@@ -3,6 +3,7 @@
  */
 
 #include <linux/pci.h>
+#include <linux/init.h>
 #include "pci.h"
 
 
diff --git a/include/asm-i386/bugs.h b/include/asm-i386/bugs.h
index 1deae4309f86..f236e21749ab 100644
--- a/include/asm-i386/bugs.h
+++ b/include/asm-i386/bugs.h
@@ -21,6 +21,7 @@
  */
 
 #include <linux/config.h>
+#include <linux/init.h>
 #include <asm/processor.h>
 #include <asm/i387.h>
 #include <asm/msr.h>
diff --git a/include/asm-i386/highmem.h b/include/asm-i386/highmem.h
index 2f2f4e8eb0cc..1cba7fc45882 100644
--- a/include/asm-i386/highmem.h
+++ b/include/asm-i386/highmem.h
@@ -21,7 +21,6 @@
 #ifdef __KERNEL__
 
 #include <linux/config.h>
-#include <linux/init.h>
 #include <linux/interrupt.h>
 #include <asm/kmap_types.h>
 #include <asm/tlbflush.h>
@@ -33,7 +32,7 @@ extern pte_t *kmap_pte;
 extern pgprot_t kmap_prot;
 extern pte_t *pkmap_page_table;
 
-extern void kmap_init(void) __init;
+extern void kmap_init(void);
 
 /*
  * Right now we initialize only a single pte table. It can be extended
diff --git a/include/asm-i386/system.h b/include/asm-i386/system.h
index 5b08a294655a..2b05d93da4eb 100644
--- a/include/asm-i386/system.h
+++ b/include/asm-i386/system.h
@@ -3,7 +3,6 @@
 
 #include <linux/config.h>
 #include <linux/kernel.h>
-#include <linux/init.h>
 #include <asm/segment.h>
 #include <linux/bitops.h> /* for LOCK_PREFIX */