---

yaml --- r: 168703 b: refs/heads/master c: e131933 h: refs/heads/master i: 168701: ae1eab0 168699: e49d5ed 168695: d1876c2 168687: d33f1fa 168671: d0ecb66 168639: 61b2983 168575: a7bdcc0 168447: 9d33d6f v: v3
git-mirror · Nov 18, 2009 · 98fbea8 · 98fbea8
1 parent fe39155
commit 98fbea8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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};