diff options
| author | Jeff Dike <jdike@addtoit.com> | 2007-10-16 12:26:56 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 20:43:05 +0400 |
| commit | 6aa802ce6acc9b1f0b34114b3f7c21c84872cc3a (patch) | |
| tree | 74523303349693ef482dec4a1d803566b69c6abd /arch/um/sys-x86_64 | |
| parent | 4c9e13851315a25a705e7a686116e491041ca228 (diff) | |
| download | linux-6aa802ce6acc9b1f0b34114b3f7c21c84872cc3a.tar.xz | |
uml: throw out CHOOSE_MODE
The next stage after removing code which depends on CONFIG_MODE_TT is removing
the CHOOSE_MODE abstraction, which provided both compile-time and run-time
branching to either tt-mode or skas-mode code.
This patch removes choose-mode.h and all inclusions of it, and replaces all
CHOOSE_MODE invocations with the skas branch. This leaves a number of trivial
functions which will be dealt with in a later patch.
There are some changes in the uaccess and tls support which go somewhat beyond
this and eliminate some of the now-redundant functions.
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
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 c18d929e69bc..2d6cdd260c26 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 d0ff832c9eaf..d44398c9d27a 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, |