projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6...
[deliverable/linux.git]
/
kernel
/
trace
/
trace_kprobe.c
diff --git
a/kernel/trace/trace_kprobe.c
b/kernel/trace/trace_kprobe.c
index 35d55a386145aed31dcd698f16e1f38246c808fb..f925c45f0afa86d77c1c7b38cb174e72cba1aad6 100644
(file)
--- 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,
This page took
0.022876 seconds
and
5
git commands to generate.