From 0fd1c7dea591a51c678e9a2cdcd451e3cd26c7e9 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Wed, 19 Sep 2012 13:08:13 -0400
Subject: [PATCH] --- yaml --- r: 333658 b: refs/heads/master c:
 8f1597e959a3cfeae8f5cfae26890710f9092443 h: refs/heads/master v: v3

---
 [refs]                                  |  2 +-
 trunk/arch/mn10300/include/asm/ptrace.h |  1 +
 trunk/arch/mn10300/include/asm/unistd.h |  1 +
 trunk/arch/mn10300/kernel/process.c     | 16 ----------------
 4 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index eb760809f5c3..a088a19b74a8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 255461c53a91d34e2eddb8c8a2ba39e99065d7c1
+refs/heads/master: 8f1597e959a3cfeae8f5cfae26890710f9092443
diff --git a/trunk/arch/mn10300/include/asm/ptrace.h b/trunk/arch/mn10300/include/asm/ptrace.h
index 44251b974f1d..08ac856c053e 100644
--- a/trunk/arch/mn10300/include/asm/ptrace.h
+++ b/trunk/arch/mn10300/include/asm/ptrace.h
@@ -86,6 +86,7 @@ struct pt_regs {
 #define user_mode(regs)			(((regs)->epsw & EPSW_nSL) == EPSW_nSL)
 #define instruction_pointer(regs)	((regs)->pc)
 #define user_stack_pointer(regs)	((regs)->sp)
+#define current_pt_regs()		current_frame()
 
 #define arch_has_single_step()	(1)
 
diff --git a/trunk/arch/mn10300/include/asm/unistd.h b/trunk/arch/mn10300/include/asm/unistd.h
index 866eb14749d7..a965de47b2bd 100644
--- a/trunk/arch/mn10300/include/asm/unistd.h
+++ b/trunk/arch/mn10300/include/asm/unistd.h
@@ -382,6 +382,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/mn10300/kernel/process.c b/trunk/arch/mn10300/kernel/process.c
index be87fbee4da5..49af5ca89343 100644
--- a/trunk/arch/mn10300/kernel/process.c
+++ b/trunk/arch/mn10300/kernel/process.c
@@ -283,22 +283,6 @@ asmlinkage long sys_vfork(void)
 		       current_frame(), 0, NULL, NULL);
 }
 
-asmlinkage long sys_execve(const char __user *name,
-			   const char __user *const __user *argv,
-			   const char __user *const __user *envp)
-{
-	char *filename;
-	int error;
-
-	filename = getname(name);
-	error = PTR_ERR(filename);
-	if (IS_ERR(filename))
-		return error;
-	error = do_execve(filename, argv, envp, current_frame());
-	putname(filename);
-	return error;
-}
-
 unsigned long get_wchan(struct task_struct *p)
 {
 	return p->thread.wchan;