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/x2apic
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
xen
/
enlighten.c
diff --git
a/arch/x86/xen/enlighten.c
b/arch/x86/xen/enlighten.c
index c910345860c3d29a36bef692864d02b52f47cd94..8d28925ebed97345f6acd76cff6313be69f67d08 100644
(file)
--- a/
arch/x86/xen/enlighten.c
+++ b/
arch/x86/xen/enlighten.c
@@
-1465,7
+1465,7
@@
static unsigned long m2p(phys_addr_t maddr)
{
phys_addr_t paddr;
- maddr &= PTE_MASK;
+ maddr &= PTE_
PFN_
MASK;
paddr = mfn_to_pfn(maddr >> PAGE_SHIFT) << PAGE_SHIFT;
return paddr;