diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-07-10 13:30:06 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-07-10 13:30:06 +0200 |
| commit | e202687927c132b1e1ff36b526b5e78ac33de840 (patch) | |
| tree | 8c1cadd560913e41237af48fc0058a9ed640dda7 /include/linux | |
| parent | a35780005eb256eb5ec83ffcc802967295887a45 (diff) | |
| parent | 8b2c70d1e43074cc06afe99b0de12b686d9c9d02 (diff) | |
Merge branch 'tip/tracing/ring-buffer-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/core
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ring_buffer.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/ring_buffer.h b/include/linux/ring_buffer.h index 29f8599e6bea..7fca71693ae7 100644 --- a/include/linux/ring_buffer.h +++ b/include/linux/ring_buffer.h @@ -170,7 +170,6 @@ 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); unsigned long ring_buffer_commit_overrun_cpu(struct ring_buffer *buffer, int cpu); -unsigned long ring_buffer_nmi_dropped_cpu(struct ring_buffer *buffer, int cpu); u64 ring_buffer_time_stamp(struct ring_buffer *buffer, int cpu); void ring_buffer_normalize_time_stamp(struct ring_buffer *buffer, |