diff options
Diffstat (limited to 'arch/um/sys-x86_64')
-rw-r--r-- | arch/um/sys-x86_64/signal.c | 9 | ||||
-rw-r--r-- | arch/um/sys-x86_64/syscalls.c | 4 |
2 files changed, 3 insertions, 10 deletions
diff --git a/arch/um/sys-x86_64/signal.c b/arch/um/sys-x86_64/signal.c index c18d929..2d6cdd2 100644 --- a/arch/um/sys-x86_64/signal.c +++ b/arch/um/sys-x86_64/signal.c @@ -12,7 +12,6 @@ #include "asm/sigcontext.h" #include "asm/ptrace.h" #include "asm/arch/ucontext.h" -#include "choose-mode.h" #include "sysdep/ptrace.h" #include "frame_kern.h" #include "skas.h" @@ -135,9 +134,7 @@ static int copy_sc_from_user(struct pt_regs *to, void __user *from) { int ret; - ret = CHOOSE_MODE(copy_sc_from_user_tt(UPT_SC(&to->regs), from, - sizeof(struct _fpstate)), - copy_sc_from_user_skas(to, from)); + ret = copy_sc_from_user_skas(to, from); return(ret); } @@ -146,9 +143,7 @@ static int copy_sc_to_user(struct sigcontext __user *to, struct pt_regs *from, unsigned long mask, unsigned long sp) { - return(CHOOSE_MODE(copy_sc_to_user_tt(to, fp, UPT_SC(&from->regs), - sizeof(*fp), sp), - copy_sc_to_user_skas(to, fp, from, mask, sp))); + return copy_sc_to_user_skas(to, fp, from, mask, sp); } struct rt_sigframe diff --git a/arch/um/sys-x86_64/syscalls.c b/arch/um/sys-x86_64/syscalls.c index d0ff832..d44398c 100644 --- a/arch/um/sys-x86_64/syscalls.c +++ b/arch/um/sys-x86_64/syscalls.c @@ -14,7 +14,6 @@ #include "asm/ptrace.h" #include "asm/unistd.h" #include "asm/prctl.h" /* XXX This should get the constants from libc */ -#include "choose-mode.h" #include "kern.h" #include "os.h" @@ -92,8 +91,7 @@ long arch_prctl_skas(struct task_struct *task, int code, long sys_arch_prctl(int code, unsigned long addr) { - return CHOOSE_MODE_PROC(arch_prctl_tt, arch_prctl_skas, current, code, - (unsigned long __user *) addr); + return arch_prctl_skas(current, code, (unsigned long __user *) addr); } long sys_clone(unsigned long clone_flags, unsigned long newsp, |