diff options
| author | Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> | 2010-02-04 17:46:34 -0500 |
|---|---|---|
| committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2010-06-07 14:32:33 -0400 |
| commit | c0011dbfce69467b23b08fb4a64c39a409a935fb (patch) | |
| tree | 47ecf9ee630f58d49edd2fd18fdc0159eb486392 /arch/x86/include/asm | |
| parent | e40152ee1e1c7a63f4777791863215e3faa37a86 (diff) | |
xen: use _PAGE_IOMAP in ioremap to do machine mappings
In a Xen domain, ioremap operates on machine addresses, not
pseudo-physical addresses. We use _PAGE_IOMAP to determine whether a
mapping is intended for machine addresses.
[ Impact: allow Xen domain to map real hardware ]
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'arch/x86/include/asm')
| -rw-r--r-- | arch/x86/include/asm/xen/page.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/x86/include/asm/xen/page.h b/arch/x86/include/asm/xen/page.h index 018a0a400799..bf5f7d32bd08 100644 --- a/arch/x86/include/asm/xen/page.h +++ b/arch/x86/include/asm/xen/page.h | |||
| @@ -112,13 +112,9 @@ static inline xpaddr_t machine_to_phys(xmaddr_t machine) | |||
| 112 | */ | 112 | */ |
| 113 | static inline unsigned long mfn_to_local_pfn(unsigned long mfn) | 113 | static inline unsigned long mfn_to_local_pfn(unsigned long mfn) |
| 114 | { | 114 | { |
| 115 | extern unsigned long max_mapnr; | ||
| 116 | unsigned long pfn = mfn_to_pfn(mfn); | 115 | unsigned long pfn = mfn_to_pfn(mfn); |
| 117 | if ((pfn < max_mapnr) | 116 | if (get_phys_to_machine(pfn) != mfn) |
| 118 | && !xen_feature(XENFEAT_auto_translated_physmap) | 117 | return -1; /* force !pfn_valid() */ |
| 119 | && (get_phys_to_machine(pfn) != mfn)) | ||
| 120 | return max_mapnr; /* force !pfn_valid() */ | ||
| 121 | /* XXX fixme; not true with sparsemem */ | ||
| 122 | return pfn; | 118 | return pfn; |
| 123 | } | 119 | } |
| 124 | 120 | ||