Commit bc722f50 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'tip/tracing/ftrace' of... 

Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace
parents 16097439 770cb243

include/linux/kernel.h

+28 −1
Original line number Diff line number Diff line
@@ -369,8 +369,35 @@ static inline char *pack_hex_byte(char *buf, u8 byte) 


/*

 * General tracing related utility functions - trace_printk(),

 * tracing_start()/tracing_stop:

 * tracing_on/tracing_off and tracing_start()/tracing_stop

 *

 * Use tracing_on/tracing_off when you want to quickly turn on or off

 * tracing. It simply enables or disables the recording of the trace events.

 * This also corresponds to the user space debugfs/tracing/tracing_on

 * file, which gives a means for the kernel and userspace to interact.

 * Place a tracing_off() in the kernel where you want tracing to end.

 * From user space, examine the trace, and then echo 1 > tracing_on

 * to continue tracing.

 *

 * tracing_stop/tracing_start has slightly more overhead. It is used

 * by things like suspend to ram where disabling the recording of the

 * trace is not enough, but tracing must actually stop because things

 * like calling smp_processor_id() may crash the system.

 *

 * Most likely, you want to use tracing_on/tracing_off.

 */

#ifdef CONFIG_RING_BUFFER

void tracing_on(void);

void tracing_off(void);

/* trace_off_permanent stops recording with no way to bring it back */

void tracing_off_permanent(void);

int tracing_is_on(void);

#else

static inline void tracing_on(void) { }

static inline void tracing_off(void) { }

static inline void tracing_off_permanent(void) { }

static inline int tracing_is_on(void) { return 0; }

#endif

#ifdef CONFIG_TRACING

extern void tracing_start(void);

extern void tracing_stop(void);

include/linux/ring_buffer.h

+0 −15
Original line number Diff line number Diff line
@@ -124,21 +124,6 @@ void ring_buffer_normalize_time_stamp(int cpu, u64 *ts); 
size_t ring_buffer_page_len(void *page);





/*

 * 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);

int tracing_is_on(void);

#else

static inline void tracing_on(void) { }

static inline void tracing_off(void) { }

static inline void tracing_off_permanent(void) { }

static inline int tracing_is_on(void) { return 0; }

#endif



void *ring_buffer_alloc_read_page(struct ring_buffer *buffer);

void ring_buffer_free_read_page(struct ring_buffer *buffer, void *data);

int ring_buffer_read_page(struct ring_buffer *buffer, void **data_page,

kernel/trace/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -41,5 +41,6 @@ obj-$(CONFIG_WORKQUEUE_TRACER) += trace_workqueue.o 
obj-$(CONFIG_BLK_DEV_IO_TRACE)	+= blktrace.o

obj-$(CONFIG_EVENT_TRACER) += trace_events.o

obj-$(CONFIG_EVENT_TRACER) += events.o

obj-$(CONFIG_EVENT_TRACER) += trace_export.o



libftrace-y := ftrace.o

kernel/trace/ftrace.c

+5 −5
Original line number Diff line number Diff line
@@ -1869,21 +1869,21 @@ ftrace_notrace_release(struct inode *inode, struct file *file) 
	return ftrace_regex_release(inode, file, 0);

}



static struct file_operations ftrace_avail_fops = {

static const struct file_operations ftrace_avail_fops = {

	.open = ftrace_avail_open,

	.read = seq_read,

	.llseek = seq_lseek,

	.release = ftrace_avail_release,

};



static struct file_operations ftrace_failures_fops = {

static const struct file_operations ftrace_failures_fops = {

	.open = ftrace_failures_open,

	.read = seq_read,

	.llseek = seq_lseek,

	.release = ftrace_avail_release,

};



static struct file_operations ftrace_filter_fops = {

static const struct file_operations ftrace_filter_fops = {

	.open = ftrace_filter_open,

	.read = ftrace_regex_read,

	.write = ftrace_filter_write,
@@ -1891,7 +1891,7 @@ static struct file_operations ftrace_filter_fops = { 
	.release = ftrace_filter_release,

};



static struct file_operations ftrace_notrace_fops = {

static const struct file_operations ftrace_notrace_fops = {

	.open = ftrace_notrace_open,

	.read = ftrace_regex_read,

	.write = ftrace_notrace_write,
@@ -2423,7 +2423,7 @@ ftrace_pid_write(struct file *filp, const char __user *ubuf, 
	return cnt;

}



static struct file_operations ftrace_pid_fops = {

static const struct file_operations ftrace_pid_fops = {

	.read = ftrace_pid_read,

	.write = ftrace_pid_write,

};

kernel/trace/ring_buffer.c

+1 −1
Original line number Diff line number Diff line
@@ -2606,7 +2606,7 @@ rb_simple_write(struct file *filp, const char __user *ubuf, 
	return cnt;

}



static struct file_operations rb_simple_fops = {

static const struct file_operations rb_simple_fops = {

	.open		= tracing_open_generic,

	.read		= rb_simple_read,

	.write		= rb_simple_write,