aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-01-30 07:33:08 -0500
committerIngo Molnar <mingo@elte.hu>2008-01-30 07:33:08 -0500
commit306c142f99caef5a30a0d61a39a956c069941b63 (patch)
tree285f37a2483d56978c34f0126740347258b90da8 /include
parente91a3b4353577c7d38b77dd1293fc3d0a173e8e6 (diff)
x86: pat: e820 cleanup
NOP change. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include')
-rw-r--r--include/asm-x86/e820.h3
-rw-r--r--include/asm-x86/e820_64.h5
2 files changed, 8 insertions, 0 deletions
diff --git a/include/asm-x86/e820.h b/include/asm-x86/e820.h
index 3e214f39fad3..f96f1853bc41 100644
--- a/include/asm-x86/e820.h
+++ b/include/asm-x86/e820.h
@@ -22,6 +22,9 @@ struct e820map {
22}; 22};
23#endif /* __ASSEMBLY__ */ 23#endif /* __ASSEMBLY__ */
24 24
25#define ISA_START_ADDRESS 0xa0000
26#define ISA_END_ADDRESS 0x100000
27
25#ifdef __KERNEL__ 28#ifdef __KERNEL__
26#ifdef CONFIG_X86_32 29#ifdef CONFIG_X86_32
27# include "e820_32.h" 30# include "e820_32.h"
diff --git a/include/asm-x86/e820_64.h b/include/asm-x86/e820_64.h
index 1c7ba8804176..8cba49da4795 100644
--- a/include/asm-x86/e820_64.h
+++ b/include/asm-x86/e820_64.h
@@ -26,6 +26,10 @@ extern void e820_reserve_resources(struct resource *code_resource,
26extern void e820_mark_nosave_regions(void); 26extern void e820_mark_nosave_regions(void);
27extern int e820_any_mapped(unsigned long start, unsigned long end, unsigned type); 27extern int e820_any_mapped(unsigned long start, unsigned long end, unsigned type);
28extern int e820_all_mapped(unsigned long start, unsigned long end, unsigned type); 28extern int e820_all_mapped(unsigned long start, unsigned long end, unsigned type);
29extern int e820_any_non_reserved(unsigned long start, unsigned long end);
30extern int is_memory_any_valid(unsigned long start, unsigned long end);
31extern int e820_all_non_reserved(unsigned long start, unsigned long end);
32extern int is_memory_all_valid(unsigned long start, unsigned long end);
29extern unsigned long e820_hole_size(unsigned long start, unsigned long end); 33extern unsigned long e820_hole_size(unsigned long start, unsigned long end);
30 34
31extern void e820_setup_gap(void); 35extern void e820_setup_gap(void);
@@ -38,6 +42,7 @@ extern struct e820map e820;
38 42
39extern unsigned ebda_addr, ebda_size; 43extern unsigned ebda_addr, ebda_size;
40extern unsigned long nodemap_addr, nodemap_size; 44extern unsigned long nodemap_addr, nodemap_size;
45
41#endif/*!__ASSEMBLY__*/ 46#endif/*!__ASSEMBLY__*/
42 47
43#endif/*__E820_HEADER*/ 48#endif/*__E820_HEADER*/