Skip to contentSkip to conversation

Kexec/Kdump: kdump_disable_iosapic needs CONFIG_IOSAPIC

PATCH Horms 2 participants 3 messages Sep 20, 2006 – Sep 21, 2006

lore
Share & tools
lore

Horms

author
#0 lore raw

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

arch/ia64/kernel/crash.c +4 -0
index ccc898c..b3f4915 100644
@@ -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);
 }
 
Signature · 3 lines
Horms
  H: http://www.vergenet.net/~horms/
  W: http://www.valinux.co.jp/en/
#1 lore raw
Quoted 32 lines

-----Original Message-----
From: [email protected] [mailto:[email protected]] 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

arch/ia64/kernel/crash.c +2 -0
index ccc898c..b3f4915 100644
@@ -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) 	{

arch/ia64/kernel/crash.c static void · line 145

Quoted 9 lines
arch/ia64/kernel/crash.c +2 -0
@@ -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. Thanks
Zou Nan hai

Quoted 9 lines

--
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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#2 lore raw
In reply to Horms
Quoted 52 lines

-----Original Message-----
From: Horms [mailto:[email protected]]
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

Quoted 35 lines · Nanhai
Quoted 35 lines

-----Original Message-----
From: [email protected] [mailto:[email protected]] 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

arch/ia64/kernel/crash.c +3 -0
index ccc898c..b3f4915 100644
@@ -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
Quoted 8 lines

arch/ia64/kernel/crash.c static void · line 145

Quoted 6 lines
arch/ia64/kernel/crash.c +1 -0
 	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

Quoted 8 lines

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

Quoted 4 lines

--
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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html