From 2b4508cd726f2ac590adfba8643fd59b04a354dc Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Sun, 23 Mar 2008 01:02:05 -0700
Subject: [PATCH] --- yaml --- r: 88943 b: refs/heads/master c:
 86bbc83526a4543db0a4ffed8e4cf679eddd534c h: refs/heads/master i:   88941:
 697974c3c7467ed10ad2da7c4d20a8140ec40909   88939:
 c18910b1b185655ff27f07d93a38dce13cd4cef5   88935:
 2e8ec4e44670be4ea3d182facd635ca65fd95e8a   88927:
 d7416279312cc4fef05aba7de94069b79f346ac5 v: v3

---
 [refs]                          |  2 +-
 trunk/include/asm-x86/e820_64.h | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 016a4ce48f68..8f091ccedc0c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1257d6e0408ba21d72dc3db9ef69d7287c74507b
+refs/heads/master: 86bbc83526a4543db0a4ffed8e4cf679eddd534c
diff --git a/trunk/include/asm-x86/e820_64.h b/trunk/include/asm-x86/e820_64.h
index d38820b31c1c..f478c57eb060 100644
--- a/trunk/include/asm-x86/e820_64.h
+++ b/trunk/include/asm-x86/e820_64.h
@@ -14,22 +14,24 @@
 #include <linux/ioport.h>
 
 #ifndef __ASSEMBLY__
-extern unsigned long find_e820_area(unsigned long start, unsigned long end, 
+extern unsigned long find_e820_area(unsigned long start, unsigned long end,
 				    unsigned long size, unsigned long align);
 extern unsigned long find_e820_area_size(unsigned long start,
 					 unsigned long *sizep,
 					 unsigned long align);
-extern void add_memory_region(unsigned long start, unsigned long size, 
+extern void add_memory_region(unsigned long start, unsigned long size,
 			      int type);
 extern void update_memory_range(u64 start, u64 size, unsigned old_type,
 				unsigned new_type);
 extern void setup_memory_region(void);
-extern void contig_e820_setup(void); 
+extern void contig_e820_setup(void);
 extern unsigned long e820_end_of_ram(void);
 extern void e820_reserve_resources(void);
 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_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);
@@ -37,8 +39,8 @@ 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);
-extern void e820_register_active_regions(int nid,
-				unsigned long start_pfn, unsigned long end_pfn);
+extern void e820_register_active_regions(int nid, unsigned long start_pfn,
+					 unsigned long end_pfn);
 
 extern void finish_e820_parsing(void);