diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-06-18 18:09:52 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-06-18 18:09:52 -0400 |
commit | 187f81b3d8d315c35c73ac0d05b15a04a0ac3ce7 (patch) | |
tree | e0b806f06470b57ffbdeaba550ab5eba2052427e /arch/arm/mm | |
parent | 1d89b30cc9be41af87881682ec82e2c107849dbe (diff) | |
parent | d78ff0a50aac6a1bfe445969dd963e6486e49f56 (diff) |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
Diffstat (limited to 'arch/arm/mm')
-rw-r--r-- | arch/arm/mm/mmu.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index fdaa9bb87c16..4722582b17b8 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c | |||
@@ -836,6 +836,13 @@ void __init reserve_node_zero(pg_data_t *pgdat) | |||
836 | BOOTMEM_EXCLUSIVE); | 836 | BOOTMEM_EXCLUSIVE); |
837 | } | 837 | } |
838 | 838 | ||
839 | if (machine_is_treo680()) { | ||
840 | reserve_bootmem_node(pgdat, 0xa0000000, 0x1000, | ||
841 | BOOTMEM_EXCLUSIVE); | ||
842 | reserve_bootmem_node(pgdat, 0xa2000000, 0x1000, | ||
843 | BOOTMEM_EXCLUSIVE); | ||
844 | } | ||
845 | |||
839 | if (machine_is_palmt5()) | 846 | if (machine_is_palmt5()) |
840 | reserve_bootmem_node(pgdat, 0xa0200000, 0x1000, | 847 | reserve_bootmem_node(pgdat, 0xa0200000, 0x1000, |
841 | BOOTMEM_EXCLUSIVE); | 848 | BOOTMEM_EXCLUSIVE); |