diff options
author | Christopher Kenna <cjk@cs.unc.edu> | 2012-09-20 13:33:17 -0400 |
---|---|---|
committer | Christopher Kenna <cjk@cs.unc.edu> | 2012-09-20 13:33:17 -0400 |
commit | 5e0a4919ccb230ab449826ef91bdf38a4ed283e5 (patch) | |
tree | 3790db1aa69ed50b08f34c21c1796785df6a0304 /kernel/sysctl_binary.c | |
parent | c00613f1fad38acec00ef2c009ae4e73110084ac (diff) | |
parent | 5dd038629bdedef22d5ecad2d5e75ad81f4dc694 (diff) |
Merge remote-tracking branch 'oneiric-ubuntu/pandaboard' into pandaboard-litmus
Remote branch is from Ubuntu Oneiric (tag Ubuntu-3.0.0-1215.27) with
minor patch to the TWL-RTC code. Trying to pull this into LITMUS^RT
staging (as of 9/20/2012) to get LITMUS^RT running on the PandaBoard.
Conflicts:
Makefile
fs/exec.c
include/linux/fs.h
kernel/fork.c
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 3b8e028b960..e055e8b533c 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, | |||
1354 | 1354 | ||
1355 | fput(file); | 1355 | fput(file); |
1356 | out_putname: | 1356 | out_putname: |
1357 | putname(pathname); | 1357 | __putname(pathname); |
1358 | out: | 1358 | out: |
1359 | return result; | 1359 | return result; |
1360 | } | 1360 | } |