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

1 files changed, 1 insertions, 1 deletions

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 5db7485158df..9c5987aca74b 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -3328,7 +3328,7 @@ create_trace_option_files(struct tracer *tracer)
         for (cnt = 0; opts[cnt].name; cnt++)
                 ;
 
-        topts = kzalloc(sizeof(*topts) * (cnt + 1), GFP_KERNEL);
+        topts = kcalloc(cnt + 1, sizeof(*topts), GFP_KERNEL);
         if (!topts)
                 return NULL;