diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-09 10:37:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-09 10:37:46 -0700 |
| commit | c2ea122cd7c4a094be71641f3961796398035513 (patch) | |
| tree | 7150db3e27a078c8a4183964a882bb15ba9f3f64 /kernel | |
| parent | 17b2e9bf27d417bc186cc922b4d6d5eaa048f9d8 (diff) | |
| parent | 66bb74888eb4bef4ba7c87c931ecb7ecca3a240c (diff) | |
| download | kernel-common-c2ea122cd7c4a094be71641f3961796398035513.tar.gz kernel-common-c2ea122cd7c4a094be71641f3961796398035513.tar.bz2 kernel-common-c2ea122cd7c4a094be71641f3961796398035513.zip | |
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: consolidate documents
blktrace: pass the right pointer to kfree()
tracing/syscalls: use a dedicated file header
tracing: append a comma to INIT_FTRACE_GRAPH
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/trace/blktrace.c | 10 | ||||
| -rw-r--r-- | kernel/trace/trace_syscalls.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c index b32ff446c3fb..921ef5d1f0ba 100644 --- a/kernel/trace/blktrace.c +++ b/kernel/trace/blktrace.c @@ -1377,12 +1377,12 @@ static int blk_trace_str2mask(const char *str) { int i; int mask = 0; - char *s, *token; + char *buf, *s, *token; - s = kstrdup(str, GFP_KERNEL); - if (s == NULL) + buf = kstrdup(str, GFP_KERNEL); + if (buf == NULL) return -ENOMEM; - s = strstrip(s); + s = strstrip(buf); while (1) { token = strsep(&s, ","); @@ -1403,7 +1403,7 @@ static int blk_trace_str2mask(const char *str) break; } } - kfree(s); + kfree(buf); return mask; } diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c index a2a3af29c943..5e579645ac86 100644 --- a/kernel/trace/trace_syscalls.c +++ b/kernel/trace/trace_syscalls.c @@ -1,5 +1,5 @@ +#include <trace/syscall.h> #include <linux/kernel.h> -#include <linux/ftrace.h> #include <asm/syscall.h> #include "trace_output.h" |