git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
[pandora-kernel.git]
/
arch
/
m68k
/
mm
/
motorola.c
diff --git
a/arch/m68k/mm/motorola.c
b/arch/m68k/mm/motorola.c
index
02b7a03
..
8b3db1c
100644
(file)
--- 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);
}
}