diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-19 06:13:33 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-19 06:13:33 -0500 |
| commit | 4cd0332db7e8f57cc082bab11d82c064a9721737 (patch) | |
| tree | b6de7771d67c5bf6eeb890fa0f5a901365104b98 /arch/x86/kernel/dumpstack.c | |
| parent | 40999096e8b9872199bf56ecd0c4d98397ccaf2f (diff) | |
| parent | 712406a6bf59ebf4a00358bb59a4a2a1b2953d90 (diff) | |
Merge branch 'mainline/function-graph' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/function-graph-tracer
Diffstat (limited to 'arch/x86/kernel/dumpstack.c')
| -rw-r--r-- | arch/x86/kernel/dumpstack.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c index 077c9ea655fc..4325165753d8 100644 --- a/arch/x86/kernel/dumpstack.c +++ b/arch/x86/kernel/dumpstack.c | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | #include <linux/kdebug.h> | 10 | #include <linux/kdebug.h> |
| 11 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 12 | #include <linux/ptrace.h> | 12 | #include <linux/ptrace.h> |
| 13 | #include <linux/ftrace.h> | ||
| 13 | #include <linux/kexec.h> | 14 | #include <linux/kexec.h> |
| 14 | #include <linux/bug.h> | 15 | #include <linux/bug.h> |
| 15 | #include <linux/nmi.h> | 16 | #include <linux/nmi.h> |