Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[IA64] kexec: Fix CONFIG_SMP=n compilation

Browse source 
Kexec support for 2.6.20 on ia64 does not build properly using a config
made up by CONFIG_SMP=n and CONFIG_HOTPLUG_CPU=n:

Signed-off-by: Magnus Damm <magnus@valinux.co.jp>
Acked-by: Simon Horman <horms@verge.net.au>
Acked-by: Jay Lan <jlan@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
This commit is contained in:
Magnus Damm 2007-02-05 15:43:42 +09:00 committed by Tony Luck
parent 62d0cfcb27
commit bcb9b99d1f
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
arch/ia64/kernel/crash.c
View file

@ -79,6 +79,7 @@ crash_save_this_cpu()
final_note(buf); final_note(buf);
} }
#ifdef CONFIG_SMP
static int static int
kdump_wait_cpu_freeze(void) kdump_wait_cpu_freeze(void)
{ {
@ -91,6 +92,7 @@ kdump_wait_cpu_freeze(void)
} }
return 1; return 1;
} }
#endif
void void
machine_crash_shutdown(struct pt_regs *pt) machine_crash_shutdown(struct pt_regs *pt)
@ -132,11 +134,12 @@ kdump_cpu_freeze(struct unw_frame_info *info, void *arg)
atomic_inc(&kdump_cpu_freezed); atomic_inc(&kdump_cpu_freezed);
kdump_status[cpuid] = 1; kdump_status[cpuid] = 1;
mb(); mb();
if (cpuid == 0) { #ifdef CONFIG_HOTPLUG_CPU
for (;;) if (cpuid != 0)
cpu_relax();
} else
ia64_jump_to_sal(&sal_boot_rendez_state[cpuid]); ia64_jump_to_sal(&sal_boot_rendez_state[cpuid]);
#endif
for (;;)
cpu_relax();
} }
static int static int

2
arch/ia64/kernel/machine_kexec.c
View file

@ -70,12 +70,14 @@ void machine_kexec_cleanup(struct kimage *image)
void machine_shutdown(void) void machine_shutdown(void)
{ {
#ifdef CONFIG_HOTPLUG_CPU
int cpu; int cpu;
for_each_online_cpu(cpu) { for_each_online_cpu(cpu) {
if (cpu != smp_processor_id()) if (cpu != smp_processor_id())
cpu_down(cpu); cpu_down(cpu);
} }
#endif
kexec_disable_iosapic(); kexec_disable_iosapic();
} }