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};