Merge branch 'linus' into x86/x2apic

Conflicts:

	drivers/pci/dmar.c

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

1 files changed, 3 insertions, 0 deletions

diff --git a/include/asm-x86/paravirt.h b/include/asm-x86/paravirt.h
index a8b19ec04ac6..d64d915a40c5 100644
--- a/include/asm-x86/paravirt.h
+++ b/include/asm-x86/paravirt.h
@@ -1069,6 +1069,9 @@ static inline pteval_t pte_flags(pte_t pte)
                 ret = PVOP_CALL1(pteval_t, pv_mmu_ops.pte_flags,
                                  pte.pte);
 
+#ifdef CONFIG_PARAVIRT_DEBUG
+        BUG_ON(ret & PTE_PFN_MASK);
+#endif
         return ret;
 }