diff options
author | Jeff Dike <jdike@addtoit.com> | 2007-10-16 04:26:58 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 12:43:05 -0400 |
commit | 77bf4400319db9d2a8af6b00c2be6faa0f3d07cb (patch) | |
tree | ddc8fd48349b8d4dd2c0b26bce7f52f79b4e4077 /arch/um/os-Linux/signal.c | |
parent | ae2587e41254e48e670346aefa332d7469d86352 (diff) |
uml: remove code made redundant by CHOOSE_MODE removal
This patch makes a number of simplifications enabled by the removal of
CHOOSE_MODE. There were lots of functions that looked like
int foo(args){
foo_skas(args);
}
The bodies of foo_skas are now folded into foo, and their declarations (and
sometimes entire header files) are deleted.
In addition, the union uml_pt_regs, which was a union between the tt and skas
register formats, is now a struct, with the tt-mode arm of the union being
removed.
It turns out that usr2_handler was unused, so it is gone.
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/os-Linux/signal.c')
-rw-r--r-- | arch/um/os-Linux/signal.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/um/os-Linux/signal.c b/arch/um/os-Linux/signal.c index 0d6122adb8a7..583424b9797d 100644 --- a/arch/um/os-Linux/signal.c +++ b/arch/um/os-Linux/signal.c | |||
@@ -16,7 +16,6 @@ | |||
16 | #include "sysdep/sigcontext.h" | 16 | #include "sysdep/sigcontext.h" |
17 | #include "sysdep/barrier.h" | 17 | #include "sysdep/barrier.h" |
18 | #include "sigcontext.h" | 18 | #include "sigcontext.h" |
19 | #include "mode.h" | ||
20 | #include "os.h" | 19 | #include "os.h" |
21 | 20 | ||
22 | /* These are the asynchronous signals. SIGVTALRM and SIGARLM are handled | 21 | /* These are the asynchronous signals. SIGVTALRM and SIGARLM are handled |
@@ -60,14 +59,14 @@ void sig_handler(int sig, struct sigcontext *sc) | |||
60 | 59 | ||
61 | static void real_alarm_handler(int sig, struct sigcontext *sc) | 60 | static void real_alarm_handler(int sig, struct sigcontext *sc) |
62 | { | 61 | { |
63 | union uml_pt_regs regs; | 62 | struct uml_pt_regs regs; |
64 | 63 | ||
65 | if(sig == SIGALRM) | 64 | if(sig == SIGALRM) |
66 | switch_timers(0); | 65 | switch_timers(0); |
67 | 66 | ||
68 | if(sc != NULL) | 67 | if(sc != NULL) |
69 | copy_sc(®s, sc); | 68 | copy_sc(®s, sc); |
70 | regs.skas.is_user = 0; | 69 | regs.is_user = 0; |
71 | unblock_signals(); | 70 | unblock_signals(); |
72 | timer_handler(sig, ®s); | 71 | timer_handler(sig, ®s); |
73 | 72 | ||