diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2008-05-12 21:20:43 +0200 |
|---|---|---|
| committer |   Thomas Gleixner <tglx@linutronix.de> | 2008-05-23 20:39:05 +0200 |
| commit | f43fdad8627fec2d21df92799b254dceb66c9c3c (patch) | |
| tree | 09a9c54beaea06b814b3f4e6724375de282d944b /arch/x86/kernel/machine_kexec_64.c | |
| parent | ftrace: convert single large buffer into single pages. (diff) | |
| download | linux-dev-f43fdad8627fec2d21df92799b254dceb66c9c3c.tar.xz linux-dev-f43fdad8627fec2d21df92799b254dceb66c9c3c.zip | |
ftrace: fix kexec
disable the tracer while kexec pulls the rug from under the old
kernel.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/machine_kexec_64.c')
| -rw-r--r-- | arch/x86/kernel/machine_kexec_64.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/kernel/machine_kexec_64.c b/arch/x86/kernel/machine_kexec_64.c index 576a03db4511..1558fdc174f9 100644 --- a/arch/x86/kernel/machine_kexec_64.c +++ b/arch/x86/kernel/machine_kexec_64.c @@ -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(); |