diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-07 17:10:10 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-07 17:10:10 -0400 |
| commit | c93f216b5b985a12a18323e5ca2eb01db3d2f000 (patch) | |
| tree | 45fa35b290005f8b241dd76b6342875b81432fc3 /arch/x86 | |
| parent | c61b79b6ef266890954213a701d8f6021d8c1289 (diff) | |
| parent | ab3c9c686e22ab264269337ce7b75d9760211198 (diff) | |
Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
branch tracer, intel-iommu: fix build with CONFIG_BRANCH_TRACER=y
branch tracer: Fix for enabling branch profiling makes sparse unusable
ftrace: Correct a text align for event format output
Update /debug/tracing/README
tracing/ftrace: alloc the started cpumask for the trace file
tracing, x86: remove duplicated #include
ftrace: Add check of sched_stopped for probe_sched_wakeup
function-graph: add proper initialization for init task
tracing/ftrace: fix missing include string.h
tracing: fix incorrect return type of ns2usecs()
tracing: remove CALLER_ADDR2 from wakeup tracer
blktrace: fix pdu_len when tracing packet command requests
blktrace: small cleanup in blk_msg_write()
blktrace: NUL-terminate user space messages
tracing: move scripts/trace/power.pl to scripts/tracing/power.pl
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kernel/ftrace.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c index 61df77532120..70a10ca100f6 100644 --- a/arch/x86/kernel/ftrace.c +++ b/arch/x86/kernel/ftrace.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | 20 | ||
| 21 | #include <asm/cacheflush.h> | 21 | #include <asm/cacheflush.h> |
| 22 | #include <asm/ftrace.h> | 22 | #include <asm/ftrace.h> |
| 23 | #include <linux/ftrace.h> | ||
| 24 | #include <asm/nops.h> | 23 | #include <asm/nops.h> |
| 25 | #include <asm/nmi.h> | 24 | #include <asm/nmi.h> |
| 26 | 25 | ||