tree 67c38d24dc4d2b3360c7d41588244f3a0d424cf5
parent 103461a80c2f2dd95fe9a39a5decd984622c2a9e
author Russell King <[EMAIL PROTECTED]> Thu, 01 Sep 2005 22:41:55 +0100
committer Russell King <[EMAIL PROTECTED]> Thu, 01 Sep 2005 22:41:55 +0100

[ARM] Fix ARMv6 page table bits

We weren't explicitly setting the page table bits we desired
in user_prot in the protection table, which resulted in the
user mappings for v6 CPUs being marked global.

Signed-off-by: Russell King <[EMAIL PROTECTED]>

 arch/arm/mm/mm-armv.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mm/mm-armv.c b/arch/arm/mm/mm-armv.c
--- a/arch/arm/mm/mm-armv.c
+++ b/arch/arm/mm/mm-armv.c
@@ -453,7 +453,7 @@ static void __init build_mem_type_table(
 
        for (i = 0; i < 16; i++) {
                unsigned long v = pgprot_val(protection_map[i]);
-               v &= (~(PTE_BUFFERABLE|PTE_CACHEABLE)) | user_pgprot;
+               v = (v & ~(PTE_BUFFERABLE|PTE_CACHEABLE)) | user_pgprot;
                protection_map[i] = __pgprot(v);
        }
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to