diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-28 09:03:58 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-28 09:03:58 +0100 |
| commit | e9abf4c59d75cd71f118764376d037a677f573d0 (patch) | |
| tree | 0b570eefd71926d441552d640114e0f7525e7b4c | |
| parent | da74ff0f9b31ed97104c22c278bf2b41bcf8f33c (diff) | |
| parent | 0cfe82451dfa3ebf4e69158f2eb450f2fbb6b715 (diff) | |
| download | kernel_samsung_tuna-e9abf4c59d75cd71f118764376d037a677f573d0.zip kernel_samsung_tuna-e9abf4c59d75cd71f118764376d037a677f573d0.tar.gz kernel_samsung_tuna-e9abf4c59d75cd71f118764376d037a677f573d0.tar.bz2 | |
Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace
| -rw-r--r-- | kernel/trace/trace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 5db7485..9c5987a 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; |