iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branches 'tracing/branch-tracer' and 'tracing/urgent' into tracing/core

Browse Source
This commit is contained in:
Ingo Molnar 2008-11-18 08:52:13 +01:00
commit 5a209c2d58
3 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/profile.c
View File

@ -544,7 +544,7 @@ static const struct file_operations proc_profile_operations = {
}; };
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
static void __init profile_nop(void *unused) static inline void profile_nop(void *unused)
{ {
} }

2
kernel/trace/trace.c
View File

@ -259,9 +259,7 @@ static const char *trace_options[] = {
"sched-tree", "sched-tree",
"ftrace_printk", "ftrace_printk",
"ftrace_preempt", "ftrace_preempt",
#ifdef CONFIG_BRANCH_TRACER
"branch", "branch",
#endif
"annotate", "annotate",
NULL NULL
}; };

2
kernel/trace/trace.h
View File

@ -471,9 +471,7 @@ enum trace_iterator_flags {
TRACE_ITER_SCHED_TREE = 0x200, TRACE_ITER_SCHED_TREE = 0x200,
TRACE_ITER_PRINTK = 0x400, TRACE_ITER_PRINTK = 0x400,
TRACE_ITER_PREEMPTONLY = 0x800, TRACE_ITER_PREEMPTONLY = 0x800,
#ifdef CONFIG_BRANCH_TRACER
TRACE_ITER_BRANCH = 0x1000, TRACE_ITER_BRANCH = 0x1000,
#endif
TRACE_ITER_ANNOTATE = 0x2000, TRACE_ITER_ANNOTATE = 0x2000,
}; };