LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] kexec: Fix CONFIG_SMP=n compilation (ia64)
@ 2007-02-01 13:13 Magnus Damm
  2007-02-02  0:33 ` Andrew Morton
  0 siblings, 1 reply; 10+ messages in thread
From: Magnus Damm @ 2007-02-01 13:13 UTC (permalink / raw)
  To: linux-kernel; +Cc: akpm, Magnus Damm

kexec: Fix CONFIG_SMP=n compilation (ia64)

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

Signed-off-by: Magnus Damm <magnus@valinux.co.jp>
---

 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(-)

--- 0002/arch/ia64/kernel/crash.c
+++ work/arch/ia64/kernel/crash.c	2007-02-01 12:42:38.000000000 +0900
@@ -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
--- 0002/arch/ia64/kernel/machine_kexec.c
+++ work/arch/ia64/kernel/machine_kexec.c	2007-02-01 12:35:46.000000000 +0900
@@ -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();
 }

^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2007-02-05  6:41 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-02-01 13:13 [PATCH] kexec: Fix CONFIG_SMP=n compilation (ia64) Magnus Damm
2007-02-02  0:33 ` Andrew Morton
2007-02-02  2:38   ` Magnus Damm
2007-02-02  3:01     ` Zou, Nanhai
2007-02-02  3:57       ` [Fastboot] " Horms
2007-02-02 15:21         ` Jay Lan
2007-02-02 11:53     ` Magnus Damm
2007-02-03  3:27       ` [Fastboot] " Horms
2007-02-05  1:02         ` Zou, Nanhai
2007-02-05  6:41         ` Magnus Damm

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).