diff --git a/[refs] b/[refs] index 493b98c7492f..b0a5ca4259c6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fbc9bf9f0ed4f0fbc47dcb5b1c26c28c93b60e33 +refs/heads/master: e09373f22e76cc048ca5fe10a9ff9012f5d64309 diff --git a/trunk/include/linux/ring_buffer.h b/trunk/include/linux/ring_buffer.h index e097c2e6b6dc..de9d8c12e5ec 100644 --- a/trunk/include/linux/ring_buffer.h +++ b/trunk/include/linux/ring_buffer.h @@ -116,6 +116,8 @@ void ring_buffer_record_enable_cpu(struct ring_buffer *buffer, int cpu); unsigned long ring_buffer_entries(struct ring_buffer *buffer); unsigned long ring_buffer_overruns(struct ring_buffer *buffer); +unsigned long ring_buffer_entries_cpu(struct ring_buffer *buffer, int cpu); +unsigned long ring_buffer_overrun_cpu(struct ring_buffer *buffer, int cpu); u64 ring_buffer_time_stamp(int cpu); void ring_buffer_normalize_time_stamp(int cpu, u64 *ts);