diff options
| author |   Bodo Stroesser <bstroesser@fujitsu-siemens.com> | 2006-01-18 17:42:51 -0800 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-18 19:20:20 -0800 |
| commit | 097fdf06c63741e6ac1a4e01c2255861dd0a1c49 (patch) | |
| tree | 0aa53ac292ce1dd31cc5a416231ffc47eb0da940 /arch/um/kernel/time_kern.c | |
| parent | [PATCH] uml: use setjmp/longjmp instead of sigsetjmp/siglongjmp (diff) | |
| download | linux-dev-097fdf06c63741e6ac1a4e01c2255861dd0a1c49.tar.xz linux-dev-097fdf06c63741e6ac1a4e01c2255861dd0a1c49.zip | |
[PATCH] uml: TT mode softint fixes
Some fixes to make softints work in tt mode.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/um/kernel/time_kern.c')
| -rw-r--r-- | arch/um/kernel/time_kern.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/um/kernel/time_kern.c b/arch/um/kernel/time_kern.c index 6fa4e1b892b7..3c7626cdba4b 100644 --- a/arch/um/kernel/time_kern.c +++ b/arch/um/kernel/time_kern.c @@ -187,8 +187,9 @@ void timer_handler(int sig, union uml_pt_regs *regs) { local_irq_disable(); irq_enter(); - update_process_times(CHOOSE_MODE(user_context(UPT_SP(regs)), - (regs)->skas.is_user)); + update_process_times(CHOOSE_MODE( + (UPT_SC(regs) && user_context(UPT_SP(regs))), + (regs)->skas.is_user)); irq_exit(); local_irq_enable(); if(current_thread->cpu == 0) |