From b638142b8af31c47b16bf57524096c8d7cee2bb4 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Wed, 10 Oct 2012 13:31:13 -0400
Subject: [PATCH] --- yaml --- r: 340305 b: refs/heads/master c:
 71915d21e59c153c1202e3198916817c2d18da32 h: refs/heads/master i:   340303:
 3bbd355d5d3ec005b052bf153116222b07da7c9d v: v3

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

diff --git a/[refs] b/[refs]
index 5d18745c1c5a..1d85df82223e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5fae1b664595adc621fb9294b7d19145918073de
+refs/heads/master: 71915d21e59c153c1202e3198916817c2d18da32
diff --git a/trunk/arch/h8300/include/asm/unistd.h b/trunk/arch/h8300/include/asm/unistd.h
index 5cd882801d79..07afcfaec995 100644
--- a/trunk/arch/h8300/include/asm/unistd.h
+++ b/trunk/arch/h8300/include/asm/unistd.h
@@ -356,6 +356,7 @@
 #define __ARCH_WANT_SYS_SIGPROCMASK
 #define __ARCH_WANT_SYS_RT_SIGACTION
 #define __ARCH_WANT_SYS_RT_SIGSUSPEND
+#define __ARCH_WANT_SYS_EXECVE
 
 /*
  * "Conditional" syscalls
diff --git a/trunk/arch/h8300/kernel/process.c b/trunk/arch/h8300/kernel/process.c
index e3dfea71c15f..2a45718cc5e8 100644
--- a/trunk/arch/h8300/kernel/process.c
+++ b/trunk/arch/h8300/kernel/process.c
@@ -183,27 +183,6 @@ int copy_thread(unsigned long clone_flags,
 	return 0;
 }
 
-/*
- * sys_execve() executes a new program.
- */
-asmlinkage int sys_execve(const char *name,
-			  const char *const *argv,
-			  const char *const *envp,
-			  int dummy, ...)
-{
-	int error;
-	struct filename *filename;
-	struct pt_regs *regs = (struct pt_regs *) ((unsigned char *)&dummy-4);
-
-	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 thread_saved_pc(struct task_struct *tsk)
 {
 	return ((struct pt_regs *)tsk->thread.esp0)->pc;