Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kerne…

…l/git/geert/linux-m68k * 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k/mm: Set all online nodes in N_NORMAL_MEMORY
makiko-fly · Apr 28, 2011 · 0dee0e7 · 0dee0e7
2 parents 9cab1ba + 4aac0b4
commit 0dee0e7
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/arch/m68k/mm/motorola.c b/arch/m68k/mm/motorola.c
@@ -300,6 +300,8 @@ void __init paging_init(void)
 		zones_size[ZONE_DMA] = m68k_memory[i].size >> PAGE_SHIFT;
 		free_area_init_node(i, zones_size,
 				    m68k_memory[i].addr >> PAGE_SHIFT, NULL);
+		if (node_present_pages(i))
+			node_set_state(i, N_NORMAL_MEMORY);
 	}
 }