diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-18 19:06:35 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-18 19:06:35 +0300 |
| commit | 72b51a6b4d803381f16d819df392dd1efd1c7181 (patch) | |
| tree | 7e27a03c10cb2f5e6593dd599b3c8b0bcd0f9ee9 /include | |
| parent | 8c60bfb0666952728b3be73ef9bc133d686aebba (diff) | |
| parent | e270219f4372b58bd3eeac12bd9f7edc592b8f6b (diff) | |
| download | linux-72b51a6b4d803381f16d819df392dd1efd1c7181.tar.xz | |
Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
kernel/profile.c: fix section mismatch warning
function tracing: fix wrong pos computing when read buffer has been fulfilled
tracing: fix mmiotrace resizing crash
ring-buffer: no preempt for sched_clock()
ring-buffer: buffer record on/off switch
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ring_buffer.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/ring_buffer.h b/include/linux/ring_buffer.h index 536b0ca46a03..e097c2e6b6dc 100644 --- a/include/linux/ring_buffer.h +++ b/include/linux/ring_buffer.h @@ -120,6 +120,9 @@ unsigned long ring_buffer_overruns(struct ring_buffer *buffer); u64 ring_buffer_time_stamp(int cpu); void ring_buffer_normalize_time_stamp(int cpu, u64 *ts); +void tracing_on(void); +void tracing_off(void); + enum ring_buffer_flags { RB_FL_OVERWRITE = 1 << 0, }; |