Skip to content

Commit

Permalink
powerpc/kdump: Disable ftrace during kexec
Browse files Browse the repository at this point in the history
We should disable ftrace during kexec, some of the tracers are very invasive
and we do not want them going off while doing the low level work of swapping
one kernel out for another. This mirrors what we do on x86.

Even though we cannot return from a kexec on powerpc (since we do not implement
CONFIG_KEXEC_JUMP), add the restore code in case we do one day.

Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
  • Loading branch information
Anton Blanchard authored and Benjamin Herrenschmidt committed Jan 21, 2011
1 parent 158d5b5 commit ac4414e
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions arch/powerpc/kernel/machine_kexec.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include <linux/memblock.h>
#include <linux/of.h>
#include <linux/irq.h>
#include <linux/ftrace.h>

#include <asm/machdep.h>
#include <asm/prom.h>
Expand Down Expand Up @@ -82,8 +83,14 @@ void arch_crash_save_vmcoreinfo(void)
*/
void machine_kexec(struct kimage *image)
{
int save_ftrace_enabled;

save_ftrace_enabled = __ftrace_enabled_save();

default_machine_kexec(image);

__ftrace_enabled_restore(save_ftrace_enabled);

/* Fall back to normal restart if we're still alive. */
machine_restart(NULL);
for(;;);
Expand Down

0 comments on commit ac4414e

Please sign in to comment.