diff options
| author | Robert Richter <robert.richter@amd.com> | 2009-01-08 08:27:34 -0500 |
|---|---|---|
| committer | Robert Richter <robert.richter@amd.com> | 2009-01-08 08:27:34 -0500 |
| commit | d2852b932f0bb5e89177aa27c7bcf07f4167e129 (patch) | |
| tree | 96d975ae155ba307acd07968939fff22afedddf7 /include/linux/ring_buffer.h | |
| parent | 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 (diff) | |
| parent | 14f0ca8eaea42a5b5a69cfcb699665dd2618db5f (diff) | |
Merge branch 'oprofile/ring_buffer' into oprofile/oprofile-for-tip
Diffstat (limited to 'include/linux/ring_buffer.h')
| -rw-r--r-- | include/linux/ring_buffer.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/ring_buffer.h b/include/linux/ring_buffer.h index e097c2e6b6dc..de9d8c12e5ec 100644 --- a/include/linux/ring_buffer.h +++ b/include/linux/ring_buffer.h | |||
| @@ -116,6 +116,8 @@ void ring_buffer_record_enable_cpu(struct ring_buffer *buffer, int cpu); | |||
| 116 | 116 | ||
| 117 | unsigned long ring_buffer_entries(struct ring_buffer *buffer); | 117 | unsigned long ring_buffer_entries(struct ring_buffer *buffer); |
| 118 | unsigned long ring_buffer_overruns(struct ring_buffer *buffer); | 118 | unsigned long ring_buffer_overruns(struct ring_buffer *buffer); |
| 119 | unsigned long ring_buffer_entries_cpu(struct ring_buffer *buffer, int cpu); | ||
| 120 | unsigned long ring_buffer_overrun_cpu(struct ring_buffer *buffer, int cpu); | ||
| 119 | 121 | ||
| 120 | u64 ring_buffer_time_stamp(int cpu); | 122 | u64 ring_buffer_time_stamp(int cpu); |
| 121 | void ring_buffer_normalize_time_stamp(int cpu, u64 *ts); | 123 | void ring_buffer_normalize_time_stamp(int cpu, u64 *ts); |