diff options
author | Jeremy Fitzhardinge <jeremy@goop.org> | 2008-06-29 23:02:44 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 07:16:11 -0400 |
commit | 1a98fd14f44cfade4af3e6ed96ba55065fa17ee4 (patch) | |
tree | 17d1d57b269bd2a0c853d8997efcfa4b33797682 /arch/x86/kernel/setup.c | |
parent | 1bb3a029078d437aa05bda8a8c8f8ecb1265e231 (diff) |
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>
Diffstat (limited to 'arch/x86/kernel/setup.c')
-rw-r--r-- | arch/x86/kernel/setup.c | 3 |
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; |