diff options
Diffstat (limited to 'arch/powerpc/kernel/machine_kexec.c')
| -rw-r--r-- | arch/powerpc/kernel/machine_kexec.c | 2 | 
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/machine_kexec.c b/arch/powerpc/kernel/machine_kexec.c index 2694d078741d..936c7e2d421e 100644 --- a/arch/powerpc/kernel/machine_kexec.c +++ b/arch/powerpc/kernel/machine_kexec.c @@ -98,12 +98,14 @@ void machine_kexec(struct kimage *image)  	int save_ftrace_enabled;  	save_ftrace_enabled = __ftrace_enabled_save(); +	this_cpu_disable_ftrace();  	if (ppc_md.machine_kexec)  		ppc_md.machine_kexec(image);  	else  		default_machine_kexec(image); +	this_cpu_enable_ftrace();  	__ftrace_enabled_restore(save_ftrace_enabled);  	/* Fall back to normal restart if we're still alive. */  | 
