Commit 1a98fd14 authored Jun 29, 2008 by Jeremy Fitzhardinge Committed by Ingo Molnar Jul 08, 2008

x86: setup_arch() && early_ioremap_init()

Looks like the setup.c unification missed the early_ioremap init from
the early_ioremap unification.  Unconditionally call early_ioremap_init().

needed for "x86/paravirt: groundwork for 64-bit Xen support".

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Cc: Nick Piggin <npiggin@suse.de>
Cc: Mark McLoughlin <markmc@redhat.com>
Cc: xen-devel <xen-devel@lists.xensource.com>
Cc: Eduardo Habkost <ehabkost@redhat.com>
Cc: Vegard Nossum <vegard.nossum@gmail.com>
Cc: Stephen Tweedie <sct@redhat.com>
Cc: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

parent 1bb3a029

arch/x86/kernel/setup.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -523,12 +523,13 @@ void __init setup_arch(char **cmdline_p)
		memcpy(&boot_cpu_data, &new_cpu_data, sizeof(new_cpu_data));
		pre_setup_arch_hook();
		early_cpu_init();
		early_ioremap_init();
		reserve_setup_data();
		#else
		printk(KERN_INFO "Command line: %s\n", boot_command_line);
		#endif

		early_ioremap_init();

		ROOT_DEV = old_decode_dev(boot_params.hdr.root_dev);
		screen_info = boot_params.screen_info;
		edid_info = boot_params.edid_info;