> -----Original Message----- > From: Horms [mailto:horms@xxxxxxxxxxxx] > Sent: 2006年9月21日 13:06 > To: Zou, Nanhai > Cc: Luck, Tony; Linux-IA64; fastboot > Subject: Re: Kexec/Kdump: kdump_disable_iosapic needs CONFIG_IOSAPIC > > On Thu, Sep 21, 2006 at 11:09:57AM +0800, Zou, Nanhai wrote: > > > -----Original Message----- > > > From: linux-ia64-owner@xxxxxxxxxxxxxxx > > > [mailto:linux-ia64-owner@xxxxxxxxxxxxxxx] On Behalf Of Horms > > > Sent: 2006年9月20日 10:43 > > > To: Zou, Nanhai > > > Cc: Luck, Tony; Linux-IA64; fastboot > > > Subject: Kexec/Kdump: kdump_disable_iosapic needs CONFIG_IOSAPIC > > > > > > kdump_disable_iosapic() doesn't exist without CONFIG_IOSAPIC, > > > calling it needs to be gaurded by a corresponding #ifdef > > > > > > This patch has been updated for IA64 Kexec/Kdump patch for 2.6.18-rc6, > > > http://permalink.gmane.org/gmane.linux.ports.ia64/14988 > > > > > > Signed-Off-By: Simon Horman <horms@xxxxxxxxxxxx> > > > > > > diff --git a/arch/ia64/kernel/crash.c b/arch/ia64/kernel/crash.c > > > index ccc898c..b3f4915 100644 > > > --- a/arch/ia64/kernel/crash.c > > > +++ b/arch/ia64/kernel/crash.c > > > @@ -121,7 +121,9 @@ machine_crash_shutdown(struct pt_regs *p > > > * In practice this means shooting down the other cpus in > > > * an SMP system. > > > */ > > > +#ifdef CONFIG_IOSAPIC > > > kexec_disable_iosapic(); > > > +#endif > > > #ifdef CONFIG_SMP > > > kdump_smp_send_stop(); > > > if (kdump_wait_cpu_freeze() && kdump_on_init) { > > > @@ -135,7 +137,9 @@ static void > > > machine_kdump_on_init(void) > > > { > > > local_irq_disable(); > > > +#ifdef CONFIG_IOSAPIC > > > kexec_disable_iosapic(); > > > +#endif > > > machine_kexec(ia64_kimage); > > > } > > > > > > > > CONFIG_IOSAPIC is only disabled when configure kernel for simulator. > > So I think we do not need this #ifdef unless we are using kexec/kdump on > a simulator. > > I'm not sure that I understand your argument. > > If you are compiling for the simulator, and you have CONFIG_KEXEC enabled, > then the build will fail. I think that is a problem. Instead of > my patch, should CONFIG_KEXEC depend on CONFIG_IOSAPIC? > I think put #ifdef in C source is not good. We should try to avoid that if we can. I will make CONFIG_KEXEC and CONFIG_CRASH_DUMP depends on !CONFIG_HP_SIM in Kconfig. Thanks Zou Nan hai > -- > Horms > H: http://www.vergenet.net/~horms/ > W: http://www.valinux.co.jp/en/ - To unsubscribe from this list: send the line "unsubscribe linux-ia64" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
![]() |