diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-04-28 21:51:37 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-04-28 21:51:37 +0200 |
| commit | ec517eac0373e3ee7a19b95dfa308f681be245fd (patch) | |
| tree | e3196a7635a5901d926bc9126e687053a03506d7 /kernel/trace | |
| parent | 5b4f67e17e72923bda64a076cc1ab6f079ff24b5 (diff) | |
| parent | 1437f5bca3c2d162f058cba37dfbeb20f619040d (diff) | |
Merge branch 'sched/core' into auto-latest
Diffstat (limited to 'kernel/trace')
| -rw-r--r-- | kernel/trace/trace_kprobe.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c index 35d55a386145..f925c45f0afa 100644 --- a/kernel/trace/trace_kprobe.c +++ b/kernel/trace/trace_kprobe.c @@ -53,7 +53,6 @@ const char *reserved_field_names[] = { "common_preempt_count", "common_pid", "common_tgid", - "common_lock_depth", FIELD_STRING_IP, FIELD_STRING_RETIP, FIELD_STRING_FUNC, |