From 2a6d9fed50bfe4657c8fb21f76da55d6057ef903 Mon Sep 17 00:00:00 2001
From: "Huang, Ying" <ying.huang@intel.com>
Date: Thu, 31 Jan 2008 22:05:43 +0100
Subject: [PATCH] --- yaml --- r: 81439 b: refs/heads/master c:
 5827040df095d8dd6b5ca155dc4bfb5bafcb6ca2 h: refs/heads/master i:   81437:
 32fa2cc00cb33b735ec9d06172795f9de26d0fbb   81435:
 544dd582396cdc8ba5fe26ff78f588a60e246c4b   81431:
 8ae6c31b8656e043564220d4898d127b4cd6235c   81423:
 0bdd768bd220649fcf96e4df498ace97d839c5cd   81407:
 3b11ce1c0e382e1902edd325b7073115139af94f v: v3

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

diff --git a/[refs] b/[refs]
index 2ac583ae3291..418198930a6f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c1666e663d8443f57c1c6b0acac70c3fbaea9014
+refs/heads/master: 5827040df095d8dd6b5ca155dc4bfb5bafcb6ca2
diff --git a/trunk/arch/x86/mm/pageattr.c b/trunk/arch/x86/mm/pageattr.c
index 1cc6607eacb0..e297bd65e513 100644
--- a/trunk/arch/x86/mm/pageattr.c
+++ b/trunk/arch/x86/mm/pageattr.c
@@ -399,8 +399,7 @@ static inline int change_page_attr_set(unsigned long addr, int numpages,
 static inline int change_page_attr_clear(unsigned long addr, int numpages,
 					 pgprot_t mask)
 {
-	return __change_page_attr_set_clr(addr, numpages, __pgprot(0), mask);
-
+	return change_page_attr_set_clr(addr, numpages, __pgprot(0), mask);
 }
 
 int set_memory_uc(unsigned long addr, int numpages)