From 198d5f87b809d5e2f118e3ef4e2da9d0ebd181a2 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Tue, 18 Sep 2012 22:25:02 -0400
Subject: [PATCH] --- yaml --- r: 333654 b: refs/heads/master c:
 460dabab73f2f60198c37ed7bf6d192d23eaa286 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index a7e556ef41dd..87e419e475fd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 02ce496f152df87be081a64796498942c433a2fd
+refs/heads/master: 460dabab73f2f60198c37ed7bf6d192d23eaa286
diff --git a/trunk/arch/frv/include/asm/ptrace.h b/trunk/arch/frv/include/asm/ptrace.h
index ef6635ca4ecb..bd534b2d0258 100644
--- a/trunk/arch/frv/include/asm/ptrace.h
+++ b/trunk/arch/frv/include/asm/ptrace.h
@@ -76,6 +76,7 @@ register struct pt_regs *__frame asm("gr28");
 #define user_mode(regs)			(!((regs)->psr & PSR_S))
 #define instruction_pointer(regs)	((regs)->pc)
 #define user_stack_pointer(regs)	((regs)->sp)
+#define current_pt_regs()		(__frame)
 
 extern unsigned long user_stack(const struct pt_regs *);
 #define profile_pc(regs) ((regs)->pc)
diff --git a/trunk/arch/frv/include/asm/unistd.h b/trunk/arch/frv/include/asm/unistd.h
index 67f23a311db6..24b64034866c 100644
--- a/trunk/arch/frv/include/asm/unistd.h
+++ b/trunk/arch/frv/include/asm/unistd.h
@@ -372,6 +372,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/frv/kernel/process.c b/trunk/arch/frv/kernel/process.c
index 0f02dee25e26..7ff4dbef0567 100644
--- a/trunk/arch/frv/kernel/process.c
+++ b/trunk/arch/frv/kernel/process.c
@@ -207,25 +207,6 @@ int copy_thread(unsigned long clone_flags,
 	return 0;
 } /* end copy_thread() */
 
-/*
- * 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;
-	char * filename;
-
-	filename = getname(name);
-	error = PTR_ERR(filename);
-	if (IS_ERR(filename))
-		return error;
-	error = do_execve(filename, argv, envp, __frame);
-	putname(filename);
-	return error;
-}
-
 unsigned long get_wchan(struct task_struct *p)
 {
 	struct pt_regs *regs0;