diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-16 22:28:11 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-16 22:28:11 +0400 |
| commit | abbe0d3c26c545930492981cbd64be340ff41e05 (patch) | |
| tree | b0239fcc508b76e40b411762b1d960066f259324 /arch/x86/xen/mmu.c | |
| parent | c455ea4f122d21c91fcf4c36c3f0c08535ba3ce8 (diff) | |
| parent | 61cca2fab7ecba18f9b9680cd736ef5fa82ad3b1 (diff) | |
| download | linux-abbe0d3c26c545930492981cbd64be340ff41e05.tar.xz | |
Merge branch 'stable/bug.fixes' of git://oss.oracle.com/git/kwilk/xen
* 'stable/bug.fixes' of git://oss.oracle.com/git/kwilk/xen:
xen/i386: follow-up to "replace order-based range checking of M2P table by linear one"
xen/irq: Alter the locking to use a mutex instead of a spinlock.
xen/e820: if there is no dom0_mem=, don't tweak extra_pages.
xen: disable PV spinlocks on HVM
Diffstat (limited to 'arch/x86/xen/mmu.c')
| -rw-r--r-- | arch/x86/xen/mmu.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c index 20a614275064..3dd53f997b11 100644 --- a/arch/x86/xen/mmu.c +++ b/arch/x86/xen/mmu.c @@ -1721,10 +1721,8 @@ void __init xen_setup_machphys_mapping(void) machine_to_phys_nr = MACH2PHYS_NR_ENTRIES; } #ifdef CONFIG_X86_32 - if ((machine_to_phys_mapping + machine_to_phys_nr) - < machine_to_phys_mapping) - machine_to_phys_nr = (unsigned long *)NULL - - machine_to_phys_mapping; + WARN_ON((machine_to_phys_mapping + (machine_to_phys_nr - 1)) + < machine_to_phys_mapping); #endif } |