From: Jeremy Fitzhardinge Subject: Re: Re: [PATCH 00 of 36] x86/paravirt: groundwork for 64-bit Xen support Date: Sun, 29 Jun 2008 22:32:26 -0700 Message-ID: <48686FEA.20307@goop.org> References: <20080625152212.GA3442@elte.hu> <4862A6A9.1030109@goop.org> <20080626105722.GA12640@elte.hu> <20080626105818.GA13805@elte.hu> <4863A8E6.1010807@goop.org> <20080627160333.GA27072@elte.hu> <486539A3.3030102@goop.org> <20080629084318.GA28815@elte.hu> <48684CD4.7040403@goop.org> <86802c440806292135k776f5cefhe4371c654f438962@mail.gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <86802c440806292135k776f5cefhe4371c654f438962@mail.gmail.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: Yinghai Lu Cc: Nick Piggin , Mark McLoughlin , xen-devel , Eduardo Habkost , Vegard Nossum , Stephen Tweedie , x86@kernel.org, LKML , Ingo Molnar List-Id: xen-devel@lists.xenproject.org Yinghai Lu wrote: > On Sun, Jun 29, 2008 at 8:02 PM, Jeremy Fitzhardinge 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 >> >> 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