From 60c4d3969cc2dcb904fe6f6f29366cb859588c1f Mon Sep 17 00:00:00 2001 From: Arjan van de Ven Date: Wed, 30 Jul 2008 12:26:26 -0700 Subject: [PATCH] --- yaml --- r: 108665 b: refs/heads/master c: 875e40b97571e1f06d1184ad6cbb2acf9cb31a23 h: refs/heads/master i: 108663: 975a838ea92be6a0a7465856e55a1a52b0c435ae v: v3 --- [refs] | 2 +- trunk/arch/x86/mm/pageattr-test.c | 3 +-- trunk/arch/x86/mm/pageattr.c | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index d8e9c8d82a9c..281fdce73e3f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a726c6009e6eba4acfccf8b683854866eeabb184 +refs/heads/master: 875e40b97571e1f06d1184ad6cbb2acf9cb31a23 diff --git a/trunk/arch/x86/mm/pageattr-test.c b/trunk/arch/x86/mm/pageattr-test.c index 0dcd42eb94e6..d4aa503caaa2 100644 --- a/trunk/arch/x86/mm/pageattr-test.c +++ b/trunk/arch/x86/mm/pageattr-test.c @@ -221,8 +221,7 @@ static int pageattr_test(void) failed += print_split(&sc); if (failed) { - printk(KERN_ERR "NOT PASSED. Please report.\n"); - WARN_ON(1); + WARN(1, KERN_ERR "NOT PASSED. Please report.\n"); return -EINVAL; } else { if (print) diff --git a/trunk/arch/x86/mm/pageattr.c b/trunk/arch/x86/mm/pageattr.c index 65c6e46bf059..ba24537d69dd 100644 --- a/trunk/arch/x86/mm/pageattr.c +++ b/trunk/arch/x86/mm/pageattr.c @@ -592,10 +592,9 @@ static int __change_page_attr(struct cpa_data *cpa, int primary) if (!pte_val(old_pte)) { if (!primary) return 0; - printk(KERN_WARNING "CPA: called for zero pte. " + WARN(1, KERN_WARNING "CPA: called for zero pte. " "vaddr = %lx cpa->vaddr = %lx\n", address, cpa->vaddr); - WARN_ON(1); return -EINVAL; }