From 98fbea8ea5fda3786d867c9b576312c10fa85094 Mon Sep 17 00:00:00 2001
From: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Date: Tue, 17 Nov 2009 14:06:18 -0800
Subject: [PATCH] --- yaml --- r: 168703 b: refs/heads/master c:
 e13193319d3a5545c82ed4b724bffd16f87873e3 h: refs/heads/master i:   168701:
 ae1eab0d60f20dcbd85b9e435a7de111143da882   168699:
 e49d5ed64d0648ef2e9f1c96cd0a9960ebb08b8a   168695:
 d1876c258206bbca66c582b45b178fe95022edaf   168687:
 d33f1fa15e2bedde7889bc1759da48ccd904e347   168671:
 d0ecb666b7daa07ddd23460e3597bb33cab56638   168639:
 61b2983e4347dfdb0bc16822d6cf179c2fa45cab   168575:
 a7bdcc0fdef6455ae9a206f9f76a7f5115d117a6   168447:
 9d33d6f7bfdc8580afaccc29bdbbab6aed4168a1 v: v3

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

diff --git a/[refs] b/[refs]
index 177b11f258dc..d0546c673093 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 410d7a979e0bc8386bf26316303809fa5688238c
+refs/heads/master: e13193319d3a5545c82ed4b724bffd16f87873e3
diff --git a/trunk/mm/memory_hotplug.c b/trunk/mm/memory_hotplug.c
index 821dee596377..380aef45c2cf 100644
--- a/trunk/mm/memory_hotplug.c
+++ b/trunk/mm/memory_hotplug.c
@@ -447,7 +447,8 @@ int online_pages(unsigned long pfn, unsigned long nr_pages)
 }
 #endif /* CONFIG_MEMORY_HOTPLUG_SPARSE */
 
-static pg_data_t *hotadd_new_pgdat(int nid, u64 start)
+/* we are OK calling __meminit stuff here - we have CONFIG_MEMORY_HOTPLUG */
+static pg_data_t __ref *hotadd_new_pgdat(int nid, u64 start)
 {
 	struct pglist_data *pgdat;
 	unsigned long zones_size[MAX_NR_ZONES] = {0};