Commit 50da7d0e authored by Tom Rini's avatar Tom Rini

[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.
parent ed913fe2
...@@ -3,6 +3,8 @@ ...@@ -3,6 +3,8 @@
* Split out from setup.c by davej@suse.de * Split out from setup.c by davej@suse.de
*/ */
#include <linux/init.h>
char visws_board_type = -1; char visws_board_type = -1;
char visws_board_rev = -1; char visws_board_rev = -1;
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
*/ */
#include <linux/vmalloc.h> #include <linux/vmalloc.h>
#include <linux/init.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/pgalloc.h> #include <asm/pgalloc.h>
#include <asm/fixmap.h> #include <asm/fixmap.h>
......
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/acpi.h> #include <linux/acpi.h>
#include <linux/init.h>
#include "pci.h" #include "pci.h"
static int __init pci_acpi_init(void) static int __init pci_acpi_init(void)
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/ioport.h> #include <linux/ioport.h>
#include <linux/init.h>
#include <asm/segment.h> #include <asm/segment.h>
#include <asm/io.h> #include <asm/io.h>
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
*/ */
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/init.h>
#include "pci.h" #include "pci.h"
/* /*
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
*/ */
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/init.h>
#include "pci.h" #include "pci.h"
......
/* /*
* legacy.c - traditional, old school PCI bus probing * legacy.c - traditional, old school PCI bus probing
*/ */
#include <linux/init.h>
#include <linux/pci.h> #include <linux/pci.h>
#include "pci.h" #include "pci.h"
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
* numa.c - Low-level PCI access for NUMA-Q machines * numa.c - Low-level PCI access for NUMA-Q machines
*/ */
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/init.h>
#include "pci.h" #include "pci.h"
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
*/ */
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/init.h>
#include "pci.h" #include "pci.h"
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
*/ */
#include <linux/config.h> #include <linux/config.h>
#include <linux/init.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/i387.h> #include <asm/i387.h>
#include <asm/msr.h> #include <asm/msr.h>
......
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <linux/config.h> #include <linux/config.h>
#include <linux/init.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <asm/kmap_types.h> #include <asm/kmap_types.h>
#include <asm/tlbflush.h> #include <asm/tlbflush.h>
...@@ -33,7 +32,7 @@ extern pte_t *kmap_pte; ...@@ -33,7 +32,7 @@ extern pte_t *kmap_pte;
extern pgprot_t kmap_prot; extern pgprot_t kmap_prot;
extern pte_t *pkmap_page_table; 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 * Right now we initialize only a single pte table. It can be extended
......
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
#include <linux/config.h> #include <linux/config.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/init.h>
#include <asm/segment.h> #include <asm/segment.h>
#include <linux/bitops.h> /* for LOCK_PREFIX */ #include <linux/bitops.h> /* for LOCK_PREFIX */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment