From fd026237bac26ee5b9f850cf15de48ec3df14b75 Mon Sep 17 00:00:00 2001
From: Jonas Bonn <jonas@southpole.se>
Date: Fri, 19 Oct 2012 18:25:36 +0200
Subject: [PATCH] --- yaml --- r: 340259 b: refs/heads/master c:
 a91a2bb1dbd87987645bdb56f49e6a50501b692a h: refs/heads/master i:   340257:
 cb29c3d4c3245dd6956f90d9acf73de1d679b34e   340255:
 ccadabcb84f8aad7e2ea5fb7e154652af67a4cac v: v3

---
 [refs]                                        |  2 +-
 trunk/arch/openrisc/include/uapi/asm/unistd.h |  2 ++
 trunk/arch/openrisc/kernel/entry.S            |  4 ----
 trunk/arch/openrisc/kernel/process.c          | 24 -------------------
 4 files changed, 3 insertions(+), 29 deletions(-)

diff --git a/[refs] b/[refs]
index 43268da8f71c..c47fca090104 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cbf23cf1b96819599f6a1b9658d1bf3a97c6ff15
+refs/heads/master: a91a2bb1dbd87987645bdb56f49e6a50501b692a
diff --git a/trunk/arch/openrisc/include/uapi/asm/unistd.h b/trunk/arch/openrisc/include/uapi/asm/unistd.h
index 437bdbb61b14..5db7bc0fa5a7 100644
--- a/trunk/arch/openrisc/include/uapi/asm/unistd.h
+++ b/trunk/arch/openrisc/include/uapi/asm/unistd.h
@@ -20,6 +20,8 @@
 
 #define sys_mmap2 sys_mmap_pgoff
 
+#define __ARCH_WANT_SYS_EXECVE
+
 #include <asm-generic/unistd.h>
 
 #define __NR_or1k_atomic __NR_arch_specific_syscall
diff --git a/trunk/arch/openrisc/kernel/entry.S b/trunk/arch/openrisc/kernel/entry.S
index dce86aef8aba..c60a09df323f 100644
--- a/trunk/arch/openrisc/kernel/entry.S
+++ b/trunk/arch/openrisc/kernel/entry.S
@@ -1083,10 +1083,6 @@ ENTRY(sys_fork)
 	l.j	_fork_save_extra_regs_and_call
 	 l.addi	r3,r1,0
 
-ENTRY(sys_execve)
-	l.j	_sys_execve
-	 l.addi	r6,r1,0
-
 ENTRY(sys_sigaltstack)
 	l.j	_sys_sigaltstack
 	 l.addi	r5,r1,0
diff --git a/trunk/arch/openrisc/kernel/process.c b/trunk/arch/openrisc/kernel/process.c
index a0f467e438fc..e0874b8e09e4 100644
--- a/trunk/arch/openrisc/kernel/process.c
+++ b/trunk/arch/openrisc/kernel/process.c
@@ -251,30 +251,6 @@ void dump_elf_thread(elf_greg_t *dest, struct pt_regs* regs)
 	dest[35] = 0;
 }
 
-/*
- * sys_execve() executes a new program.
- */
-asmlinkage long _sys_execve(const char __user *name,
-			    const char __user * const __user *argv,
-			    const char __user * const __user *envp,
-			    struct pt_regs *regs)
-{
-	int error;
-	struct filename *filename;
-
-	filename = getname(name);
-	error = PTR_ERR(filename);
-
-	if (IS_ERR(filename))
-		goto out;
-
-	error = do_execve(filename->name, argv, envp, regs);
-	putname(filename);
-
-out:
-	return error;
-}
-
 unsigned long get_wchan(struct task_struct *p)
 {
 	/* TODO */