projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86/cleanups' into x86/core
[linux-2.6-block.git]
/
arch
/
x86
/
include
/
asm
/
xen
/
page.h
diff --git
a/arch/x86/include/asm/xen/page.h
b/arch/x86/include/asm/xen/page.h
index 7ef617ef1df3ca38c1d29286a4742e770982dc67..4bd990ee43df840a99ffb1a283cb2b6a664af7f2 100644
(file)
--- a/
arch/x86/include/asm/xen/page.h
+++ b/
arch/x86/include/asm/xen/page.h
@@
-137,7
+137,7
@@
static inline pte_t mfn_pte(unsigned long page_nr, pgprot_t pgprot)
pte_t pte;
pte.pte = ((phys_addr_t)page_nr << PAGE_SHIFT) |
-
(pgprot_val(pgprot) & __supported_pte_mask
);
+
massage_pgprot(pgprot
);
return pte;
}