aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/setup.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/kernel/setup.c')
-rw-r--r--arch/x86/kernel/setup.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index fb318edd8bc6..caec79fb83a3 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -523,12 +523,13 @@ void __init setup_arch(char **cmdline_p)
523 memcpy(&boot_cpu_data, &new_cpu_data, sizeof(new_cpu_data)); 523 memcpy(&boot_cpu_data, &new_cpu_data, sizeof(new_cpu_data));
524 pre_setup_arch_hook(); 524 pre_setup_arch_hook();
525 early_cpu_init(); 525 early_cpu_init();
526 early_ioremap_init();
527 reserve_setup_data(); 526 reserve_setup_data();
528#else 527#else
529 printk(KERN_INFO "Command line: %s\n", boot_command_line); 528 printk(KERN_INFO "Command line: %s\n", boot_command_line);
530#endif 529#endif
531 530
531 early_ioremap_init();
532
532 ROOT_DEV = old_decode_dev(boot_params.hdr.root_dev); 533 ROOT_DEV = old_decode_dev(boot_params.hdr.root_dev);
533 screen_info = boot_params.screen_info; 534 screen_info = boot_params.screen_info;
534 edid_info = boot_params.edid_info; 535 edid_info = boot_params.edid_info;