From f8ce4ee904817b3649f76ba7662ece2b286c0c24 Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Tue, 13 Feb 2007 13:26:26 +0100
Subject: [PATCH] --- yaml --- r: 48484 b: refs/heads/master c:
 40d22c1b5675e428b3f3f9a945d0bd62e94ca2f1 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/arch/i386/mm/discontig.c | 1 -
 trunk/include/asm-i386/setup.h | 2 ++
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 460feccf2036..2cd195ef8508 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2a57ff1a7051f0936b57342a57c25658d7ca3cc6
+refs/heads/master: 40d22c1b5675e428b3f3f9a945d0bd62e94ca2f1
diff --git a/trunk/arch/i386/mm/discontig.c b/trunk/arch/i386/mm/discontig.c
index e0c390d6ceb5..aa58720f6871 100644
--- a/trunk/arch/i386/mm/discontig.c
+++ b/trunk/arch/i386/mm/discontig.c
@@ -101,7 +101,6 @@ extern void find_max_pfn(void);
 extern void add_one_highpage_init(struct page *, int, int);
 
 extern struct e820map e820;
-extern unsigned long init_pg_tables_end;
 extern unsigned long highend_pfn, highstart_pfn;
 extern unsigned long max_low_pfn;
 extern unsigned long totalram_pages;
diff --git a/trunk/include/asm-i386/setup.h b/trunk/include/asm-i386/setup.h
index 76316275d6f9..0e8077cbfdac 100644
--- a/trunk/include/asm-i386/setup.h
+++ b/trunk/include/asm-i386/setup.h
@@ -77,6 +77,8 @@ int __init sanitize_e820_map(struct e820entry * biosmap, char * pnr_map);
 void __init add_memory_region(unsigned long long start,
 			      unsigned long long size, int type);
 
+extern unsigned long init_pg_tables_end;
+
 #endif /* __ASSEMBLY__ */
 
 #endif  /*  __KERNEL__  */