git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into x86/header-guards
[sfrench/cifs-2.6.git]
/
include
/
asm-x86
/
paravirt.h
diff --git
a/include/asm-x86/paravirt.h
b/include/asm-x86/paravirt.h
index 1b7eff0b41beadc2201c42d178abf4083582950e..2e6821a0b6e78b0f6d03ecce89dd58377364e3b4 100644
(file)
--- a/
include/asm-x86/paravirt.h
+++ b/
include/asm-x86/paravirt.h
@@
-1088,6
+1088,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;
}