diff options
| author | Ingo Molnar <mingo@elte.hu> | 2012-01-08 12:31:24 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2012-01-08 12:31:24 +0100 |
| commit | 636f0c70f2557e0819b50c74e31b4a027327015e (patch) | |
| tree | 3a259ef26659dac92782651440091b9f5ab1a7f7 /kernel/sysctl_binary.c | |
| parent | 675eef66e3edcab8065533edfefbcbbacb9a30d3 (diff) | |
| parent | 2e885057b7f75035f0b85e02f737891482815a81 (diff) | |
| download | cachepc-linux-636f0c70f2557e0819b50c74e31b4a027327015e.tar.gz cachepc-linux-636f0c70f2557e0819b50c74e31b4a027327015e.zip | |
Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core
Diffstat (limited to 'kernel/sysctl_binary.c')
| -rw-r--r-- | kernel/sysctl_binary.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sysctl_binary.c b/kernel/sysctl_binary.c index 6318b511afa1..a650694883a1 100644 --- a/kernel/sysctl_binary.c +++ b/kernel/sysctl_binary.c @@ -1354,7 +1354,7 @@ static ssize_t binary_sysctl(const int *name, int nlen, fput(file); out_putname: - putname(pathname); + __putname(pathname); out: return result; } |