diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-26 13:15:33 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-26 13:15:33 -0400 |
| commit | 49e70dda359660f20fa21d03bfae132e15c78195 (patch) | |
| tree | a21498cdd419bbfd08729fed7d161a4d68c865c9 /include | |
| parent | 179b9145d58eb7158d4053a8308b9fc4608a6d6b (diff) | |
| parent | 725b13685c61168f71825b3fb67d96d2d7aa3b0f (diff) | |
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
perf tools: Dont use openat()
perf tools: Fix buffer allocation
perf tools: .gitignore += perf*.html
perf tools: Handle relative paths while loading module symbols
perf tools: Fix module symbol loading bug
perf_event, x86: Fix 'perf sched record' crashing the machine
perf_event: Update PERF_EVENT_FORK header definition
perf stat: Fix zero total printouts
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/perf_counter.h | 2 | ||||
| -rw-r--r-- | include/linux/perf_event.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/perf_counter.h b/include/linux/perf_counter.h index 368bd70f1d2d..7b7fbf433cff 100644 --- a/include/linux/perf_counter.h +++ b/include/linux/perf_counter.h | |||
| @@ -361,7 +361,7 @@ enum perf_event_type { | |||
| 361 | * struct perf_event_header header; | 361 | * struct perf_event_header header; |
| 362 | * u32 pid, ppid; | 362 | * u32 pid, ppid; |
| 363 | * u32 tid, ptid; | 363 | * u32 tid, ptid; |
| 364 | * { u64 time; } && PERF_SAMPLE_TIME | 364 | * u64 time; |
| 365 | * }; | 365 | * }; |
| 366 | */ | 366 | */ |
| 367 | PERF_EVENT_FORK = 7, | 367 | PERF_EVENT_FORK = 7, |
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index acefaf71e6dd..3a9d36d1e92a 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h | |||
| @@ -357,7 +357,7 @@ enum perf_event_type { | |||
| 357 | * struct perf_event_header header; | 357 | * struct perf_event_header header; |
| 358 | * u32 pid, ppid; | 358 | * u32 pid, ppid; |
| 359 | * u32 tid, ptid; | 359 | * u32 tid, ptid; |
| 360 | * { u64 time; } && PERF_SAMPLE_TIME | 360 | * u64 time; |
| 361 | * }; | 361 | * }; |
| 362 | */ | 362 | */ |
| 363 | PERF_RECORD_FORK = 7, | 363 | PERF_RECORD_FORK = 7, |