summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Kacur <jkacur@redhat.com>2009-10-12 23:09:24 +0200
committerGeert Uytterhoeven <geert@linux-m68k.org>2009-12-06 11:18:26 +0100
commit87fbaf6aea142b01756bbea09461daee41d93c0b (patch)
tree05c299d5dfe28b4c4f11aed6baf1a63009b1c810
parent7c5fd5619dc89fb52d2c2cf144fc6e4365427b86 (diff)
downloadblackbird-op-linux-87fbaf6aea142b01756bbea09461daee41d93c0b.tar.gz
blackbird-op-linux-87fbaf6aea142b01756bbea09461daee41d93c0b.zip
m68k: Remove the BKL from sys_execve
This seems like a copy-and-paste from code that no-longer needs the BKL Just remove it. Signed-off-by: John Kacur <jkacur@redhat.com> Reviewed-by: Frederic Weisbecker <fweisbec@gmail.com> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
-rw-r--r--arch/m68k/kernel/process.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/m68k/kernel/process.c b/arch/m68k/kernel/process.c
index 41230c595a8e..05296593e718 100644
--- a/arch/m68k/kernel/process.c
+++ b/arch/m68k/kernel/process.c
@@ -317,15 +317,12 @@ asmlinkage int sys_execve(char __user *name, char __user * __user *argv, char __
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;
}
OpenPOWER on IntegriCloud