diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-07-11 09:43:11 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-07-11 09:43:11 -0700 |
| commit | e7578c08a4dee36fe01fb38805f325689e642eb0 (patch) | |
| tree | 7426054f6226aa2349ee0c0a3970aeef9276ea59 /arch/arm/mm/mm-armv.c | |
| parent | 763b3917e779c9c25d56fc71a796774185cd6ce2 (diff) | |
| parent | 5c23804a0941a111752fdacefe0bea2db1b4d93f (diff) | |
Auto merge with /home/aegl/GIT/linus
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 c3bd503b43a..b19f00e99a2 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) ecc_mask = 0; } - if (cpu_arch <= CPU_ARCH_ARMv5) { + if (cpu_arch <= CPU_ARCH_ARMv5TEJ) { for (i = 0; i < ARRAY_SIZE(mem_types); i++) { if (mem_types[i].prot_l1) mem_types[i].prot_l1 |= PMD_BIT4; @@ -584,7 +584,7 @@ void setup_mm_for_reboot(char mode) pmdval = (i << PGDIR_SHIFT) | PMD_SECT_AP_WRITE | PMD_SECT_AP_READ | PMD_TYPE_SECT; - if (cpu_arch <= CPU_ARCH_ARMv5) + if (cpu_arch <= CPU_ARCH_ARMv5TEJ) pmdval |= PMD_BIT4; pmd = pmd_off(pgd, i << PGDIR_SHIFT); pmd[0] = __pmd(pmdval); |