From f8bcdb4fa10560505e3c53bd77c18e359377b4c2 Mon Sep 17 00:00:00 2001 From: Catalin Marinas Date: Fri, 24 Jun 2005 21:27:39 +0100 Subject: [PATCH] --- yaml --- r: 3177 b: refs/heads/master c: 79042f087b5ac7bba819de03dc3e7462bab8aad9 h: refs/heads/master i: 3175: 790281d0853e1de5ba802e96158df7029c1bf25a v: v3 --- [refs] | 2 +- trunk/arch/arm/mm/proc-v6.S | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f5c1901f58ae..36b400a5b67b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5932ae3f5d610fd8d047ef4693bab9f084e5c56d +refs/heads/master: 79042f087b5ac7bba819de03dc3e7462bab8aad9 diff --git a/trunk/arch/arm/mm/proc-v6.S b/trunk/arch/arm/mm/proc-v6.S index 0aa73d414783..e3d8510f4340 100644 --- a/trunk/arch/arm/mm/proc-v6.S +++ b/trunk/arch/arm/mm/proc-v6.S @@ -132,8 +132,8 @@ ENTRY(cpu_v6_switch_mm) * 100x 1 0 1 r/o no acc * 10x0 1 0 1 r/o no acc * 1011 0 0 1 r/w no acc - * 110x 1 1 0 r/o r/o - * 11x0 1 1 0 r/o r/o + * 110x 0 1 0 r/w r/o + * 11x0 0 1 0 r/w r/o * 1111 0 1 1 r/w r/w */ ENTRY(cpu_v6_set_pte) @@ -150,7 +150,7 @@ ENTRY(cpu_v6_set_pte) tst r1, #L_PTE_USER orrne r2, r2, #AP1 | nG tstne r2, #APX - eorne r2, r2, #AP0 + bicne r2, r2, #APX | AP0 tst r1, #L_PTE_YOUNG biceq r2, r2, #APX | AP1 | AP0