summaryrefslogtreecommitdiff
path: root/arch/um/kernel/tt/trap_user.c
diff options
context:
space:
mode:
authorBodo Stroesser <bstroesser@fujitsu-siemens.com>2006-01-18 17:42:51 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-18 19:20:20 -0800
commit097fdf06c63741e6ac1a4e01c2255861dd0a1c49 (patch)
tree0aa53ac292ce1dd31cc5a416231ffc47eb0da940 /arch/um/kernel/tt/trap_user.c
parentc83d4635ee8c8fe16046ff6cabcff708be16df75 (diff)
[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/tt/trap_user.c')
-rw-r--r--arch/um/kernel/tt/trap_user.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/um/kernel/tt/trap_user.c b/arch/um/kernel/tt/trap_user.c
index a414c529fbcd..b5d9d64d91e4 100644
--- a/arch/um/kernel/tt/trap_user.c
+++ b/arch/um/kernel/tt/trap_user.c
@@ -18,7 +18,7 @@ void sig_handler_common_tt(int sig, void *sc_ptr)
{
struct sigcontext *sc = sc_ptr;
struct tt_regs save_regs, *r;
- int save_errno = errno, is_user;
+ int save_errno = errno, is_user = 0;
void (*handler)(int, union uml_pt_regs *);
/* This is done because to allow SIGSEGV to be delivered inside a SEGV
@@ -35,7 +35,8 @@ void sig_handler_common_tt(int sig, void *sc_ptr)
GET_FAULTINFO_FROM_SC(r->faultinfo, sc);
}
save_regs = *r;
- is_user = user_context(SC_SP(sc));
+ if (sc)
+ is_user = user_context(SC_SP(sc));
r->sc = sc;
if(sig != SIGUSR2)
r->syscall = -1;