diff --git a/[refs] b/[refs] index 0385269b4606..8d900c9ff172 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8d1b87530e7df5c9541a69910ef7f786f034eca0 +refs/heads/master: e228929bc257b963523ed75aa60d2ad77ece2189 diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c index 43cb3b3e1679..40954fb81598 100644 --- a/trunk/mm/page_alloc.c +++ b/trunk/mm/page_alloc.c @@ -138,7 +138,7 @@ static unsigned long __meminitdata dma_reserve; #endif /* CONFIG_MEMORY_HOTPLUG_RESERVE */ unsigned long __initdata required_kernelcore; unsigned long __initdata required_movablecore; - unsigned long __initdata zone_movable_pfn[MAX_NUMNODES]; + unsigned long __meminitdata zone_movable_pfn[MAX_NUMNODES]; /* movable_zone is the "real" zone pages in ZONE_MOVABLE are taken from */ int movable_zone;