Merge branch 'x86/urgent' into x86/pat

Conflicts:
	arch/x86/mm/pageattr.c

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

diff --cc arch/x86/mm/pageattr-test.c
Simple merge

diff --cc arch/x86/mm/pageattr.c
index 041e81e,43e2f84..1785591
--- 1/arch/x86/mm/pageattr.c
--- 2/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;
        }
  

diff --cc arch/x86/mm/pat.c
Simple merge

diff --cc drivers/char/agp/agp.h
Simple merge

diff --cc drivers/char/agp/generic.c
Simple merge

diff --cc drivers/char/agp/intel-agp.c
Simple merge