From 9b3a7edd8cdac8c4d43bc0ecc6074add173d96e3 Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Wed, 30 Jan 2008 13:33:52 +0100 Subject: [PATCH] --- yaml --- r: 80461 b: refs/heads/master c: 6ba9b7d8f0fe786954015ce5c0ef1837d5df56b7 h: refs/heads/master i: 80459: 71dc3935e7ca3da7960697e346cdcaaa949e8a63 v: v3 --- [refs] | 2 +- trunk/arch/x86/mm/pageattr-test.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3e822e4b53b6..e7c01153664c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aaa0e89023656c078c67cbd0460fc2ccbf3323c6 +refs/heads/master: 6ba9b7d8f0fe786954015ce5c0ef1837d5df56b7 diff --git a/trunk/arch/x86/mm/pageattr-test.c b/trunk/arch/x86/mm/pageattr-test.c index c58fab061762..91e05a26004d 100644 --- a/trunk/arch/x86/mm/pageattr-test.c +++ b/trunk/arch/x86/mm/pageattr-test.c @@ -177,7 +177,7 @@ static __init int exercise_pageattr(void) continue; } - err = change_page_attr(virt_to_page(addr[i]), len[i], + err = change_page_attr_addr(addr[i], len[i], pte_pgprot(pte_clrhuge(pte_clrglobal(pte0)))); if (err < 0) { printk(KERN_ERR "CPA %d failed %d\n", i, err); @@ -212,7 +212,7 @@ static __init int exercise_pageattr(void) failed++; continue; } - err = change_page_attr(virt_to_page(addr[i]), len[i], + err = change_page_attr_addr(addr[i], len[i], pte_pgprot(pte_mkglobal(*pte))); if (err < 0) { printk(KERN_ERR "CPA reverting failed: %d\n", err);