diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-01-10 14:06:21 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-01-10 14:06:21 +1100 |
| commit | ab319c034f3ee5f7695a8082cc327e91a1d4ecb9 (patch) | |
| tree | cea21726aefd0fcad6994e47c805b8ba422e2e45 /arch/x86/include/asm | |
| parent | c69ce9183b9ceaeaa3bd916b2aa3f328ee68869b (diff) | |
| parent | b1a3b1c8a8d963424c4699efa64dd8986b2f76d7 (diff) | |
Merge remote-tracking branch 'xen-tip/linux-next'
Conflicts:
arch/arm/include/asm/xen/page.h
Diffstat (limited to 'arch/x86/include/asm')
| -rw-r--r-- | arch/x86/include/asm/xen/page.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/x86/include/asm/xen/page.h b/arch/x86/include/asm/xen/page.h index b913915e8e63..3e276eb23d1b 100644 --- a/arch/x86/include/asm/xen/page.h +++ b/arch/x86/include/asm/xen/page.h @@ -167,7 +167,12 @@ static inline xpaddr_t machine_to_phys(xmaddr_t machine) */ static inline unsigned long mfn_to_local_pfn(unsigned long mfn) { - unsigned long pfn = mfn_to_pfn(mfn); + unsigned long pfn; + + if (xen_feature(XENFEAT_auto_translated_physmap)) + return mfn; + + pfn = mfn_to_pfn(mfn); if (get_phys_to_machine(pfn) != mfn) return -1; /* force !pfn_valid() */ return pfn; @@ -222,5 +227,6 @@ void make_lowmem_page_readonly(void *vaddr); void make_lowmem_page_readwrite(void *vaddr); #define xen_remap(cookie, size) ioremap((cookie), (size)); +#define xen_unmap(cookie) iounmap((cookie)) #endif /* _ASM_X86_XEN_PAGE_H */ |