From cbaf9bc7910a093b5d55311bfb7e10422114826c Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 30 Jan 2008 13:33:08 +0100
Subject: [PATCH] --- yaml --- r: 80268 b: refs/heads/master c:
 306c142f99caef5a30a0d61a39a956c069941b63 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/arch/x86/mm/ioremap_64.c  | 4 +---
 trunk/include/asm-x86/e820.h    | 3 +++
 trunk/include/asm-x86/e820_64.h | 5 +++++
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index fdd09fbb3de2..81c3423772e4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e91a3b4353577c7d38b77dd1293fc3d0a173e8e6
+refs/heads/master: 306c142f99caef5a30a0d61a39a956c069941b63
diff --git a/trunk/arch/x86/mm/ioremap_64.c b/trunk/arch/x86/mm/ioremap_64.c
index b03db4ca9cad..6fbd3c7932e0 100644
--- a/trunk/arch/x86/mm/ioremap_64.c
+++ b/trunk/arch/x86/mm/ioremap_64.c
@@ -19,6 +19,7 @@
 #include <asm/tlbflush.h>
 #include <asm/cacheflush.h>
 #include <asm/proto.h>
+#include <asm/e820.h>
 
 unsigned long __phys_addr(unsigned long x)
 {
@@ -28,9 +29,6 @@ unsigned long __phys_addr(unsigned long x)
 }
 EXPORT_SYMBOL(__phys_addr);
 
-#define ISA_START_ADDRESS      0xa0000
-#define ISA_END_ADDRESS                0x100000
-
 /*
  * Fix up the linear direct mapping of the kernel to avoid cache attribute
  * conflicts.
diff --git a/trunk/include/asm-x86/e820.h b/trunk/include/asm-x86/e820.h
index 3e214f39fad3..f96f1853bc41 100644
--- a/trunk/include/asm-x86/e820.h
+++ b/trunk/include/asm-x86/e820.h
@@ -22,6 +22,9 @@ struct e820map {
 };
 #endif /* __ASSEMBLY__ */
 
+#define ISA_START_ADDRESS	0xa0000
+#define ISA_END_ADDRESS		0x100000
+
 #ifdef __KERNEL__
 #ifdef CONFIG_X86_32
 # include "e820_32.h"
diff --git a/trunk/include/asm-x86/e820_64.h b/trunk/include/asm-x86/e820_64.h
index 1c7ba8804176..8cba49da4795 100644
--- a/trunk/include/asm-x86/e820_64.h
+++ b/trunk/include/asm-x86/e820_64.h
@@ -26,6 +26,10 @@ extern void e820_reserve_resources(struct resource *code_resource,
 extern void e820_mark_nosave_regions(void);
 extern int e820_any_mapped(unsigned long start, unsigned long end, unsigned type);
 extern int e820_all_mapped(unsigned long start, unsigned long end, unsigned type);
+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);
+extern int is_memory_all_valid(unsigned long start, unsigned long end);
 extern unsigned long e820_hole_size(unsigned long start, unsigned long end);
 
 extern void e820_setup_gap(void);
@@ -38,6 +42,7 @@ extern struct e820map e820;
 
 extern unsigned ebda_addr, ebda_size;
 extern unsigned long nodemap_addr, nodemap_size;
+
 #endif/*!__ASSEMBLY__*/
 
 #endif/*__E820_HEADER*/