diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-28 13:13:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-28 13:13:44 -0700 |
| commit | 0dee0e7fbf446b02125a67f7dfe9415880d6564e (patch) | |
| tree | 64299f18e291a2eb436ef69c6fbfedc4d907df4c /arch | |
| parent | 9cab1ba421fbc4c4503ccf4ff61e000c771e8942 (diff) | |
| parent | 4aac0b4815ba592052758f4b468f253d383dc9d6 (diff) | |
| download | linux-0dee0e7fbf446b02125a67f7dfe9415880d6564e.tar.bz2 | |
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
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/m68k/mm/motorola.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/m68k/mm/motorola.c b/arch/m68k/mm/motorola.c index 02b7a03e4226..8b3db1c587fc 100644 --- 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); } } |