aboutsummaryrefslogtreecommitdiff
path: root/arch/frv
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-12-09 08:07:51 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-09 08:07:51 -0800
commit2588465badb648a50cd19623f0dd0063c90d4e31 (patch)
treed114566c6b0c1d5b0958493a7a2ae5f1f2c6838c /arch/frv
parent18821b0408efc92ec2804128ba9382a3bcebf132 (diff)
parent8c0daee204f794d095ae301f408c5f9f40e4547d (diff)
downloadlinux-2.6.34-ux500-2588465badb648a50cd19623f0dd0063c90d4e31.tar.gz
Merge branch 'bkl-arch-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'bkl-arch-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: mn10300: Remove the BKL from sys_execve m68knommu: Remove the BKL from sys_execve m68k: Remove the BKL from sys_execve h83000: Remove BKL from sys_execve frv: Remove the BKL from sys_execve blackfin: Remove the BKL from sys_execve um: Remove BKL from mmapper um: Remove BKL from random s390: Remove BKL from prng
Diffstat (limited to 'arch/frv')
-rw-r--r--arch/frv/kernel/process.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/frv/kernel/process.c b/arch/frv/kernel/process.c
index 90425593821..21d0fd19276 100644
--- a/arch/frv/kernel/process.c
+++ b/arch/frv/kernel/process.c
@@ -255,15 +255,12 @@ asmlinkage int sys_execve(char __user *name, char __user * __user *argv, char __
int error;
char * filename;
- lock_kernel();
filename = getname(name);
error = PTR_ERR(filename);
if (IS_ERR(filename))
- goto out;
+ return error;
error = do_execve(filename, argv, envp, __frame);
putname(filename);
- out:
- unlock_kernel();
return error;
}