From 1768613357adec43667b45b4acec2ca39728ef78 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Wed, 18 Mar 2009 19:07:16 +0900
Subject: [PATCH] --- yaml --- r: 133347 b: refs/heads/master c:
 7e6b6f2b949a52382f59a93ecbe86e32e4fcec7c h: refs/heads/master i:   133345:
 5739099d5870baced1d52c7d6eec34040a31757a   133343:
 22dcde8a96ee8fca9d8db5e48de5e75a6b830d73 v: v3

---
 [refs]                               | 2 +-
 trunk/arch/sh/kernel/machine_kexec.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0f020278d689..40da2eddcf76 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a6bab7b5c18501e4dd3201ae8ac1dc6da5f07acc
+refs/heads/master: 7e6b6f2b949a52382f59a93ecbe86e32e4fcec7c
diff --git a/trunk/arch/sh/kernel/machine_kexec.c b/trunk/arch/sh/kernel/machine_kexec.c
index 69268c0d8063..cc7c29b0dc8d 100644
--- a/trunk/arch/sh/kernel/machine_kexec.c
+++ b/trunk/arch/sh/kernel/machine_kexec.c
@@ -14,6 +14,7 @@
 #include <linux/delay.h>
 #include <linux/reboot.h>
 #include <linux/numa.h>
+#include <linux/ftrace.h>
 #include <linux/suspend.h>
 #include <asm/pgtable.h>
 #include <asm/pgalloc.h>
@@ -78,6 +79,7 @@ void machine_kexec(struct kimage *image)
 	relocate_new_kernel_t rnk;
 	unsigned long entry;
 	unsigned long *ptr;
+	int save_ftrace_enabled;
 
 	/*
 	 * Nicked from the mips version of machine_kexec():
@@ -97,6 +99,8 @@ void machine_kexec(struct kimage *image)
 		save_processor_state();
 #endif
 
+	save_ftrace_enabled = __ftrace_enabled_save();
+
 	/* Interrupts aren't acceptable while we reboot */
 	local_irq_disable();
 
@@ -138,6 +142,8 @@ void machine_kexec(struct kimage *image)
 			*ptr = virt_to_phys(*ptr);
 	}
 #endif
+
+	__ftrace_enabled_restore(save_ftrace_enabled);
 }
 
 void arch_crash_save_vmcoreinfo(void)