---
 arch/x86/kernel/e820_32.c |    4 +++-
 arch/x86/kernel/e820_64.c |    2 +-
 include/asm-x86/e820.h    |    3 +--
 3 files changed, 5 insertions(+), 4 deletions(-)

Index: linux-2.6/arch/x86/kernel/e820_64.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/e820_64.c	2008-05-06 11:10:41.000000000 -0700
+++ linux-2.6/arch/x86/kernel/e820_64.c	2008-05-06 11:10:53.000000000 -0700
@@ -181,7 +181,7 @@ again:
  * with type.
  */
 int
-e820_any_mapped(unsigned long start, unsigned long end, unsigned type)
+e820_any_mapped(u64 start, u64, unsigned type)
 {
 	int i;
 
Index: linux-2.6/include/asm-x86/e820.h
===================================================================
--- linux-2.6.orig/include/asm-x86/e820.h	2008-05-06 11:10:53.000000000 -0700
+++ linux-2.6/include/asm-x86/e820.h	2008-05-06 11:11:36.000000000 -0700
@@ -49,8 +49,7 @@ extern struct e820map e820;
 extern void update_e820(void);
 extern int e820_all_mapped(unsigned long start, unsigned long end,
 			   unsigned type);
-extern int e820_any_mapped(unsigned long start, unsigned long end,
-			unsigned type);
+extern int e820_any_mapped(u64 start, u64 end, unsigned type);
 extern void add_memory_region(unsigned long long start,
 			      unsigned long long size, int type);
 extern u64 update_memory_range(u64 start, u64 size, unsigned old_type,
Index: linux-2.6/arch/x86/kernel/e820_32.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/e820_32.c	2008-05-06 11:10:53.000000000 -0700
+++ linux-2.6/arch/x86/kernel/e820_32.c	2008-05-06 11:10:58.000000000 -0700
@@ -736,7 +736,7 @@ static int __init parse_memmap(char *arg
 	return 0;
 }
 early_param("memmap", parse_memmap);
-void __init update_memory_range(u64 start, u64 size, unsigned old_type,
+u64 update_memory_range(u64 start, u64 size, unsigned old_type,
 				unsigned new_type)
 {
 	int i;
@@ -761,7 +761,9 @@ void __init update_memory_range(u64 star
 		add_memory_region(final_start, final_end - final_start,
 					 new_type);
 	}
+	return 0;
 }
+
 void __init update_e820(void)
 {
 	u8 nr_map;