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>
diff --git a/arch/um/sys-i386/ptrace.c b/arch/um/sys-i386/ptrace.c
index 572fd50..7792365 100644
--- a/arch/um/sys-i386/ptrace.c
+++ b/arch/um/sys-i386/ptrace.c
@@ -230,13 +230,13 @@
static inline int convert_fxsr_to_user(struct _fpstate __user *buf,
struct pt_regs *regs)
{
- return(CHOOSE_MODE(convert_fxsr_to_user_tt(buf, regs), 0));
+ return 0;
}
static inline int convert_fxsr_from_user(struct pt_regs *regs,
struct _fpstate __user *buf)
{
- return(CHOOSE_MODE(convert_fxsr_from_user_tt(regs, buf), 0));
+ return 0;
}
int get_fpregs(unsigned long buf, struct task_struct *child)
@@ -261,12 +261,12 @@
int get_fpxregs(unsigned long buf, struct task_struct *tsk)
{
- return(CHOOSE_MODE(get_fpxregs_tt(buf, tsk), 0));
+ return 0;
}
int set_fpxregs(unsigned long buf, struct task_struct *tsk)
{
- return(CHOOSE_MODE(set_fpxregs_tt(buf, tsk), 0));
+ return 0;
}
#ifdef notdef
@@ -286,16 +286,9 @@
}
#endif
-static inline void copy_fpu_fxsave(struct pt_regs *regs,
- struct user_i387_struct *buf)
-{
- (void) CHOOSE_MODE(copy_fpu_fxsave_tt(regs, buf), 0);
-}
-
int dump_fpu(struct pt_regs *regs, elf_fpregset_t *fpu )
{
- copy_fpu_fxsave(regs, (struct user_i387_struct *) fpu);
- return(1);
+ return 1;
}
/*