diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-05-20 14:06:24 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-05-20 14:08:05 -0400 |
| commit | 250f972d85effad5b6e10da4bbd877e6a4b503b6 (patch) | |
| tree | 007393a6fc6439af7e0121dd99a6f9f9fb8405bc /tools/perf/Documentation/perf-script-python.txt | |
| parent | 7372b0b122af0f6675f3ab65bfd91c8a438e0480 (diff) | |
| parent | bbe7b8bef48c567f5ff3f6041c1fb011292e8f12 (diff) | |
Merge branch 'timers/urgent' into timers/core
Reason: Get upstream fixes and kfree_rcu which is necessary for a
follow up patch.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'tools/perf/Documentation/perf-script-python.txt')
| -rw-r--r-- | tools/perf/Documentation/perf-script-python.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/perf/Documentation/perf-script-python.txt b/tools/perf/Documentation/perf-script-python.txt index 36b38277422c..471022069119 100644 --- a/tools/perf/Documentation/perf-script-python.txt +++ b/tools/perf/Documentation/perf-script-python.txt | |||
| @@ -463,7 +463,6 @@ The format file for the sched_wakep event defines the following fields | |||
| 463 | field:unsigned char common_flags; | 463 | field:unsigned char common_flags; |
| 464 | field:unsigned char common_preempt_count; | 464 | field:unsigned char common_preempt_count; |
| 465 | field:int common_pid; | 465 | field:int common_pid; |
| 466 | field:int common_lock_depth; | ||
| 467 | 466 | ||
| 468 | field:char comm[TASK_COMM_LEN]; | 467 | field:char comm[TASK_COMM_LEN]; |
| 469 | field:pid_t pid; | 468 | field:pid_t pid; |