Merge branch 'x86/urgent' into x86/pat

[linux-2.6-block.git] / arch / x86 / mm / pageattr-test.c

diff --git a/arch/x86/mm/pageattr-test.c b/arch/x86/mm/pageattr-test.c
index d4aa503caaa29696c055218bdfbd9cd7faf903fb..7c3017287119c2a5cd94469ad45d8794820aecdf 100644 (file)
--- a/arch/x86/mm/pageattr-test.c
+++ b/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++;