From 6d048bed74adb578d2970512b06376425743e07d Mon Sep 17 00:00:00 2001
From: Hugh Dickins <hugh.dickins@tiscali.co.uk>
Date: Mon, 21 Sep 2009 17:03:35 -0700
Subject: [PATCH] --- yaml --- r: 164477 b: refs/heads/master c:
 03f6462a3ae78f36eb1f0ee8b4d5ae2f7859c1d5 h: refs/heads/master i:   164475:
 8400266b1947f618150e7e4cd3919c4f7fc6877e v: v3

---
 [refs]                | 2 +-
 trunk/mm/internal.h   | 3 ++-
 trunk/mm/memory.c     | 1 +
 trunk/mm/page_alloc.c | 1 -
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 852f62437dc7..87f4e7a45638 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 62eede62dafb4a6633eae7ffbeb34c60dba5e7b1
+refs/heads/master: 03f6462a3ae78f36eb1f0ee8b4d5ae2f7859c1d5
diff --git a/trunk/mm/internal.h b/trunk/mm/internal.h
index 75596574911e..22ec8d2b0fb8 100644
--- a/trunk/mm/internal.h
+++ b/trunk/mm/internal.h
@@ -37,6 +37,8 @@ static inline void __put_page(struct page *page)
 	atomic_dec(&page->_count);
 }
 
+extern unsigned long highest_memmap_pfn;
+
 /*
  * in mm/vmscan.c:
  */
@@ -46,7 +48,6 @@ extern void putback_lru_page(struct page *page);
 /*
  * in mm/page_alloc.c
  */
-extern unsigned long highest_memmap_pfn;
 extern void __free_pages_bootmem(struct page *page, unsigned int order);
 extern void prep_compound_page(struct page *page, unsigned long order);
 
diff --git a/trunk/mm/memory.c b/trunk/mm/memory.c
index 9bdbd10cb418..b1443ac07c00 100644
--- a/trunk/mm/memory.c
+++ b/trunk/mm/memory.c
@@ -109,6 +109,7 @@ static int __init disable_randmaps(char *s)
 __setup("norandmaps", disable_randmaps);
 
 unsigned long zero_pfn __read_mostly;
+unsigned long highest_memmap_pfn __read_mostly;
 
 /*
  * CONFIG_MMU architectures set up ZERO_PAGE in their paging_init()
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
index 6877e22e3aa1..5717f27a0704 100644
--- a/trunk/mm/page_alloc.c
+++ b/trunk/mm/page_alloc.c
@@ -72,7 +72,6 @@ EXPORT_SYMBOL(node_states);
 
 unsigned long totalram_pages __read_mostly;
 unsigned long totalreserve_pages __read_mostly;
-unsigned long highest_memmap_pfn __read_mostly;
 int percpu_pagelist_fraction;
 gfp_t gfp_allowed_mask __read_mostly = GFP_BOOT_MASK;