diff options
| author | Tom Rini <trini@kernel.crashing.org> | 2002-06-04 19:42:57 -0700 |
|---|---|---|
| committer | Tom Rini <trini@kernel.crashing.org> | 2002-06-04 19:42:57 -0700 |
| commit | 50da7d0e7884c4ff01ab8aa9cf467b721ef681bf (patch) | |
| tree | 48bec5b0bb0c5e40cccd4ae2475283d3a7183802 /include | |
| parent | ed913fe20f3e33a93cc8b3dd05b62fe6924cc981 (diff) | |
[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.
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-i386/bugs.h | 1 | ||||
| -rw-r--r-- | include/asm-i386/highmem.h | 3 | ||||
| -rw-r--r-- | include/asm-i386/system.h | 1 |
3 files changed, 2 insertions, 3 deletions
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 */ |