From 10bf6439135ca2b7dd147c81697611a70a731b7e Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Thu, 7 May 2009 11:49:35 -0400 Subject: [PATCH] --- yaml --- r: 146149 b: refs/heads/master c: d6bf81ef0f7474434c2a049e8bf3c9146a14dd96 h: refs/heads/master i: 146147: 291a8fac5c53dfcb8d7296e818f4db1b0f1227b6 v: v3 --- [refs] | 2 +- trunk/kernel/trace/trace_events.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f43f277dad61..fa9d0924607c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 29c8000ee7da3a6756d26143991e573eaaf2a9f6 +refs/heads/master: d6bf81ef0f7474434c2a049e8bf3c9146a14dd96 diff --git a/trunk/kernel/trace/trace_events.c b/trunk/kernel/trace/trace_events.c index 87feb0117ce2..8d0fae3af595 100644 --- a/trunk/kernel/trace/trace_events.c +++ b/trunk/kernel/trace/trace_events.c @@ -509,9 +509,11 @@ system_enable_write(struct file *filp, const char __user *ubuf, size_t cnt, return -EINVAL; } - command = kstrdup(system, GFP_KERNEL); + /* +3 for the ":*\0" */ + command = kmalloc(strlen(system)+3, GFP_KERNEL); if (!command) return -ENOMEM; + sprintf(command, "%s:*", system); ret = ftrace_set_clr_event(command, val); if (ret) @@ -1179,7 +1181,7 @@ static __init int event_trace_init(void) &ftrace_show_header_fops); trace_create_file("enable", 0644, d_events, - "*:*", &ftrace_system_enable_fops); + "*", &ftrace_system_enable_fops); for_each_event(call, __start_ftrace_events, __stop_ftrace_events) { /* The linker may leave blanks */