2014-06-09 11:48:42

by Fabian Frédérick

Subject: [PATCH 1/1] kernel/trace/ftrace.c: replace kmalloc/snprintf by kasprintf

Cc: Steven Rostedt <[email protected]>
Cc: Andrew Morton <[email protected]>
Signed-off-by: Fabian Frederick <[email protected]>
---
kernel/trace/ftrace.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 4a54a25..92a3316 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -1072,9 +1072,7 @@ static __init void ftrace_profile_debugfs(struct dentry *d_tracer)

for_each_possible_cpu(cpu) {
stat = &per_cpu(ftrace_profile_stats, cpu);
-
- /* allocate enough for function name + cpu number */
- name = kmalloc(32, GFP_KERNEL);
+ name = kasprintf(GFP_KERNEL, "function%d", cpu);
if (!name) {
/*
* The files created are permanent, if something happens
@@ -1086,7 +1084,6 @@ static __init void ftrace_profile_debugfs(struct dentry *d_tracer)
return;
}
stat->stat = function_stats;
- snprintf(name, 32, "function%d", cpu);
stat->stat.name = name;
ret = register_stat_tracer(&stat->stat);
if (ret) {
@@ -1097,7 +1094,6 @@ static __init void ftrace_profile_debugfs(struct dentry *d_tracer)
return;
}
}
-
entry = debugfs_create_file("function_profile_enabled", 0644,
d_tracer, NULL, &ftrace_profile_fops);
if (!entry)
--
1.8.4.5

2014-06-09 13:49:40

by Steven Rostedt

Subject: Re: [PATCH 1/1] kernel/trace/ftrace.c: replace kmalloc/snprintf by kasprintf

On Mon, 9 Jun 2014 13:47:21 +0200
Fabian Frederick <[email protected]> wrote:

> @@ -1097,7 +1094,6 @@ static __init void ftrace_profile_debugfs(struct dentry *d_tracer)
> return;
> }
> }
> -

Unneeded change.

-- Steve

> entry = debugfs_create_file("function_profile_enabled", 0644,
> d_tracer, NULL, &ftrace_profile_fops);
> if (!entry)