From 6a6ec75c2f415e4d5a217bc2c1b7e5f3af565cce Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sat, 13 Oct 2012 03:26:10 -0400
Subject: [PATCH] --- yaml --- r: 340300 b: refs/heads/master c:
 999121a10cbf091cdb3c168754de6ddf1992e656 h: refs/heads/master v: v3

---
 [refs]                                   |  2 +-
 trunk/arch/blackfin/include/asm/unistd.h |  1 +
 trunk/arch/blackfin/kernel/process.c     | 20 --------------------
 3 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/[refs] b/[refs]
index f42964df6fb1..37d4dcf14279 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee1e17c69eb3c843d283eb3fbed1616ed9a122eb
+refs/heads/master: 999121a10cbf091cdb3c168754de6ddf1992e656
diff --git a/trunk/arch/blackfin/include/asm/unistd.h b/trunk/arch/blackfin/include/asm/unistd.h
index 5b2a0748d7d3..b4ec1bb3d5d4 100644
--- a/trunk/arch/blackfin/include/asm/unistd.h
+++ b/trunk/arch/blackfin/include/asm/unistd.h
@@ -446,6 +446,7 @@
 #define __ARCH_WANT_SYS_NICE
 #define __ARCH_WANT_SYS_RT_SIGACTION
 #define __ARCH_WANT_SYS_RT_SIGSUSPEND
+#define __ARCH_WANT_SYS_EXECVE
 
 /*
  * "Conditional" syscalls
diff --git a/trunk/arch/blackfin/kernel/process.c b/trunk/arch/blackfin/kernel/process.c
index 9945b94c63d4..da8df0e504ac 100644
--- a/trunk/arch/blackfin/kernel/process.c
+++ b/trunk/arch/blackfin/kernel/process.c
@@ -184,26 +184,6 @@ copy_thread(unsigned long clone_flags,
 	return 0;
 }
 
-/*
- * sys_execve() executes a new program.
- */
-asmlinkage int sys_execve(const char __user *name,
-			  const char __user *const __user *argv,
-			  const char __user *const __user *envp)
-{
-	int error;
-	struct filename *filename;
-	struct pt_regs *regs = (struct pt_regs *)((&name) + 6);
-
-	filename = getname(name);
-	error = PTR_ERR(filename);
-	if (IS_ERR(filename))
-		return error;
-	error = do_execve(filename->name, argv, envp, regs);
-	putname(filename);
-	return error;
-}
-
 unsigned long get_wchan(struct task_struct *p)
 {
 	unsigned long fp, pc;