From 6af58da8867f0188820784cea63d035653c25938 Mon Sep 17 00:00:00 2001 From: John Kacur Date: Mon, 12 Oct 2009 22:44:40 +0200 Subject: [PATCH] --- yaml --- r: 173211 b: refs/heads/master c: 25708a5fe7467dcc69d9b92c1701aad4a0c71887 h: refs/heads/master i: 173209: 0e24c13ffde4f70113d57623aa79f4f89c05da96 173207: 6e8b4bffbd256953a6604b458f8ce1c2e122ce1b v: v3 --- [refs] | 2 +- trunk/arch/blackfin/kernel/process.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index de78032c6c02..5a497425dc27 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d63c489b881707adf9c0b89f771b30a1d78f4197 +refs/heads/master: 25708a5fe7467dcc69d9b92c1701aad4a0c71887 diff --git a/trunk/arch/blackfin/kernel/process.c b/trunk/arch/blackfin/kernel/process.c index 430ae39456e8..7d9c9750fd93 100644 --- a/trunk/arch/blackfin/kernel/process.c +++ b/trunk/arch/blackfin/kernel/process.c @@ -215,22 +215,18 @@ copy_thread(unsigned long clone_flags, /* * sys_execve() executes a new program. */ - asmlinkage int sys_execve(char __user *name, char __user * __user *argv, char __user * __user *envp) { int error; char *filename; struct pt_regs *regs = (struct pt_regs *)((&name) + 6); - 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; }