From ea4bf0e82492c155cc698253f8a680edd6b81bc1 Mon Sep 17 00:00:00 2001
From: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Date: Tue, 24 May 2011 17:11:31 -0700
Subject: [PATCH] --- yaml --- r: 250873 b: refs/heads/master c:
 839a4fcc8af7412be2efd11f0bd0504757f79f08 h: refs/heads/master i:   250871:
 c2d659bf38149cc2dd89463c722d6465644ac611 v: v3

---
 [refs]                    | 2 +-
 trunk/mm/memory_hotplug.c | 4 ++--
 trunk/mm/page_alloc.c     | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 873f0ec82476..9c8b3476bc84 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 37b23e0525d393d48a7d59f870b3bc061a30ccdb
+refs/heads/master: 839a4fcc8af7412be2efd11f0bd0504757f79f08
diff --git a/trunk/mm/memory_hotplug.c b/trunk/mm/memory_hotplug.c
index 9ca1d604f7cd..2c4edc459fb0 100644
--- a/trunk/mm/memory_hotplug.c
+++ b/trunk/mm/memory_hotplug.c
@@ -400,7 +400,7 @@ static int online_pages_range(unsigned long start_pfn, unsigned long nr_pages,
 }
 
 
-int online_pages(unsigned long pfn, unsigned long nr_pages)
+int __ref online_pages(unsigned long pfn, unsigned long nr_pages)
 {
 	unsigned long onlined_pages = 0;
 	struct zone *zone;
@@ -795,7 +795,7 @@ check_pages_isolated(unsigned long start_pfn, unsigned long end_pfn)
 	return offlined;
 }
 
-static int offline_pages(unsigned long start_pfn,
+static int __ref offline_pages(unsigned long start_pfn,
 		  unsigned long end_pfn, unsigned long timeout)
 {
 	unsigned long pfn, nr_pages, expire;
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
index eb19ba8396c3..56d0be36be9d 100644
--- a/trunk/mm/page_alloc.c
+++ b/trunk/mm/page_alloc.c
@@ -5094,7 +5094,7 @@ void setup_per_zone_wmarks(void)
  *    1TB     101        10GB
  *   10TB     320        32GB
  */
-void calculate_zone_inactive_ratio(struct zone *zone)
+void __meminit calculate_zone_inactive_ratio(struct zone *zone)
 {
 	unsigned int gb, ratio;
 
@@ -5108,7 +5108,7 @@ void calculate_zone_inactive_ratio(struct zone *zone)
 	zone->inactive_ratio = ratio;
 }
 
-static void __init setup_per_zone_inactive_ratio(void)
+static void __meminit setup_per_zone_inactive_ratio(void)
 {
 	struct zone *zone;