Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f43fdad8 authored by Ingo Molnar's avatar Ingo Molnar Committed by Thomas Gleixner
Browse files

ftrace: fix kexec 



disable the tracer while kexec pulls the rug from under the old
kernel.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 4c11d7ae

arch/x86/kernel/machine_kexec_32.c

+4 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 
#include <linux/delay.h>

#include <linux/init.h>

#include <linux/numa.h>

#include <linux/ftrace.h>



#include <asm/pgtable.h>

#include <asm/pgalloc.h>

#include <asm/tlbflush.h>
@@ -107,6 +109,8 @@ NORET_TYPE void machine_kexec(struct kimage *image) 
	unsigned long page_list[PAGES_NR];

	void *control_page;



	tracer_disable();



	/* Interrupts aren't acceptable while we reboot */

	local_irq_disable();

arch/x86/kernel/machine_kexec_64.c

+4 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 
#include <linux/string.h>

#include <linux/reboot.h>

#include <linux/numa.h>

#include <linux/ftrace.h>



#include <asm/pgtable.h>

#include <asm/tlbflush.h>

#include <asm/mmu_context.h>
@@ -184,6 +186,8 @@ NORET_TYPE void machine_kexec(struct kimage *image) 
	unsigned long page_list[PAGES_NR];

	void *control_page;



	tracer_disable();



	/* Interrupts aren't acceptable while we reboot */

	local_irq_disable();

include/linux/ftrace.h

+7 −0
Original line number Diff line number Diff line
@@ -68,6 +68,13 @@ extern void ftrace_call(void); 
extern void mcount_call(void);

#endif



static inline void tracer_disable(void)

{

#ifdef CONFIG_FTRACE

	ftrace_enabled = 0;

#endif

}



#ifdef CONFIG_FRAME_POINTER

/* TODO: need to fix this for ARM */

# define CALLER_ADDR0 ((unsigned long)__builtin_return_address(0))