projects
/
deliverable
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
492a7ea
)
ftrace: fix merge
author
Ingo Molnar
<mingo@elte.hu>
Tue, 27 May 2008 23:22:08 +0000
(
01:22
+0200)
committer
Ingo Molnar
<mingo@elte.hu>
Tue, 27 May 2008 23:25:04 +0000
(
01:25
+0200)
Signed-off-by: Ingo Molnar <mingo@elte.hu>
include/linux/ftrace.h
patch
|
blob
|
blame
|
history
diff --git
a/include/linux/ftrace.h
b/include/linux/ftrace.h
index ffbbd54a720e4f904aca58b9d9fff30e4e7cc995..b482fe88bc0437bc43669c70bda520e063ebbecb 100644
(file)
--- a/
include/linux/ftrace.h
+++ b/
include/linux/ftrace.h
@@
-122,7
+122,7
@@
static inline void tracer_disable(void)
# define trace_preempt_off(a0, a1) do { } while (0)
#endif
-#ifdef CONFIG_
CONTEXT_SWITCH_TRACER
+#ifdef CONFIG_
TRACING
extern void
ftrace_special(unsigned long arg1, unsigned long arg2, unsigned long arg3);
#else
This page took
0.027038 seconds
and
5
git commands to generate.