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

torvalds · torvalds · commit 0dee0e7fbf44 · 2011-04-28T13:13:44.000-07:00
* '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
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);
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -300,6 +300,8 @@ void __init paging_init(void)`
`300`	`300`	`zones_size[ZONE_DMA] = m68k_memory[i].size >> PAGE_SHIFT;`
`301`	`301`	`free_area_init_node(i, zones_size,`
`302`	`302`	`m68k_memory[i].addr >> PAGE_SHIFT, NULL);`
	`303`	`+ if (node_present_pages(i))`
	`304`	`+ node_set_state(i, N_NORMAL_MEMORY);`
`303`	`305`	`}`
`304`	`306`	`}`
`305`	`307`