Commit 61cca2fa authored Sep 15, 2011 by Jan Beulich Committed by Konrad Rzeszutek Wilk Sep 15, 2011

xen/i386: follow-up to "replace order-based range checking of M2P table by linear one"



The numbers obtained from the hypervisor really can't ever lead to an
overflow here, only the original calculation going through the order
of the range could have. This avoids the (as Jeremy points outs)
somewhat ugly NULL-based calculation here.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

parent 77365948

arch/x86/xen/mmu.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -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
		}

Admin message