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/kernel/time.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/kernel/time.c')
| -rw-r--r-- | arch/um/kernel/time.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/um/kernel/time.c b/arch/um/kernel/time.c index 259c49da7ff5..3571703a7cb4 100644 --- a/arch/um/kernel/time.c +++ b/arch/um/kernel/time.c @@ -181,9 +181,7 @@ void timer_handler(int sig, union uml_pt_regs *regs) timer_irq(regs); local_irq_disable(); irq_enter(); - update_process_times(CHOOSE_MODE( - (UPT_SC(regs) && user_context(UPT_SP(regs))), - (regs)->skas.is_user)); + update_process_times((regs)->skas.is_user); irq_exit(); local_irq_enable(); } |