Skip to contentSkip to conversation

kexec: Fix CONFIG_SMP=n compilation (ia64)

PATCH In review Magnus Damm 6 participants 10 messages Feb 1, 2007 – Feb 5, 2007

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kexec: Fix CONFIG_SMP=n compilation (ia64)

kexec: Fix CONFIG_SMP=n compilation (ia64)

This patch makes it possible to compile kexec for ia64 without SMP support.

---

Applies on top of 2.6.20-rc7.

 arch/ia64/kernel/crash.c         |   11 +++++++----
 arch/ia64/kernel/machine_kexec.c |    2 ++
 2 files changed, 9 insertions(+), 4 deletions(-)
arch/ia64/kernel/crash.c +7 -4
@@ -79,6 +79,7 @@ crash_save_this_cpu()
 	final_note(buf);
 }
 
+#ifdef CONFIG_SMP
 static int
 kdump_wait_cpu_freeze(void)
 {
@@ -91,6 +92,7 @@ kdump_wait_cpu_freeze(void)
 	}
 	return 1;
 }
+#endif
 
 void
 machine_crash_shutdown(struct pt_regs *pt)
@@ -132,11 +134,12 @@ kdump_cpu_freeze(struct unw_frame_info *
 	atomic_inc(&kdump_cpu_freezed);
 	kdump_status[cpuid] = 1;
 	mb();
-	if (cpuid == 0) {
-		for (;;)
-			cpu_relax();
-	} else
+#ifdef CONFIG_HOTPLUG_CPU
+	if (cpuid != 0)
 		ia64_jump_to_sal(&sal_boot_rendez_state[cpuid]);
+#endif
+	for (;;)
+		cpu_relax();
 }
 
 static int
arch/ia64/kernel/machine_kexec.c +2 -0
@@ -70,12 +70,14 @@ void machine_kexec_cleanup(struct kimage
 
 void machine_shutdown(void)
 {
+#ifdef CONFIG_SMP
 	int cpu;
 
 	for_each_online_cpu(cpu) {
 		if (cpu != smp_processor_id())
 			cpu_down(cpu);
 	}
+#endif
 	kexec_disable_iosapic();
 }
#1 lore raw

(added ia64 list)
(added ia64 maintainer)
(added kexec list)

Quoted 4 lines · On Thu, 01 Feb 2007 22:13:47 +0900 Magnus Damm <[email protected]> wrote:

kexec: Fix CONFIG_SMP=n compilation (ia64)

This patch makes it possible to compile kexec for ia64 without SMP support.

Please always include the compiler stderr when fixing build errors or warnings.

Quoted 18 lines

Applies on top of 2.6.20-rc7.

 arch/ia64/kernel/crash.c         |   11 +++++++----
 arch/ia64/kernel/machine_kexec.c |    2 ++
 2 files changed, 9 insertions(+), 4 deletions(-)
arch/ia64/kernel/crash.c +1 -0
@@ -79,6 +79,7 @@ crash_save_this_cpu()
 	final_note(buf);
 }
 
+#ifdef CONFIG_SMP
 static int
 kdump_wait_cpu_freeze(void)
 {

arch/ia64/kernel/crash.c kdump_wait_cpu_freeze(void) · line 95

Quoted 4 lines
arch/ia64/kernel/crash.c +1 -0
@@ -91,6 +92,7 @@ kdump_wait_cpu_freeze(void)
 	}
 	return 1;
 }
+#endif

I think this is a warning fix?

Quoted 7 lines
arch/ia64/kernel/crash.c +0 -1
 void
 machine_crash_shutdown(struct pt_regs *pt)
