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 /include/asm-um/ptrace-i386.h | |
| 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 'include/asm-um/ptrace-i386.h')
| -rw-r--r-- | include/asm-um/ptrace-i386.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/include/asm-um/ptrace-i386.h b/include/asm-um/ptrace-i386.h index 6e2528bb008..4928a31aca7 100644 --- a/include/asm-um/ptrace-i386.h +++ b/include/asm-um/ptrace-i386.h @@ -12,7 +12,6 @@ #include "sysdep/ptrace.h" #include "asm/ptrace-generic.h" #include "asm/host_ldt.h" -#include "choose-mode.h" #define PT_REGS_EAX(r) UPT_EAX(&(r)->regs) #define PT_REGS_EBX(r) UPT_EBX(&(r)->regs) @@ -59,15 +58,8 @@ extern int arch_switch_tls_tt(struct task_struct *from, struct task_struct *to); extern void arch_switch_to_tt(struct task_struct *from, struct task_struct *to); extern void arch_switch_to_skas(struct task_struct *from, struct task_struct *to); -static inline int do_get_thread_area(struct user_desc *info) -{ - return CHOOSE_MODE_PROC(do_get_thread_area_tt, do_get_thread_area_skas, info); -} - -static inline int do_set_thread_area(struct user_desc *info) -{ - return CHOOSE_MODE_PROC(do_set_thread_area_tt, do_set_thread_area_skas, info); -} +extern int do_get_thread_area_skas(struct user_desc *info); +extern int do_set_thread_area_skas(struct user_desc *info); struct task_struct; |