---

yaml --- r: 6810 b: refs/heads/master c: 86a8a83 h: refs/heads/master v: v3
git-mirror · Sep 1, 2005 · 0c401b4 · 0c401b4
1 parent ef2f7a5
commit 0c401b4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 103461a80c2f2dd95fe9a39a5decd984622c2a9e
+refs/heads/master: 86a8a83963a3f6beeca4900d26da93c7d2a9d92d
diff --git a/trunk/arch/arm/mm/mm-armv.c b/trunk/arch/arm/mm/mm-armv.c
@@ -453,7 +453,7 @@ static void __init build_mem_type_table(void)
 
 	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);
 	}