浏览代码

powerpc/kdump: Disable ftrace during kexec

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>
Anton Blanchard 14 年之前
父节点
当前提交
ac4414e4d3
共有 1 个文件被更改,包括 7 次插入0 次删除
  1. 7 0
      arch/powerpc/kernel/machine_kexec.c

+ 7 - 0
arch/powerpc/kernel/machine_kexec.c

@@ -15,6 +15,7 @@
 #include <linux/memblock.h>
 #include <linux/memblock.h>
 #include <linux/of.h>
 #include <linux/of.h>
 #include <linux/irq.h>
 #include <linux/irq.h>
+#include <linux/ftrace.h>
 
 
 #include <asm/machdep.h>
 #include <asm/machdep.h>
 #include <asm/prom.h>
 #include <asm/prom.h>
@@ -82,8 +83,14 @@ void arch_crash_save_vmcoreinfo(void)
  */
  */
 void machine_kexec(struct kimage *image)
 void machine_kexec(struct kimage *image)
 {
 {
+	int save_ftrace_enabled;
+
+	save_ftrace_enabled = __ftrace_enabled_save();
+
 	default_machine_kexec(image);
 	default_machine_kexec(image);
 
 
+	__ftrace_enabled_restore(save_ftrace_enabled);
+
 	/* Fall back to normal restart if we're still alive. */
 	/* Fall back to normal restart if we're still alive. */
 	machine_restart(NULL);
 	machine_restart(NULL);
 	for(;;);
 	for(;;);