---

yaml --- r: 156223 b: refs/heads/master c: bdc6340 h: refs/heads/master i: 156221: c826cd4 156219: 7205e66 156215: b38302c 156207: facaa12 156191: 6ed6f50 156159: dc27219 v: v3
git-mirror · Jul 31, 2009 · 72a363a · 72a363a
1 parent a6ac3e9
commit 72a363a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e83815be719d3391bf5ea24b7fe696c07dbd417
+refs/heads/master: bdc6340f4eb68295b1e7c0ade2356b56dca93d93
diff --git a/trunk/arch/x86/mm/pageattr.c b/trunk/arch/x86/mm/pageattr.c
@@ -997,12 +997,15 @@ EXPORT_SYMBOL(set_memory_array_uc);
 int _set_memory_wc(unsigned long addr, int numpages)
 {
 	int ret;
+	unsigned long addr_copy = addr;
+
 	ret = change_page_attr_set(&addr, numpages,
 				    __pgprot(_PAGE_CACHE_UC_MINUS), 0);
-
 	if (!ret) {
-		ret = change_page_attr_set(&addr, numpages,
-				    __pgprot(_PAGE_CACHE_WC), 0);
+		ret = change_page_attr_set_clr(&addr_copy, numpages,
+					       __pgprot(_PAGE_CACHE_WC),
+					       __pgprot(_PAGE_CACHE_MASK),
+					       0, 0, NULL);
 	}
 	return ret;
 }