diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
| commit | da733563be5a9da26fe81d9f007262d00b846e22 (patch) | |
| tree | db28291df94a2043af2123911984c5c173da4e6f /include/linux/ring_buffer.h | |
| parent | 6ccbcf2cb41131f8d56ef0723bf3f7c1f8486076 (diff) | |
| parent | dab78d7924598ea4031663dd10db814e2e324928 (diff) | |
Merge branch 'next' into for-linus
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 b891de96000f..67be0376d8e3 100644 --- a/include/linux/ring_buffer.h +++ b/include/linux/ring_buffer.h | |||
| @@ -154,6 +154,8 @@ void ring_buffer_record_enable(struct ring_buffer *buffer); | |||
| 154 | void ring_buffer_record_disable_cpu(struct ring_buffer *buffer, int cpu); | 154 | void ring_buffer_record_disable_cpu(struct ring_buffer *buffer, int cpu); |
| 155 | void ring_buffer_record_enable_cpu(struct ring_buffer *buffer, int cpu); | 155 | void ring_buffer_record_enable_cpu(struct ring_buffer *buffer, int cpu); |
| 156 | 156 | ||
| 157 | unsigned long ring_buffer_oldest_event_ts(struct ring_buffer *buffer, int cpu); | ||
| 158 | unsigned long ring_buffer_bytes_cpu(struct ring_buffer *buffer, int cpu); | ||
| 157 | unsigned long ring_buffer_entries(struct ring_buffer *buffer); | 159 | unsigned long ring_buffer_entries(struct ring_buffer *buffer); |
| 158 | unsigned long ring_buffer_overruns(struct ring_buffer *buffer); | 160 | unsigned long ring_buffer_overruns(struct ring_buffer *buffer); |
| 159 | unsigned long ring_buffer_entries_cpu(struct ring_buffer *buffer, int cpu); | 161 | unsigned long ring_buffer_entries_cpu(struct ring_buffer *buffer, int cpu); |