From 72a363a8f5a94786b748934b80526ddb7ff65b4f Mon Sep 17 00:00:00 2001
From: "Pallipadi, Venkatesh" <venkatesh.pallipadi@intel.com>
Date: Thu, 30 Jul 2009 14:43:19 -0700
Subject: [PATCH] --- yaml --- r: 156223 b: refs/heads/master c:
 bdc6340f4eb68295b1e7c0ade2356b56dca93d93 h: refs/heads/master i:   156221:
 c826cd4bbfd6f2204917544eb215d71e72b0712a   156219:
 7205e669c69f11149be8a3cf7803abb8cd0cb594   156215:
 b38302c7b75b30e0dc922352123b5876a8966dd4   156207:
 facaa12b7b65c577b684acc5eba5e41482f6478e   156191:
 6ed6f5067dad738559fca09c0480b065ff9cf573   156159:
 dc27219e59a7839a986ecde66408ad52f82ac14c v: v3

---
 [refs]                       | 2 +-
 trunk/arch/x86/mm/pageattr.c | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index f0ee8fda56ba..65a2ce6d09d6 100644
--- 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
index 1b734d7a8966..895d90e1a81b 100644
--- 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;
 }