Re: [Xen-devel] Re: [PATCH 00 of 36] x86/paravirt: groundwork for 64-bit Xen support

Jeremy Fitzhardinge
2008-06-30T05:32:39Z

Yinghai Lu wrote:
> On Sun, Jun 29, 2008 at 8:02 PM, Jeremy Fitzhardinge <jeremy@goop.org> wrote:
>
>> Ingo Molnar wrote:
>>
>>> with this config:
>>>
>>> http://redhat.com/~mingo/misc/config-Sun_Jun_29_10_29_11_CEST_2008.bad
>>>
>>> i've saved the merged 2.6.26-rc8-tip-00241-gc6c8cb2-dirty tree into
>>> tip/tmp.x86.xen-64bit.Sun_Jun_29_10 and pushed it out, so you can test that
>>> exact version.
>>>
>> Looks like the setup.c unification missed the early_ioremap init from the
>> early_ioremap unification. Unconditionally call early_ioremap_init().
>>
>> Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
>>
>> diff -r 5c26177fdf8c arch/x86/kernel/setup.c
>> --- a/arch/x86/kernel/setup.c Sun Jun 29 16:57:52 2008 -0700
>> +++ b/arch/x86/kernel/setup.c Sun Jun 29 19:57:00 2008 -0700
>> @@ -523,11 +523,12 @@
>> 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;
>>
>
> it could be wrong? do we need that for 64 bit?

Yes. I unified the early_ioremap implementations by making 64-bit use
the 32-bit one.

J