Coming patches to x86/mm2 require the changes and advanced baseline in
x86/boot.

Resolved Conflicts:
	arch/x86/kernel/setup.c
	mm/nobootmem.c
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>