git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...
[safe/jmp/linux-2.6]
/
arch
/
arm
/
mm
/
mmu.c
diff --git
a/arch/arm/mm/mmu.c
b/arch/arm/mm/mmu.c
index
ea67be0
..
3e8556b
100644
(file)
--- a/
arch/arm/mm/mmu.c
+++ b/
arch/arm/mm/mmu.c
@@
-881,7
+881,7
@@
void __init reserve_node_zero(pg_data_t *pgdat)
BOOTMEM_EXCLUSIVE);
}
- if (machine_is_treo680()) {
+ if (machine_is_treo680()
|| machine_is_centro()
) {
reserve_bootmem_node(pgdat, 0xa0000000, 0x1000,
BOOTMEM_EXCLUSIVE);
reserve_bootmem_node(pgdat, 0xa2000000, 0x1000,