From dbd30b1d89af2eae33602b5f92486964b74fcd93 Mon Sep 17 00:00:00 2001
From: Vivek Goyal <vgoyal@in.ibm.com>
Date: Thu, 11 Jan 2007 01:52:44 +0100
Subject: [PATCH] --- yaml --- r: 45464 b: refs/heads/master c:
 0e0be25d31f75f64b6fbe00f0b4e5d6b1ad1438e h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/arch/i386/mm/init.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 6c59d54d3e94..3ef76d2dacc5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b92cc55923898ab5e8a78939be9734ab9e1c8f49
+refs/heads/master: 0e0be25d31f75f64b6fbe00f0b4e5d6b1ad1438e
diff --git a/trunk/arch/i386/mm/init.c b/trunk/arch/i386/mm/init.c
index 60a7e57af197..c5c5ea700cc7 100644
--- a/trunk/arch/i386/mm/init.c
+++ b/trunk/arch/i386/mm/init.c
@@ -283,7 +283,7 @@ void __init add_one_highpage_init(struct page *page, int pfn, int bad_ppro)
 		SetPageReserved(page);
 }
 
-static int add_one_highpage_hotplug(struct page *page, unsigned long pfn)
+static int __meminit add_one_highpage_hotplug(struct page *page, unsigned long pfn)
 {
 	free_new_highpage(page);
 	totalram_pages++;
@@ -300,7 +300,7 @@ static int add_one_highpage_hotplug(struct page *page, unsigned long pfn)
  * has been added dynamically that would be
  * onlined here is in HIGHMEM
  */
-void online_page(struct page *page)
+void __meminit online_page(struct page *page)
 {
 	ClearPageReserved(page);
 	add_one_highpage_hotplug(page, page_to_pfn(page));