@@ -132,11 +134,12 @@ kdump_cpu_freeze(struct unw_frame_info *
 	atomic_inc(&kdump_cpu_freezed);
 	kdump_status[cpuid] = 1;
 	mb();
-	if (cpuid = 0) {

arch/ia64/kernel/crash.c kdump_cpu_freeze(struct unw_frame_info * · line 143

Quoted 10 lines
arch/ia64/kernel/crash.c +5 -3
-		for (;;)
-			cpu_relax();
-	} else
+#ifdef CONFIG_HOTPLUG_CPU
+	if (cpuid != 0)
 		ia64_jump_to_sal(&sal_boot_rendez_state[cpuid]);
+#endif
+	for (;;)
+		cpu_relax();
 }

I trust ia64_jump_to_sal doesn't return.

Quoted 7 lines
arch/ia64/kernel/crash.c +0 -0
 static int
arch/ia64/kernel/machine_kexec.c +0 -0
@@ -70,12 +70,14 @@ void machine_kexec_cleanup(struct kimage
 
 void machine_shutdown(void)
 {

arch/ia64/kernel/machine_kexec.c void machine_kexec_cleanup(struct kimage · line 82

Quoted 10 lines
arch/ia64/kernel/machine_kexec.c +2 -0
+#ifdef CONFIG_SMP
 	int cpu;
 
 	for_each_online_cpu(cpu) {
 		if (cpu != smp_processor_id())
 			cpu_down(cpu);
 	}
+#endif
 	kexec_disable_iosapic();
 }

hm. I suspect this one should have been #ifndef CONFIG_HOTPLUG_CPU?

I was wondering if we should have stubs for cpu_down() if !CONFIG_HOTPLUG_CPU, but perhaps that doesn't make sense.

#2 lore raw
Quoted 4 lines · Andrew Morton

(added ia64 list)
(added ia64 maintainer)
(added kexec list)

Sorry about that.

Quoted 10 lines
Quoted 4 lines · On Thu, 01 Feb 2007 22:13:47 +0900 Magnus Damm <[email protected]> wrote:

kexec: Fix CONFIG_SMP=n compilation (ia64)

This patch makes it possible to compile kexec for ia64 without SMP support.

Please always include the compiler stderr when fixing build errors or warnings.

Ok, will do. With CONFIG_SMP=n and CONFIG_HOTPLUG_CPU=n:

CC arch/ia64/kernel/machine_kexec.o
arch/ia64/kernel/machine_kexec.c: In function `machine_shutdown':
arch/ia64/kernel/machine_kexec.c:77: warning: implicit declaration of function `cpu_down'
AS arch/ia64/kernel/relocate_kernel.o
CC arch/ia64/kernel/crash.o
arch/ia64/kernel/crash.c: In function `kdump_cpu_freeze':
arch/ia64/kernel/crash.c:139: warning: implicit declaration of function `ia64_jump_to_sal'
arch/ia64/kernel/crash.c:139: error: `sal_boot_rendez_state' undeclared (first use in this function) arch/ia64/kernel/crash.c:139: error: (Each undeclared identifier is reported only once
arch/ia64/kernel/crash.c:139: error: for each function it appears in.) arch/ia64/kernel/crash.c: At top level:
arch/ia64/kernel/crash.c:84: warning: 'kdump_wait_cpu_freeze' defined but not used
make[1]: *** [arch/ia64/kernel/crash.o] Error 1
make: *** [arch/ia64/kernel] Error 2
damm@localhost ~/build/kernel/linux-2.6.20-rc7 $

Quoted 6 lines
Quoted 6 lines
arch/ia64/kernel/crash.c 2007-02-01 12:42:38.000000000 +0900 renamed from arch/ia64/kernel/crash.c +0 -0
@@ -79,6 +79,7 @@ crash_save_this_cpu()
      final_note(buf);
 }
 
Quoted 11 lines

arch/ia64/kernel/crash.c 2007-02-01 12:42:38.000000000 +0900 kdump_wait_cpu_freeze(void) · line 95

Quoted 9 lines
arch/ia64/kernel/crash.c 2007-02-01 12:42:38.000000000 +0900 renamed from arch/ia64/kernel/crash.c +2 -0
+#ifdef CONFIG_SMP
 static int
 kdump_wait_cpu_freeze(void)
 {
@@ -91,6 +92,7 @@ kdump_wait_cpu_freeze(void)
      }
      return 1;
 }
+#endif

I think this is a warning fix?

Yes. The file already has some CONFIG_SMP #ifdeffery in it but not enough to compile properly.

Quoted 11 lines
Quoted 11 lines
arch/ia64/kernel/crash.c 2007-02-01 12:42:38.000000000 +0900 renamed from arch/ia64/kernel/crash.c +1 -4
 void
 machine_crash_shutdown(struct pt_regs *pt)
@@ -132,11 +134,12 @@ kdump_cpu_freeze(struct unw_frame_info *
      atomic_inc(&kdump_cpu_freezed);
      kdump_status[cpuid] = 1;
      mb();
-     if (cpuid = 0) {
-             for (;;)
-                     cpu_relax();
-     } else
+#ifdef CONFIG_HOTPLUG_CPU
Quoted 8 lines

arch/ia64/kernel/crash.c 2007-02-01 12:42:38.000000000 +0900 kdump_cpu_freeze(struct unw_frame_info * · line 143

Quoted 6 lines
arch/ia64/kernel/crash.c 2007-02-01 12:42:38.000000000 +0900 renamed from arch/ia64/kernel/crash.c +4 -0
+     if (cpuid != 0)
              ia64_jump_to_sal(&sal_boot_rendez_state[cpuid]);
+#endif
+     for (;;)
+             cpu_relax();
 }

I trust ia64_jump_to_sal doesn't return.

So do I. The main problem with the compilation seems to be that ia64_jump_to_sal() only exists if CONFIG_HOTPLUG_CPU=y. (include/asm-ia64/sal.h, arch/ia64/kernel/head.S)

Quoted 10 lines
Quoted 10 lines
arch/ia64/kernel/crash.c 2007-02-01 12:42:38.000000000 +0900 renamed from arch/ia64/kernel/crash.c +0 -0
 static int
arch/ia64/kernel/machine_kexec.c 2007-02-01 12:35:46.000000000 +0900 renamed from arch/ia64/kernel/machine_kexec.c +1 -0
@@ -70,12 +70,14 @@ void machine_kexec_cleanup(struct kimage
 
 void machine_shutdown(void)
 {
+#ifdef CONFIG_SMP
      int cpu;
 
Quoted 9 lines

arch/ia64/kernel/machine_kexec.c 2007-02-01 12:35:46.000000000 +0900 void machine_kexec_cleanup(struct kimage · line 82

Quoted 7 lines
arch/ia64/kernel/machine_kexec.c 2007-02-01 12:35:46.000000000 +0900 renamed from arch/ia64/kernel/machine_kexec.c +1 -0
      for_each_online_cpu(cpu) {
              if (cpu != smp_processor_id())
                      cpu_down(cpu);
      }
+#endif
      kexec_disable_iosapic();
 }

hm. I suspect this one should have been #ifndef CONFIG_HOTPLUG_CPU?

Yes, you are right.
Maybe we can replace the entire code block above with smp_send_stop() later on? That would make the code more similar to the i386 and x86_64 code.

Quoted 2 lines

I was wondering if we should have stubs for cpu_down() if !CONFIG_HOTPLUG_CPU, but perhaps that doesn't make sense.

cpu_down() is only used in a few places so I don't think it's worth it.

I wonder why cpu_down() isn't marked as __cpuexit. Maybe because it is already wrapped in CONFIG_HOTPLUG_CPU.

Thanks!

/ magnus

#3 lore raw
Quoted 93 lines

-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Magnus Damm
Sent: 2007Äê2ÔÂ2ÈÕ 10:39
To: Andrew Morton
Cc: Magnus Damm; [email protected]; [email protected]; Luck, Tony; [email protected]
Subject: Re: [PATCH] kexec: Fix CONFIG_SMP=n compilation (ia64)

Quoted 4 lines · Andrew Morton

(added ia64 list)
(added ia64 maintainer)
(added kexec list)

Sorry about that.

Quoted 10 lines
Quoted 4 lines · On Thu, 01 Feb 2007 22:13:47 +0900 Magnus Damm <[email protected]> wrote:

kexec: Fix CONFIG_SMP=n compilation (ia64)

This patch makes it possible to compile kexec for ia64 without SMP support.

Please always include the compiler stderr when fixing build errors or warnings.

Ok, will do. With CONFIG_SMP=n and CONFIG_HOTPLUG_CPU=n:

CC arch/ia64/kernel/machine_kexec.o
arch/ia64/kernel/machine_kexec.c: In function `machine_shutdown':
arch/ia64/kernel/machine_kexec.c:77: warning: implicit declaration of function `cpu_down'
AS arch/ia64/kernel/relocate_kernel.o
CC arch/ia64/kernel/crash.o
arch/ia64/kernel/crash.c: In function `kdump_cpu_freeze':
arch/ia64/kernel/crash.c:139: warning: implicit declaration of function `ia64_jump_to_sal'
arch/ia64/kernel/crash.c:139: error: `sal_boot_rendez_state' undeclared (first use in this function) arch/ia64/kernel/crash.c:139: error: (Each undeclared identifier is reported only once
arch/ia64/kernel/crash.c:139: error: for each function it appears in.) arch/ia64/kernel/crash.c: At top level:
arch/ia64/kernel/crash.c:84: warning: 'kdump_wait_cpu_freeze' defined but not used
make[1]: *** [arch/ia64/kernel/crash.o] Error 1
make: *** [arch/ia64/kernel] Error 2
damm@localhost ~/build/kernel/linux-2.6.20-rc7 $

Quoted 2 lines

arch/ia64/kernel/crash.c 2007-02-01 12:42:38.000000000

Quoted 2 lines
arch/ia64/kernel/crash.c 2007-02-01 12:42:38.000000000 renamed from arch/ia64/kernel/crash.c +0 -0

+0900

Quoted 4 lines
Quoted 4 lines
arch/ia64/kernel/crash.c 2007-02-01 12:42:38.000000000 renamed from arch/ia64/kernel/crash.c +0 -0
@@ -79,6 +79,7 @@ crash_save_this_cpu()
      final_note(buf);
 }
 
Quoted 11 lines

arch/ia64/kernel/crash.c 2007-02-01 12:42:38.000000000 kdump_wait_cpu_freeze(void) · line 95

Quoted 9 lines
arch/ia64/kernel/crash.c 2007-02-01 12:42:38.000000000 renamed from arch/ia64/kernel/crash.c +2 -0
+#ifdef CONFIG_SMP
 static int
 kdump_wait_cpu_freeze(void)
 {
@@ -91,6 +92,7 @@ kdump_wait_cpu_freeze(void)
      }
      return 1;
 }
