diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-09 10:35:12 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-09 10:35:12 +0100 |
| commit | 44b0635481437140b0e29d6023f05e805d5e7620 (patch) | |
| tree | ff31986115075410d0479df307a6b9841976026c /include/linux/ring_buffer.h | |
| parent | 4ad476e11f94fd3724c6e272d8220e99cd222b27 (diff) | |
| parent | 57794a9d48b63e34acbe63282628c9f029603308 (diff) | |
| download | linux-44b0635481437140b0e29d6023f05e805d5e7620.tar.gz linux-44b0635481437140b0e29d6023f05e805d5e7620.tar.bz2 linux-44b0635481437140b0e29d6023f05e805d5e7620.zip | |
Merge branch 'tip/tracing/core/devel' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace
Conflicts:
kernel/trace/trace_hw_branches.c
Diffstat (limited to 'include/linux/ring_buffer.h')
| -rw-r--r-- | include/linux/ring_buffer.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/ring_buffer.h b/include/linux/ring_buffer.h index 3110d92e7d81..3c103d636da3 100644 --- a/include/linux/ring_buffer.h +++ b/include/linux/ring_buffer.h @@ -121,9 +121,18 @@ 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); +/* + * The below functions are fine to use outside the tracing facility. + */ +#ifdef CONFIG_RING_BUFFER void tracing_on(void); void tracing_off(void); void tracing_off_permanent(void); +#else +static inline void tracing_on(void) { } +static inline void tracing_off(void) { } +static inline void tracing_off_permanent(void) { } +#endif void *ring_buffer_alloc_read_page(struct ring_buffer *buffer); void ring_buffer_free_read_page(struct ring_buffer *buffer, void *data); |