Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bcb9b99d authored by Magnus Damm's avatar Magnus Damm Committed by Tony Luck
Browse files

[IA64] kexec: Fix CONFIG_SMP=n compilation 



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: default avatarMagnus Damm <magnus@valinux.co.jp>
Acked-by: default avatarSimon Horman <horms@verge.net.au>
Acked-by: default avatarJay Lan <jlan@sgi.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 62d0cfcb

arch/ia64/kernel/crash.c

+7 −4
Original line number Diff line number Diff line
@@ -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 *info, void *arg) 
	atomic_inc(&kdump_cpu_freezed);

	kdump_status[cpuid] = 1;

	mb();

	if (cpuid == 0) {

#ifdef CONFIG_HOTPLUG_CPU

	if (cpuid != 0)

		ia64_jump_to_sal(&sal_boot_rendez_state[cpuid]);

#endif

	for (;;)

		cpu_relax();

	} else

		ia64_jump_to_sal(&sal_boot_rendez_state[cpuid]);

}



static int

arch/ia64/kernel/machine_kexec.c

+2 −0
Original line number Diff line number Diff line
@@ -70,12 +70,14 @@ void machine_kexec_cleanup(struct kimage *image) 


void machine_shutdown(void)

{

#ifdef CONFIG_HOTPLUG_CPU

	int cpu;



	for_each_online_cpu(cpu) {

		if (cpu != smp_processor_id())

			cpu_down(cpu);

	}

#endif

	kexec_disable_iosapic();

}