aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-08-22 11:25:44 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-08-22 11:25:44 -0700
commit4762e252f4afc6909edb0babe9c25f126afedcaa (patch)
treef4d68be15b2c5887f98894996899e9e3f191ce4c /arch/x86/include
parent3210d190dcb717c328d74f8c3f69ec717d665b40 (diff)
parent60c5f08e154fd235056645e050f2cd5671b19125 (diff)
downloadautogen-4762e252f4afc6909edb0babe9c25f126afedcaa.tar.gz
autogen-4762e252f4afc6909edb0babe9c25f126afedcaa.tar.xz
autogen-4762e252f4afc6909edb0babe9c25f126afedcaa.zip
Merge branch 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
* 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: xen/tracing: Fix tracing config option properly xen: Do not enable PV IPIs when vector callback not present xen/x86: replace order-based range checking of M2P table by linear one xen: xen-selfballoon.c needs more header files
Diffstat (limited to 'arch/x86/include')
-rw-r--r--arch/x86/include/asm/xen/page.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/include/asm/xen/page.h b/arch/x86/include/asm/xen/page.h
index 64a619d47d3..7ff4669580c 100644
--- a/arch/x86/include/asm/xen/page.h
+++ b/arch/x86/include/asm/xen/page.h
@@ -39,7 +39,7 @@ typedef struct xpaddr {
((unsigned long)((u64)CONFIG_XEN_MAX_DOMAIN_MEMORY * 1024 * 1024 * 1024 / PAGE_SIZE))
extern unsigned long *machine_to_phys_mapping;
-extern unsigned int machine_to_phys_order;
+extern unsigned long machine_to_phys_nr;
extern unsigned long get_phys_to_machine(unsigned long pfn);
extern bool set_phys_to_machine(unsigned long pfn, unsigned long mfn);
@@ -87,7 +87,7 @@ static inline unsigned long mfn_to_pfn(unsigned long mfn)
if (xen_feature(XENFEAT_auto_translated_physmap))
return mfn;
- if (unlikely((mfn >> machine_to_phys_order) != 0)) {
+ if (unlikely(mfn >= machine_to_phys_nr)) {
pfn = ~0;
goto try_override;
}