diff options
author | Ingo Molnar | 2008-07-25 13:08:16 +0200 |
---|---|---|
committer | Ingo Molnar | 2008-07-25 13:08:16 +0200 |
commit | 10a010f6953b5a14ba2f0be40a4fce1bea220875 (patch) | |
tree | 19aadf718c796bc7fae0a1a1c970d84d67c541d4 /include/asm-x86/paravirt.h | |
parent | x86: move declaring x2apic_extra_bits (diff) | |
parent | fix fs/nfs/nfsroot.c compilation (diff) | |
download | kernel-qcow2-linux-10a010f6953b5a14ba2f0be40a4fce1bea220875.tar.gz kernel-qcow2-linux-10a010f6953b5a14ba2f0be40a4fce1bea220875.tar.xz kernel-qcow2-linux-10a010f6953b5a14ba2f0be40a4fce1bea220875.zip |
Merge branch 'linus' into x86/x2apic
Conflicts:
drivers/pci/dmar.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/paravirt.h')
-rw-r--r-- | include/asm-x86/paravirt.h | 3 |
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; } |