diff options
author | Bernhard Walle <bwalle@suse.de> | 2008-01-30 07:30:32 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 07:30:32 -0500 |
commit | c9cce83dd1d59f52e2c8f8c7d265ba4854c40785 (patch) | |
tree | 0d6801b5c069e573ee06464c567e838a6764f424 /include/asm-x86/e820_32.h | |
parent | 9773db2a301b089bb95907eec5ad1a2ef7fb4099 (diff) |
x86: remove extern declarations for code, data, bss resources
This patch removes the extern struct resource declarations for
data_resource, code_resource and bss_resource on x86 and declares that
three structures as static as done on other architectures like IA64.
On i386, these structures are moved to setup_32.c (from e820_32.c) because
that's code that is not specific to e820 and also required on EFI systems.
That makes the "extern" reference superfluous.
On x86_64, data_resource, code_resource and bss_resource are passed to
e820_reserve_resources() as arguments just as done on i386 and IA64. That
also avoids the "extern" reference and it's possible to make it static.
Signed-off-by: Bernhard Walle <bwalle@suse.de>
Cc: "Luck, Tony" <tony.luck@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/asm-x86/e820_32.h')
-rw-r--r-- | include/asm-x86/e820_32.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/asm-x86/e820_32.h b/include/asm-x86/e820_32.h index 03f60c690c8a..ae5ea19623fa 100644 --- a/include/asm-x86/e820_32.h +++ b/include/asm-x86/e820_32.h | |||
@@ -12,6 +12,8 @@ | |||
12 | #ifndef __E820_HEADER | 12 | #ifndef __E820_HEADER |
13 | #define __E820_HEADER | 13 | #define __E820_HEADER |
14 | 14 | ||
15 | #include <linux/ioport.h> | ||
16 | |||
15 | #define HIGH_MEMORY (1024*1024) | 17 | #define HIGH_MEMORY (1024*1024) |
16 | 18 | ||
17 | #ifndef __ASSEMBLY__ | 19 | #ifndef __ASSEMBLY__ |
@@ -26,6 +28,9 @@ extern void register_bootmem_low_pages(unsigned long max_low_pfn); | |||
26 | extern void e820_register_memory(void); | 28 | extern void e820_register_memory(void); |
27 | extern void limit_regions(unsigned long long size); | 29 | extern void limit_regions(unsigned long long size); |
28 | extern void print_memory_map(char *who); | 30 | extern void print_memory_map(char *who); |
31 | extern void legacy_init_iomem_resources(struct resource *code_resource, | ||
32 | struct resource *data_resource, | ||
33 | struct resource *bss_resource); | ||
29 | 34 | ||
30 | #if defined(CONFIG_PM) && defined(CONFIG_HIBERNATION) | 35 | #if defined(CONFIG_PM) && defined(CONFIG_HIBERNATION) |
31 | extern void e820_mark_nosave_regions(void); | 36 | extern void e820_mark_nosave_regions(void); |
@@ -35,5 +40,6 @@ static inline void e820_mark_nosave_regions(void) | |||
35 | } | 40 | } |
36 | #endif | 41 | #endif |
37 | 42 | ||
43 | |||
38 | #endif/*!__ASSEMBLY__*/ | 44 | #endif/*!__ASSEMBLY__*/ |
39 | #endif/*__E820_HEADER*/ | 45 | #endif/*__E820_HEADER*/ |