Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a797cdc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'tracing-fixes-for-linus' of... 

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:
  tracing: Fix trace_marker output
  tracing: Fix event format export
  tracing: Fix return value of tracing_stats_read()
parents bb2166c8 c13d2f7c

include/trace/ftrace.h

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ 
#undef __get_str



#undef TP_printk

#define TP_printk(fmt, args...) "%s, %s\n", #fmt, __stringify(args)

#define TP_printk(fmt, args...) "\"%s\", %s\n", fmt, __stringify(args)



#undef TP_fast_assign

#define TP_fast_assign(args...) args

kernel/trace/trace.c

+15 −26
Original line number Diff line number Diff line
@@ -1361,11 +1361,12 @@ int trace_array_vprintk(struct trace_array *tr, 
	pause_graph_tracing();

	raw_local_irq_save(irq_flags);

	__raw_spin_lock(&trace_buf_lock);

	if (args == NULL) {

		strncpy(trace_buf, fmt, TRACE_BUF_SIZE);

		len = strlen(trace_buf);

	} else

		len = vsnprintf(trace_buf, TRACE_BUF_SIZE, fmt, args);



	len = min(len, TRACE_BUF_SIZE-1);

	trace_buf[len] = 0;



	size = sizeof(*entry) + len + 1;

	buffer = tr->buffer;

	event = trace_buffer_lock_reserve(buffer, TRACE_PRINT, size,
@@ -1376,7 +1377,7 @@ int trace_array_vprintk(struct trace_array *tr, 
	entry->ip = ip;



	memcpy(&entry->buf, trace_buf, len);

	entry->buf[len] = 0;

	entry->buf[len] = '\0';

	if (!filter_check_discard(call, entry, buffer, event))

		ring_buffer_unlock_commit(buffer, event);
@@ -3319,22 +3320,11 @@ tracing_entries_write(struct file *filp, const char __user *ubuf, 
	return cnt;

}



static int mark_printk(const char *fmt, ...)

{

	int ret;

	va_list args;

	va_start(args, fmt);

	ret = trace_vprintk(0, fmt, args);

	va_end(args);

	return ret;

}



static ssize_t

tracing_mark_write(struct file *filp, const char __user *ubuf,

					size_t cnt, loff_t *fpos)

{

	char *buf;

	char *end;



	if (tracing_disabled)

		return -EINVAL;
@@ -3342,7 +3332,7 @@ tracing_mark_write(struct file *filp, const char __user *ubuf, 
	if (cnt > TRACE_BUF_SIZE)

		cnt = TRACE_BUF_SIZE;



	buf = kmalloc(cnt + 1, GFP_KERNEL);

	buf = kmalloc(cnt + 2, GFP_KERNEL);

	if (buf == NULL)

		return -ENOMEM;
@@ -3350,14 +3340,13 @@ tracing_mark_write(struct file *filp, const char __user *ubuf, 
		kfree(buf);

		return -EFAULT;

	}



	/* Cut from the first nil or newline. */

	if (buf[cnt-1] != '\n') {

		buf[cnt] = '\n';

		buf[cnt+1] = '\0';

	} else

		buf[cnt] = '\0';

	end = strchr(buf, '\n');

	if (end)

		*end = '\0';



	cnt = mark_printk("%s\n", buf);

	cnt = trace_vprintk(0, buf, NULL);

	kfree(buf);

	*fpos += cnt;
@@ -3730,7 +3719,7 @@ tracing_stats_read(struct file *filp, char __user *ubuf, 


	s = kmalloc(sizeof(*s), GFP_KERNEL);

	if (!s)

		return ENOMEM;

		return -ENOMEM;



	trace_seq_init(s);