diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-24 18:32:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-24 18:32:01 -0400 |
| commit | f647a27417d2adc43d8c96d3d6f837422fbc076e (patch) | |
| tree | 3cac5147575ba4cbd63cb8fa226b95e7886e1d7c /arch/arm/mm/proc-v6.S | |
| parent | 75043cb5b386e5a01fd03b88f647dd992de02f97 (diff) | |
| parent | 2966207c7e5945947c4db3a48aa4fa819807c5be (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/mm/proc-v6.S')
| -rw-r--r-- | arch/arm/mm/proc-v6.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S index 0aa73d414783..e3d8510f4340 100644 --- a/arch/arm/mm/proc-v6.S +++ b/arch/arm/mm/proc-v6.S | |||
| @@ -132,8 +132,8 @@ ENTRY(cpu_v6_switch_mm) | |||
| 132 | * 100x 1 0 1 r/o no acc | 132 | * 100x 1 0 1 r/o no acc |
| 133 | * 10x0 1 0 1 r/o no acc | 133 | * 10x0 1 0 1 r/o no acc |
| 134 | * 1011 0 0 1 r/w no acc | 134 | * 1011 0 0 1 r/w no acc |
| 135 | * 110x 1 1 0 r/o r/o | 135 | * 110x 0 1 0 r/w r/o |
| 136 | * 11x0 1 1 0 r/o r/o | 136 | * 11x0 0 1 0 r/w r/o |
| 137 | * 1111 0 1 1 r/w r/w | 137 | * 1111 0 1 1 r/w r/w |
| 138 | */ | 138 | */ |
| 139 | ENTRY(cpu_v6_set_pte) | 139 | ENTRY(cpu_v6_set_pte) |
| @@ -150,7 +150,7 @@ ENTRY(cpu_v6_set_pte) | |||
| 150 | tst r1, #L_PTE_USER | 150 | tst r1, #L_PTE_USER |
| 151 | orrne r2, r2, #AP1 | nG | 151 | orrne r2, r2, #AP1 | nG |
| 152 | tstne r2, #APX | 152 | tstne r2, #APX |
| 153 | eorne r2, r2, #AP0 | 153 | bicne r2, r2, #APX | AP0 |
| 154 | 154 | ||
| 155 | tst r1, #L_PTE_YOUNG | 155 | tst r1, #L_PTE_YOUNG |
| 156 | biceq r2, r2, #APX | AP1 | AP0 | 156 | biceq r2, r2, #APX | AP1 | AP0 |