diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-05-24 08:32:20 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-05-24 08:32:20 +0200 |
| commit | 9fb4c7fbbcb1e947567d13b82e429ae47a46e337 (patch) | |
| tree | 6c5f11f347d0f58565381f92680a7a9cc63c0bd8 /arch/m68k/mm/motorola.c | |
| parent | efifb: fix int to pointer cast warning (diff) | |
| parent | Merge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/let... (diff) | |
| download | linux-9fb4c7fbbcb1e947567d13b82e429ae47a46e337.tar.xz linux-9fb4c7fbbcb1e947567d13b82e429ae47a46e337.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/m68k/mm/motorola.c')
| -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); } } |