From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 22 Aug 2008 04:06:51 +0000 (+0200)
Subject: Merge branch 'x86/urgent' into x86/pat
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8b53b57576292b92b27769f9e213df19b6e57786;p=linux-beck.git

Merge branch 'x86/urgent' into x86/pat

Conflicts:
	arch/x86/mm/pageattr.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

8b53b57576292b92b27769f9e213df19b6e57786
diff --cc arch/x86/mm/pageattr.c
index 041e81ef673a,43e2f8483e4f..1785591808bd
--- a/arch/x86/mm/pageattr.c
+++ b/arch/x86/mm/pageattr.c
@@@ -636,10 -598,9 +642,9 @@@ repeat
  	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,
- 		WARN_ON(1);
 -		       cpa->vaddr);
 +		       *cpa->vaddr);
  		return -EINVAL;
  	}