x86: cpa move the flush into set and clear functions

To avoid the modification of the flush code for the clflush
implementation, move the flush into the set and clear functions and
provide helper functions for the debugging code.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/x86/mm/pageattr-test.c b/arch/x86/mm/pageattr-test.c
index fe73905d075e..4e8b8c6baccd 100644
--- a/arch/x86/mm/pageattr-test.c
+++ b/arch/x86/mm/pageattr-test.c
@@ -162,8 +162,8 @@ static __init int exercise_pageattr(void)
                         continue;
                 }
 
-                err = change_page_attr_clear(addr[i], len[i],
-                                                __pgprot(_PAGE_GLOBAL));
+                err = __change_page_attr_clear(addr[i], len[i],
+                                               __pgprot(_PAGE_GLOBAL));
                 if (err < 0) {
                         printk(KERN_ERR "CPA %d failed %d\n", i, err);
                         failed++;
@@ -197,8 +197,8 @@ static __init int exercise_pageattr(void)
                         failed++;
                         continue;
                 }
-                err = change_page_attr_set(addr[i], len[i],
-                                                        __pgprot(_PAGE_GLOBAL));
+                err = __change_page_attr_set(addr[i], len[i],
+                                             __pgprot(_PAGE_GLOBAL));
                 if (err < 0) {
                         printk(KERN_ERR "CPA reverting failed: %d\n", err);
                         failed++;