diff options
Diffstat (limited to 'arch/arm/mm/proc-arm1020.S')
-rw-r--r-- | arch/arm/mm/proc-arm1020.S | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/arch/arm/mm/proc-arm1020.S b/arch/arm/mm/proc-arm1020.S index 5673f4d6113b..b5551bf010aa 100644 --- a/arch/arm/mm/proc-arm1020.S +++ b/arch/arm/mm/proc-arm1020.S | |||
@@ -29,7 +29,7 @@ | |||
29 | #include <linux/init.h> | 29 | #include <linux/init.h> |
30 | #include <asm/assembler.h> | 30 | #include <asm/assembler.h> |
31 | #include <asm/asm-offsets.h> | 31 | #include <asm/asm-offsets.h> |
32 | #include <asm/elf.h> | 32 | #include <asm/hwcap.h> |
33 | #include <asm/pgtable-hwdef.h> | 33 | #include <asm/pgtable-hwdef.h> |
34 | #include <asm/pgtable.h> | 34 | #include <asm/pgtable.h> |
35 | #include <asm/ptrace.h> | 35 | #include <asm/ptrace.h> |
@@ -399,29 +399,7 @@ ENTRY(cpu_arm1020_switch_mm) | |||
399 | .align 5 | 399 | .align 5 |
400 | ENTRY(cpu_arm1020_set_pte_ext) | 400 | ENTRY(cpu_arm1020_set_pte_ext) |
401 | #ifdef CONFIG_MMU | 401 | #ifdef CONFIG_MMU |
402 | str r1, [r0], #-2048 @ linux version | 402 | armv3_set_pte_ext |
403 | |||
404 | eor r1, r1, #L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_WRITE | L_PTE_DIRTY | ||
405 | |||
406 | bic r2, r1, #PTE_SMALL_AP_MASK | ||
407 | bic r2, r2, #PTE_TYPE_MASK | ||
408 | orr r2, r2, #PTE_TYPE_SMALL | ||
409 | |||
410 | tst r1, #L_PTE_USER @ User? | ||
411 | orrne r2, r2, #PTE_SMALL_AP_URO_SRW | ||
412 | |||
413 | tst r1, #L_PTE_WRITE | L_PTE_DIRTY @ Write and Dirty? | ||
414 | orreq r2, r2, #PTE_SMALL_AP_UNO_SRW | ||
415 | |||
416 | tst r1, #L_PTE_PRESENT | L_PTE_YOUNG @ Present and Young? | ||
417 | movne r2, #0 | ||
418 | |||
419 | #ifdef CONFIG_CPU_DCACHE_WRITETHROUGH | ||
420 | eor r3, r1, #0x0a @ C & small page? | ||
421 | tst r3, #0x0b | ||
422 | biceq r2, r2, #4 | ||
423 | #endif | ||
424 | str r2, [r0] @ hardware version | ||
425 | mov r0, r0 | 403 | mov r0, r0 |
426 | #ifndef CONFIG_CPU_DCACHE_DISABLE | 404 | #ifndef CONFIG_CPU_DCACHE_DISABLE |
427 | mcr p15, 0, r0, c7, c10, 4 | 405 | mcr p15, 0, r0, c7, c10, 4 |