From 63596ce3f5594d467f0c323db04600bbeae5e449 Mon Sep 17 00:00:00 2001
From: John Kacur <jkacur@redhat.com>
Date: Mon, 12 Oct 2009 23:09:24 +0200
Subject: [PATCH] --- yaml --- r: 172683 b: refs/heads/master c:
 87fbaf6aea142b01756bbea09461daee41d93c0b h: refs/heads/master i:   172681:
 befc4ebbe3cbf712c6c00b2582784e9f61086c47   172679:
 0cf5e59f8301c2ed32d17a1bb9bc0931c7bd4db8 v: v3

---
 [refs]                           | 2 +-
 trunk/arch/m68k/kernel/process.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index a2f9ed818a7c..0aa8f0a0a84c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c5fd5619dc89fb52d2c2cf144fc6e4365427b86
+refs/heads/master: 87fbaf6aea142b01756bbea09461daee41d93c0b
diff --git a/trunk/arch/m68k/kernel/process.c b/trunk/arch/m68k/kernel/process.c
index 41230c595a8e..05296593e718 100644
--- a/trunk/arch/m68k/kernel/process.c
+++ b/trunk/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;
 }