diff options
author | Jeff Dike <jdike@addtoit.com> | 2006-01-08 04:01:33 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-08 23:13:40 -0500 |
commit | c0a689d05d8dc1580aeb87b2959e3de8c57f5f77 (patch) | |
tree | 05e8b4f18f90a9b2b6cebed72cb668808c94cafb /arch/um/os-Linux/skas/trap.c | |
parent | f8aaeacec159f2d9003872781fa4d49659e347fb (diff) |
[PATCH] uml: whitespace cleanup
This fixes some mangled whitespace added by the earlier trap_user.c patch.
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/os-Linux/skas/trap.c')
-rw-r--r-- | arch/um/os-Linux/skas/trap.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/um/os-Linux/skas/trap.c b/arch/um/os-Linux/skas/trap.c index 818f30e9004f..9ad5fbec4593 100644 --- a/arch/um/os-Linux/skas/trap.c +++ b/arch/um/os-Linux/skas/trap.c | |||
@@ -34,11 +34,11 @@ void sig_handler_common_skas(int sig, void *sc_ptr) | |||
34 | r = &TASK_REGS(get_current())->skas; | 34 | r = &TASK_REGS(get_current())->skas; |
35 | save_user = r->is_user; | 35 | save_user = r->is_user; |
36 | r->is_user = 0; | 36 | r->is_user = 0; |
37 | if ( sig == SIGFPE || sig == SIGSEGV || | 37 | if ( sig == SIGFPE || sig == SIGSEGV || |
38 | sig == SIGBUS || sig == SIGILL || | 38 | sig == SIGBUS || sig == SIGILL || |
39 | sig == SIGTRAP ) { | 39 | sig == SIGTRAP ) { |
40 | GET_FAULTINFO_FROM_SC(r->faultinfo, sc); | 40 | GET_FAULTINFO_FROM_SC(r->faultinfo, sc); |
41 | } | 41 | } |
42 | 42 | ||
43 | change_sig(SIGUSR1, 1); | 43 | change_sig(SIGUSR1, 1); |
44 | 44 | ||
@@ -60,8 +60,8 @@ extern int ptrace_faultinfo; | |||
60 | void user_signal(int sig, union uml_pt_regs *regs, int pid) | 60 | void user_signal(int sig, union uml_pt_regs *regs, int pid) |
61 | { | 61 | { |
62 | void (*handler)(int, union uml_pt_regs *); | 62 | void (*handler)(int, union uml_pt_regs *); |
63 | int segv = ((sig == SIGFPE) || (sig == SIGSEGV) || (sig == SIGBUS) || | 63 | int segv = ((sig == SIGFPE) || (sig == SIGSEGV) || (sig == SIGBUS) || |
64 | (sig == SIGILL) || (sig == SIGTRAP)); | 64 | (sig == SIGILL) || (sig == SIGTRAP)); |
65 | 65 | ||
66 | if (segv) | 66 | if (segv) |
67 | get_skas_faultinfo(pid, ®s->skas.faultinfo); | 67 | get_skas_faultinfo(pid, ®s->skas.faultinfo); |