From b41e2c9d0e4c7f3af0ca78dd1e2e247f9043f8f3 Mon Sep 17 00:00:00 2001
From: Shaohua Li <shaohua.li@intel.com>
Date: Thu, 21 Aug 2008 10:46:21 +0800
Subject: [PATCH] --- yaml --- r: 112531 b: refs/heads/master c:
 ab7e79243746e2a9c5f00243e60108189c44c9eb h: refs/heads/master i:   112529:
 78ee4f02b0575e2ab4307f153f7b2f282021ac40   112527:
 83e2f88e0e2d370f094d9cce93e279a6872dc6bd v: v3

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

diff --git a/[refs] b/[refs]
index 40efbf3705b2..eef4e76b6fb4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bd07928c0f9c3dbe53baf28eae4de4c579772c4c
+refs/heads/master: ab7e79243746e2a9c5f00243e60108189c44c9eb
diff --git a/trunk/arch/x86/mm/pageattr-test.c b/trunk/arch/x86/mm/pageattr-test.c
index 0dcd42eb94e6..6ae1f28a7ff2 100644
--- a/trunk/arch/x86/mm/pageattr-test.c
+++ b/trunk/arch/x86/mm/pageattr-test.c
@@ -118,6 +118,7 @@ static int pageattr_test(void)
 	unsigned int level;
 	int i, k;
 	int err;
+	unsigned long test_addr;
 
 	if (print)
 		printk(KERN_INFO "CPA self-test:\n");
@@ -172,7 +173,8 @@ static int pageattr_test(void)
 			continue;
 		}
 
-		err = change_page_attr_set(addr[i], len[i], PAGE_TESTBIT);
+		test_addr = addr[i];
+		err = change_page_attr_set(&test_addr, len[i], PAGE_TESTBIT, 0);
 		if (err < 0) {
 			printk(KERN_ERR "CPA %d failed %d\n", i, err);
 			failed++;
@@ -204,7 +206,8 @@ static int pageattr_test(void)
 			failed++;
 			continue;
 		}
-		err = change_page_attr_clear(addr[i], len[i], PAGE_TESTBIT);
+		test_addr = addr[i];
+		err = change_page_attr_clear(&test_addr, len[i], PAGE_TESTBIT, 0);
 		if (err < 0) {
 			printk(KERN_ERR "CPA reverting failed: %d\n", err);
 			failed++;