Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/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

+2
+2
arch/m68k/mm/motorola.c
··· 300 zones_size[ZONE_DMA] = m68k_memory[i].size >> PAGE_SHIFT; 301 free_area_init_node(i, zones_size, 302 m68k_memory[i].addr >> PAGE_SHIFT, NULL); 303 } 304 } 305
··· 300 zones_size[ZONE_DMA] = m68k_memory[i].size >> PAGE_SHIFT; 301 free_area_init_node(i, zones_size, 302 m68k_memory[i].addr >> PAGE_SHIFT, NULL); 303 + if (node_present_pages(i)) 304 + node_set_state(i, N_NORMAL_MEMORY); 305 } 306 } 307