diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-17 05:37:37 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-17 05:37:37 -0400 |
| commit | 4176935b58eeb636917e65a2c388e4607e36cce6 (patch) | |
| tree | dac4e0005cda5a3a5a313dde35bbac2877d9bd93 /kernel/trace/ftrace.c | |
| parent | c269fc8c537d761f36cb98e637ae934d9331a9d5 (diff) | |
| parent | 6adaad14d7d4d3ef31b4e2dc992b18b5da7c4eb3 (diff) | |
Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace
Diffstat (limited to 'kernel/trace/ftrace.c')
| -rw-r--r-- | kernel/trace/ftrace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index 90d5729afeff..7847806eefef 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c | |||
| @@ -537,7 +537,7 @@ static void ftrace_replace_code(int enable) | |||
| 537 | */ | 537 | */ |
| 538 | if (rec->flags & FTRACE_FL_FREE || | 538 | if (rec->flags & FTRACE_FL_FREE || |
| 539 | rec->flags & FTRACE_FL_FAILED || | 539 | rec->flags & FTRACE_FL_FAILED || |
| 540 | rec->flags & FTRACE_FL_CONVERTED) | 540 | !(rec->flags & FTRACE_FL_CONVERTED)) |
| 541 | continue; | 541 | continue; |
| 542 | 542 | ||
| 543 | /* ignore updates to this record's mcount site */ | 543 | /* ignore updates to this record's mcount site */ |