aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/kernel
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2011-03-15 17:08:33 +0100
committerMartin Schwidefsky <sky@mschwide.boeblingen.de.ibm.com>2011-03-15 17:08:24 +0100
commit6966727db1389f4926c6fa6e87a600112a5658b9 (patch)
tree187ce5503669aff26980ebbe4d0b64b6f36d81df /arch/s390/kernel
parentd7b081ac0b8eee5f2a58123235061ee1b99a4f4d (diff)
downloadkernel_samsung_smdk4412-6966727db1389f4926c6fa6e87a600112a5658b9.zip
kernel_samsung_smdk4412-6966727db1389f4926c6fa6e87a600112a5658b9.tar.gz
kernel_samsung_smdk4412-6966727db1389f4926c6fa6e87a600112a5658b9.tar.bz2
[S390] kexec: Disable ftrace during kexec
Disable ftrace during kexec. Same as on x86/powerpc. ac4414e "powerpc/kdump: Disable ftrace during kexec". Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/kernel')
-rw-r--r--arch/s390/kernel/machine_kexec.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/s390/kernel/machine_kexec.c b/arch/s390/kernel/machine_kexec.c
index a922d51..b09b9c6 100644
--- a/arch/s390/kernel/machine_kexec.c
+++ b/arch/s390/kernel/machine_kexec.c
@@ -12,6 +12,7 @@
#include <linux/kexec.h>
#include <linux/delay.h>
#include <linux/reboot.h>
+#include <linux/ftrace.h>
#include <asm/cio.h>
#include <asm/setup.h>
#include <asm/pgtable.h>
@@ -71,6 +72,7 @@ static void __machine_kexec(void *data)
void machine_kexec(struct kimage *image)
{
+ tracer_disable();
smp_send_stop();
smp_switch_to_ipl_cpu(__machine_kexec, image);
}