diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-10 15:57:49 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-10 15:57:49 -0400 |
commit | 5c23804a0941a111752fdacefe0bea2db1b4d93f (patch) | |
tree | 482436cd247783c7df3d522fdc4ee51e2b3e87dc /arch/arm/mm/mm-armv.c | |
parent | 58c853c6eabe93ab5e5daf7150fbb4e562acbb79 (diff) | |
parent | ec6bced6c7b92904f5ead39c9c1b8dc734e6eff0 (diff) |
Merge master.kernel.org:~rmk/linux-2.6-arm.git
Diffstat (limited to 'arch/arm/mm/mm-armv.c')
-rw-r--r-- | arch/arm/mm/mm-armv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mm/mm-armv.c b/arch/arm/mm/mm-armv.c index c3bd503b43a2..b19f00e99a21 100644 --- a/arch/arm/mm/mm-armv.c +++ b/arch/arm/mm/mm-armv.c | |||
@@ -399,7 +399,7 @@ static void __init build_mem_type_table(void) | |||
399 | ecc_mask = 0; | 399 | ecc_mask = 0; |
400 | } | 400 | } |
401 | 401 | ||
402 | if (cpu_arch <= CPU_ARCH_ARMv5) { | 402 | if (cpu_arch <= CPU_ARCH_ARMv5TEJ) { |
403 | for (i = 0; i < ARRAY_SIZE(mem_types); i++) { | 403 | for (i = 0; i < ARRAY_SIZE(mem_types); i++) { |
404 | if (mem_types[i].prot_l1) | 404 | if (mem_types[i].prot_l1) |
405 | mem_types[i].prot_l1 |= PMD_BIT4; | 405 | mem_types[i].prot_l1 |= PMD_BIT4; |
@@ -584,7 +584,7 @@ void setup_mm_for_reboot(char mode) | |||
584 | pmdval = (i << PGDIR_SHIFT) | | 584 | pmdval = (i << PGDIR_SHIFT) | |
585 | PMD_SECT_AP_WRITE | PMD_SECT_AP_READ | | 585 | PMD_SECT_AP_WRITE | PMD_SECT_AP_READ | |
586 | PMD_TYPE_SECT; | 586 | PMD_TYPE_SECT; |
587 | if (cpu_arch <= CPU_ARCH_ARMv5) | 587 | if (cpu_arch <= CPU_ARCH_ARMv5TEJ) |
588 | pmdval |= PMD_BIT4; | 588 | pmdval |= PMD_BIT4; |
589 | pmd = pmd_off(pgd, i << PGDIR_SHIFT); | 589 | pmd = pmd_off(pgd, i << PGDIR_SHIFT); |
590 | pmd[0] = __pmd(pmdval); | 590 | pmd[0] = __pmd(pmdval); |