diff options
| author | Jeff Dike <jdike@addtoit.com> | 2007-10-16 01:26:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 09:43:05 -0700 |
| commit | 6aa802ce6acc9b1f0b34114b3f7c21c84872cc3a (patch) | |
| tree | 74523303349693ef482dec4a1d803566b69c6abd /arch/um/sys-i386/signal.c | |
| parent | 4c9e13851315a25a705e7a686116e491041ca228 (diff) | |
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-i386/signal.c')
| -rw-r--r-- | arch/um/sys-i386/signal.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/arch/um/sys-i386/signal.c b/arch/um/sys-i386/signal.c index 187ea27536b..a9fe8d6f72c 100644 --- a/arch/um/sys-i386/signal.c +++ b/arch/um/sys-i386/signal.c @@ -12,7 +12,6 @@ #include "frame_kern.h" #include "sigcontext.h" #include "registers.h" -#include "mode.h" #include "skas.h" void copy_sc(union uml_pt_regs *regs, void *from) @@ -108,20 +107,13 @@ int copy_sc_to_user_skas(struct sigcontext __user *to, struct _fpstate __user *t 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)); - return ret; + return copy_sc_from_user_skas(to, from); } static int copy_sc_to_user(struct sigcontext __user *to, struct _fpstate __user *fp, struct pt_regs *from, 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, sp)); + return copy_sc_to_user_skas(to, fp, from, sp); } static int copy_ucontext_to_user(struct ucontext __user *uc, struct _fpstate __user *fp, |