x86: call early_cpu_init at the same point
Call early_cpu_init() at the same (early) point in setup_arch(). The x86_64 code was calling it relatively late, after when other arch code need to do cpu-related setup which depends on it. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> Cc: Mark McLoughlin <markmc@redhat.com> Cc: Eduardo Habkost <ehabkost@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
parent
338b9bb3ad
commit
9e882c9282
|
@ -597,11 +597,11 @@ void __init setup_arch(char **cmdline_p)
|
||||||
memcpy(&boot_cpu_data, &new_cpu_data, sizeof(new_cpu_data));
|
memcpy(&boot_cpu_data, &new_cpu_data, sizeof(new_cpu_data));
|
||||||
visws_early_detect();
|
visws_early_detect();
|
||||||
pre_setup_arch_hook();
|
pre_setup_arch_hook();
|
||||||
early_cpu_init();
|
|
||||||
#else
|
#else
|
||||||
printk(KERN_INFO "Command line: %s\n", boot_command_line);
|
printk(KERN_INFO "Command line: %s\n", boot_command_line);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
early_cpu_init();
|
||||||
early_ioremap_init();
|
early_ioremap_init();
|
||||||
|
|
||||||
ROOT_DEV = old_decode_dev(boot_params.hdr.root_dev);
|
ROOT_DEV = old_decode_dev(boot_params.hdr.root_dev);
|
||||||
|
@ -665,9 +665,6 @@ void __init setup_arch(char **cmdline_p)
|
||||||
bss_resource.start = virt_to_phys(&__bss_start);
|
bss_resource.start = virt_to_phys(&__bss_start);
|
||||||
bss_resource.end = virt_to_phys(&__bss_stop)-1;
|
bss_resource.end = virt_to_phys(&__bss_stop)-1;
|
||||||
|
|
||||||
#ifdef CONFIG_X86_64
|
|
||||||
early_cpu_init();
|
|
||||||
#endif
|
|
||||||
strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE);
|
strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE);
|
||||||
*cmdline_p = command_line;
|
*cmdline_p = command_line;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue