diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-09 08:07:51 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-09 08:07:51 -0800 |
| commit | 2588465badb648a50cd19623f0dd0063c90d4e31 (patch) | |
| tree | d114566c6b0c1d5b0958493a7a2ae5f1f2c6838c /arch/m68knommu | |
| parent | 18821b0408efc92ec2804128ba9382a3bcebf132 (diff) | |
| parent | 8c0daee204f794d095ae301f408c5f9f40e4547d (diff) | |
| download | linux-stable-2588465badb648a50cd19623f0dd0063c90d4e31.tar.gz linux-stable-2588465badb648a50cd19623f0dd0063c90d4e31.tar.bz2 linux-stable-2588465badb648a50cd19623f0dd0063c90d4e31.zip | |
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/m68knommu')
| -rw-r--r-- | arch/m68knommu/kernel/process.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/m68knommu/kernel/process.c b/arch/m68knommu/kernel/process.c index 8f8f4abab2ff..5c9ecd427090 100644 --- a/arch/m68knommu/kernel/process.c +++ b/arch/m68knommu/kernel/process.c @@ -352,15 +352,12 @@ asmlinkage int sys_execve(char *name, char **argv, char **envp) char * filename; struct pt_regs *regs = (struct pt_regs *) &name; - lock_kernel(); filename = getname(name); error = PTR_ERR(filename); if (IS_ERR(filename)) - goto out; + return error; error = do_execve(filename, argv, envp, regs); putname(filename); -out: - unlock_kernel(); return error; } |