Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 1 insertions, 4 deletions

diff --git a/arch/frv/kernel/process.c b/arch/frv/kernel/process.c
index 904255938216..21d0fd19276d 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;
 }