---

yaml
---
r: 74377
b: refs/heads/master
c: e0dc3a5
h: refs/heads/master
i:
  74375: 973f560
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 164e217cec236f84718676543659181ea300a862
+refs/heads/master: e0dc3a53def41efeabb3f39ad8e9f67e81ca1025

trunk/mm/sparse-vmemmap.c

@@ -34,6 +34,16 @@
  * or to back the page tables that are used to create the mapping.
  * Uses the main allocators if they are available, else bootmem.
  */
+
+static void * __init_refok __earlyonly_bootmem_alloc(int node,
+				unsigned long size,
+				unsigned long align,
+				unsigned long goal)
+{
+	return __alloc_bootmem_node(NODE_DATA(node), size, align, goal);
+}
+
+
 void * __meminit vmemmap_alloc_block(unsigned long size, int node)
 {
 	/* If the main allocator is up use that, fallback to bootmem. */
@@ -44,7 +54,7 @@ void * __meminit vmemmap_alloc_block(unsigned long size, int node)
 			return page_address(page);
 		return NULL;
 	} else
-		return __alloc_bootmem_node(NODE_DATA(node), size, size,
+		return __earlyonly_bootmem_alloc(node, size, size,
 				__pa(MAX_DMA_ADDRESS));
 }