aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorYinghai Lu <yhlu.kernel@gmail.com>2008-06-16 13:03:31 -0700
committerIngo Molnar <mingo@elte.hu>2008-07-08 10:38:14 +0200
commit41c094fd3ca54f1a71233049cf136ff94c91f4ae (patch)
tree9ce8de894276e69d30c893700a9b70fb4e176511 /include
parent8c5beb50d3ec915d15c4d38aa37282309a65f14e (diff)
x86: move e820_resource_resources to e820.c
and make 32-bit resource registration more like 64 bit. also move probe_roms back to setup_32.c Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include')
-rw-r--r--include/asm-x86/e820.h1
-rw-r--r--include/asm-x86/e820_32.h4
-rw-r--r--include/asm-x86/e820_64.h1
3 files changed, 1 insertions, 5 deletions
diff --git a/include/asm-x86/e820.h b/include/asm-x86/e820.h
index 77fc24d8916..e860fe758e7 100644
--- a/include/asm-x86/e820.h
+++ b/include/asm-x86/e820.h
@@ -100,6 +100,7 @@ extern void e820_register_active_regions(int nid, unsigned long start_pfn,
unsigned long end_pfn);
extern u64 e820_hole_size(u64 start, u64 end);
extern void finish_e820_parsing(void);
+extern void e820_reserve_resources(void);
#endif /* __ASSEMBLY__ */
diff --git a/include/asm-x86/e820_32.h b/include/asm-x86/e820_32.h
index 9135ce6e617..557b890549f 100644
--- a/include/asm-x86/e820_32.h
+++ b/include/asm-x86/e820_32.h
@@ -20,9 +20,5 @@
extern void setup_memory_map(void);
-extern void init_iomem_resources(struct resource *code_resource,
- struct resource *data_resource,
- struct resource *bss_resource);
-
#endif/*!__ASSEMBLY__*/
#endif/*__E820_HEADER*/
diff --git a/include/asm-x86/e820_64.h b/include/asm-x86/e820_64.h
index 478547c6322..8d992109969 100644
--- a/include/asm-x86/e820_64.h
+++ b/include/asm-x86/e820_64.h
@@ -16,7 +16,6 @@
#ifndef __ASSEMBLY__
extern void setup_memory_region(void);
extern void contig_e820_setup(void);
-extern void e820_reserve_resources(void);
extern int e820_any_non_reserved(unsigned long start, unsigned long end);
extern int is_memory_any_valid(unsigned long start, unsigned long end);
extern int e820_all_non_reserved(unsigned long start, unsigned long end);