+#endif

I think this is a warning fix?

Yes. The file already has some CONFIG_SMP #ifdeffery in it but not enough to compile properly.

Quoted 11 lines
Quoted 11 lines
arch/ia64/kernel/crash.c 2007-02-01 12:42:38.000000000 renamed from arch/ia64/kernel/crash.c +1 -4
 void
 machine_crash_shutdown(struct pt_regs *pt)
@@ -132,11 +134,12 @@ kdump_cpu_freeze(struct unw_frame_info *
      atomic_inc(&kdump_cpu_freezed);
      kdump_status[cpuid] = 1;
      mb();
-     if (cpuid = 0) {
-             for (;;)
-                     cpu_relax();
-     } else
+#ifdef CONFIG_HOTPLUG_CPU
Quoted 8 lines

arch/ia64/kernel/crash.c 2007-02-01 12:42:38.000000000 kdump_cpu_freeze(struct unw_frame_info * · line 143

Quoted 6 lines
arch/ia64/kernel/crash.c 2007-02-01 12:42:38.000000000 renamed from arch/ia64/kernel/crash.c +4 -0
+     if (cpuid != 0)
              ia64_jump_to_sal(&sal_boot_rendez_state[cpuid]);
+#endif
+     for (;;)
+             cpu_relax();
 }

I trust ia64_jump_to_sal doesn't return.

Quoted 4 lines

So do I. The main problem with the compilation seems to be that ia64_jump_to_sal() only exists if CONFIG_HOTPLUG_CPU=y. (include/asm-ia64/sal.h, arch/ia64/kernel/head.S)

This may cause problem on SN platform.
I remember SN requires cpu0 return to SAL rendez loop to do IRQ redirection. However this needs SGI people to confirm...

Thanks
Zou Nan hai

Quoted 8 lines

Thanks!

/ magnus
-
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

#4 lore raw
Quoted 20 lines · Nanhai
Quoted 20 lines
Quoted 19 lines
Quoted 7 lines

void
machine_crash_shutdown(struct pt_regs *pt)

arch/ia64/kernel/crash.c +0 -1
@@ -132,11 +134,12 @@ kdump_cpu_freeze(struct unw_frame_info *
      atomic_inc(&kdump_cpu_freezed);
      kdump_status[cpuid] = 1;
      mb();
-     if (cpuid = 0) {

arch/ia64/kernel/crash.c kdump_cpu_freeze(struct unw_frame_info * · line 143

Quoted 10 lines
arch/ia64/kernel/crash.c +5 -3
-             for (;;)
-                     cpu_relax();
-     } else
+#ifdef CONFIG_HOTPLUG_CPU
+     if (cpuid != 0)
              ia64_jump_to_sal(&sal_boot_rendez_state[cpuid]);
+#endif
+     for (;;)
+             cpu_relax();
 }

I trust ia64_jump_to_sal doesn't return.

Quoted 7 lines
Quoted 4 lines

So do I. The main problem with the compilation seems to be that ia64_jump_to_sal() only exists if CONFIG_HOTPLUG_CPU=y. (include/asm-ia64/sal.h, arch/ia64/kernel/head.S)

This may cause problem on SN platform.
I remember SN requires cpu0 return to SAL rendez loop to do IRQ redirection. However this needs SGI people to confirm...

Does this mean that CONFIG_HOTPLUG_CPU may be required for kdump on the SN platform?

Signature · 3 lines
Horms
  H: http://www.vergenet.net/~horms/
  W: http://www.valinux.co.jp/en/
#6 lore raw
In reply to Magnus Damm
Quoted 15 lines · Magnus Damm
Quoted 14 lines · Andrew Morton
Quoted 12 lines · Magnus Damm

kexec: Fix CONFIG_SMP=n compilation (ia64)

This patch makes it possible to compile kexec for ia64 without SMP support.

arch/ia64/kernel/machine_kexec.c 2007-02-01 12:35:46.000000000 +0900 renamed from arch/ia64/kernel/machine_kexec.c +1 -0
@@ -70,12 +70,14 @@ void machine_kexec_cleanup(struct kimage
 
 void machine_shutdown(void)
 {
+#ifdef CONFIG_SMP
      int cpu;
 
Quoted 9 lines
Quoted 9 lines

arch/ia64/kernel/machine_kexec.c 2007-02-01 12:35:46.000000000 +0900 void machine_kexec_cleanup(struct kimage · line 82

Quoted 7 lines
arch/ia64/kernel/machine_kexec.c 2007-02-01 12:35:46.000000000 +0900 renamed from arch/ia64/kernel/machine_kexec.c +1 -0
      for_each_online_cpu(cpu) {
              if (cpu != smp_processor_id())
                      cpu_down(cpu);
      }
+#endif
      kexec_disable_iosapic();
 }

hm. I suspect this one should have been #ifndef CONFIG_HOTPLUG_CPU?

Re-reading this I assume you mean #ifdef CONFIG_HOTPLUG_CPU.

I would be happy to resend a new updated version of the patch, but I wonder if it may be better to fail miserably during the build than fail silently in the case of CONFIG_SMP=y but CONFIG_HOTPLUG_CPU=n.

Any ideas?

Nan hai, is there any particular reason why the ia64 kexec code builds on top of cpu hotplug instead of smp functions such as smp_send_stop()?

Thanks!

/ magnus

#5 lore raw
In reply to Horms
Quoted 19 lines · Horms
Quoted 18 lines · Nanhai
Quoted 18 lines
Quoted 18 lines
Quoted 7 lines

void
machine_crash_shutdown(struct pt_regs *pt)

arch/ia64/kernel/crash.c +0 -1
@@ -132,11 +134,12 @@ kdump_cpu_freeze(struct unw_frame_info *
      atomic_inc(&kdump_cpu_freezed);
      kdump_status[cpuid] = 1;
      mb();
-     if (cpuid == 0) {

arch/ia64/kernel/crash.c kdump_cpu_freeze(struct unw_frame_info * · line 143

Quoted 10 lines
arch/ia64/kernel/crash.c +5 -3
-             for (;;)
-                     cpu_relax();
-     } else
+#ifdef CONFIG_HOTPLUG_CPU
+     if (cpuid != 0)
              ia64_jump_to_sal(&sal_boot_rendez_state[cpuid]);
+#endif
+     for (;;)
+             cpu_relax();
 }

I trust ia64_jump_to_sal doesn't return.

Quoted 7 lines
Quoted 7 lines
Quoted 4 lines

So do I. The main problem with the compilation seems to be that ia64_jump_to_sal() only exists if CONFIG_HOTPLUG_CPU=y. (include/asm-ia64/sal.h, arch/ia64/kernel/head.S)

This may cause problem on SN platform.
I remember SN requires cpu0 return to SAL rendez loop to do IRQ redirection. However this needs SGI people to confirm...

SN needs slave cpus being returned to SAL rendez loop with the exception of cpu0. It seems there is not a decent way to return cpu0, so we decided to handle cpu0 in PROM. This above code change does not casue problem on SN platform.

Quoted 3 lines

Does this mean that CONFIG_HOTPLUG_CPU may be required for kdump on the SN platform?

The SN platform uses the ia64_jump_to_sal() routine.

Thanks,
- jay

#7 lore raw
In reply to Magnus Damm
Quoted 26 lines · Magnus Damm
Quoted 15 lines · Magnus Damm
Quoted 14 lines · Andrew Morton
Quoted 12 lines · Magnus Damm

kexec: Fix CONFIG_SMP=n compilation (ia64)

This patch makes it possible to compile kexec for ia64 without SMP support.

arch/ia64/kernel/machine_kexec.c 2007-02-01 12:35:46.000000000 +0900 renamed from arch/ia64/kernel/machine_kexec.c +1 -0
@@ -70,12 +70,14 @@ void machine_kexec_cleanup(struct kimage
 
 void machine_shutdown(void)
 {
+#ifdef CONFIG_SMP
      int cpu;
 
Quoted 9 lines
Quoted 9 lines

arch/ia64/kernel/machine_kexec.c 2007-02-01 12:35:46.000000000 +0900 void machine_kexec_cleanup(struct kimage · line 82

Quoted 7 lines
arch/ia64/kernel/machine_kexec.c 2007-02-01 12:35:46.000000000 +0900 renamed from arch/ia64/kernel/machine_kexec.c +1 -0
      for_each_online_cpu(cpu) {
              if (cpu != smp_processor_id())
                      cpu_down(cpu);
      }
+#endif
      kexec_disable_iosapic();
 }

hm. I suspect this one should have been #ifndef CONFIG_HOTPLUG_CPU?

Quoted 5 lines

Re-reading this I assume you mean #ifdef CONFIG_HOTPLUG_CPU.

I would be happy to resend a new updated version of the patch, but I wonder if it may be better to fail miserably during the build than fail silently in the case of CONFIG_SMP=y but CONFIG_HOTPLUG_CPU=n.

There used to be alternate code for the CONFIG_SMP + !CONFIG_HOTPLUG_CPU, but this was removed because it was determined to be flakey and not maintainable (I can dig up the threads if you want). I think that this means that if we have CONFIG_KEXEC and CONFIG_SMP then CONFIG_HOTPLUG_CPU is required. I think this is expressable in Kconfig somehow.

Signature · 3 lines
Horms
  H: http://www.vergenet.net/~horms/
  W: http://www.valinux.co.jp/en/
#8 lore raw
Quoted 45 lines

-----Original Message-----
From: Horms [mailto:[email protected]]
Sent: 2007Äê2ÔÂ3ÈÕ 11:28
To: Magnus Damm
Cc: Andrew Morton; Magnus Damm; Luck, Tony; [email protected]; Zou, Nanhai; [email protected]; [email protected]
Subject: Re: [Fastboot] [PATCH] kexec: Fix CONFIG_SMP=n compilation (ia64)

Quoted 7 lines · Magnus Damm
Quoted 6 lines · Magnus Damm
Quoted 5 lines · Andrew Morton
Quoted 3 lines · Magnus Damm

kexec: Fix CONFIG_SMP=n compilation (ia64)

This patch makes it possible to compile kexec for ia64 without SMP

support.

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

arch/ia64/kernel/machine_kexec.c 2007-02-01

Quoted 2 lines
arch/ia64/kernel/machine_kexec.c 2007-02-01 renamed from arch/ia64/kernel/machine_kexec.c +0 -0

12:35:46.000000000 +0900

Quoted 17 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
arch/ia64/kernel/machine_kexec.c 2007-02-01 renamed from arch/ia64/kernel/machine_kexec.c +1 -0
@@ -70,12 +70,14 @@ void machine_kexec_cleanup(struct kimage
 
 void machine_shutdown(void)
 {
+#ifdef CONFIG_SMP
      int cpu;
 
Quoted 9 lines
Quoted 9 lines

arch/ia64/kernel/machine_kexec.c 2007-02-01 void machine_kexec_cleanup(struct kimage · line 82

Quoted 7 lines
arch/ia64/kernel/machine_kexec.c 2007-02-01 renamed from arch/ia64/kernel/machine_kexec.c +1 -0
      for_each_online_cpu(cpu) {
              if (cpu != smp_processor_id())
                      cpu_down(cpu);
      }
+#endif
      kexec_disable_iosapic();
 }

hm. I suspect this one should have been #ifndef CONFIG_HOTPLUG_CPU?

Quoted 5 lines

Re-reading this I assume you mean #ifdef CONFIG_HOTPLUG_CPU.

I would be happy to resend a new updated version of the patch, but I wonder if it may be better to fail miserably during the build than fail silently in the case of CONFIG_SMP=y but CONFIG_HOTPLUG_CPU=n.

Quoted 7 lines

There used to be alternate code for the CONFIG_SMP + !CONFIG_HOTPLUG_CPU, but this was removed because it was determined to be flakey and not maintainable (I can dig up the threads if you want). I think that this means that if we have CONFIG_KEXEC and CONFIG_SMP then CONFIG_HOTPLUG_CPU is required. I think this is expressable in Kconfig somehow.

Yes, CONFIG_HOTPLUG_CPU is required by Kexec.
But CONFIG_HOTPLUG_CPU is not required by Kdump except SN platform.

Zou Nan hai

Quoted 4 lines

--
Horms
H: http://www.vergenet.net/~horms/
W: http://www.valinux.co.jp/en/

#9 lore raw
In reply to Horms
Quoted 33 lines · Horms
Quoted 26 lines · Magnus Damm
Quoted 15 lines · Magnus Damm
Quoted 14 lines · Andrew Morton
Quoted 12 lines · Magnus Damm

kexec: Fix CONFIG_SMP=n compilation (ia64)

This patch makes it possible to compile kexec for ia64 without SMP support.

arch/ia64/kernel/machine_kexec.c 2007-02-01 12:35:46.000000000 +0900 renamed from arch/ia64/kernel/machine_kexec.c +1 -0
@@ -70,12 +70,14 @@ void machine_kexec_cleanup(struct kimage
 
 void machine_shutdown(void)
 {
+#ifdef CONFIG_SMP
      int cpu;
 
Quoted 9 lines
Quoted 9 lines

arch/ia64/kernel/machine_kexec.c 2007-02-01 12:35:46.000000000 +0900 void machine_kexec_cleanup(struct kimage · line 82

Quoted 7 lines
arch/ia64/kernel/machine_kexec.c 2007-02-01 12:35:46.000000000 +0900 renamed from arch/ia64/kernel/machine_kexec.c +1 -0
      for_each_online_cpu(cpu) {
              if (cpu != smp_processor_id())
                      cpu_down(cpu);
      }
+#endif
      kexec_disable_iosapic();
 }

hm. I suspect this one should have been #ifndef CONFIG_HOTPLUG_CPU?

Quoted 5 lines

Re-reading this I assume you mean #ifdef CONFIG_HOTPLUG_CPU.

I would be happy to resend a new updated version of the patch, but I wonder if it may be better to fail miserably during the build than fail silently in the case of CONFIG_SMP=y but CONFIG_HOTPLUG_CPU=n.

Quoted 6 lines

There used to be alternate code for the CONFIG_SMP + !CONFIG_HOTPLUG_CPU, but this was removed because it was determined to be flakey and not maintainable (I can dig up the threads if you want). I think that this means that if we have CONFIG_KEXEC and CONFIG_SMP then CONFIG_HOTPLUG_CPU is required. I think this is expressable in Kconfig somehow.

My mistake, the following lines from linux-2.6.20/arch/ia64/Kconfig seem to handle this case already:

config KEXEC

	bool "kexec system call (EXPERIMENTAL)"
	depends on EXPERIMENTAL && !IA64_HP_SIM && (!SMP || HOTPLUG_CPU)

I'll send an updated patch in a short while. Thanks!

/ magnus