Skip to content

Commit

Permalink
frv: switch to generic sys_execve()
Browse files Browse the repository at this point in the history
current_pt_regs() here is simply __frame

Acked-by: David Howells <dhowells@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  • Loading branch information
Al Viro committed Oct 1, 2012
1 parent 02ce496 commit 460daba
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 19 deletions.
1 change: 1 addition & 0 deletions arch/frv/include/asm/ptrace.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions arch/frv/include/asm/unistd.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
19 changes: 0 additions & 19 deletions arch/frv/kernel/process.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 460daba

Please sign in to comment.