diff options
| author | Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> | 2007-03-07 23:41:10 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-08 10:38:21 -0500 |
| commit | 9ff1d36cf4b8b7dc4efbc83ac617a63020b1125d (patch) | |
| tree | 6fe3e468aec31dd226178bac77afd52562ae9296 | |
| parent | 83f4e8afc9a22eabb1c4cb771ffcb3af81734082 (diff) | |
[PATCH] um: remove dead code about os_usr1_signal() and os_usr1_process()
os_usr1_signal() is totally unused, os_usr1_process() is used only by TT mode.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Acked-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | arch/um/include/os.h | 3 | ||||
| -rw-r--r-- | arch/um/os-Linux/process.c | 3 | ||||
| -rw-r--r-- | arch/um/os-Linux/signal.c | 5 |
3 files changed, 5 insertions, 6 deletions
diff --git a/arch/um/include/os.h b/arch/um/include/os.h index 8629bd191492..5c74da410451 100644 --- a/arch/um/include/os.h +++ b/arch/um/include/os.h | |||
| @@ -192,7 +192,9 @@ extern int os_process_parent(int pid); | |||
| 192 | extern void os_stop_process(int pid); | 192 | extern void os_stop_process(int pid); |
| 193 | extern void os_kill_process(int pid, int reap_child); | 193 | extern void os_kill_process(int pid, int reap_child); |
| 194 | extern void os_kill_ptraced_process(int pid, int reap_child); | 194 | extern void os_kill_ptraced_process(int pid, int reap_child); |
| 195 | #ifdef UML_CONFIG_MODE_TT | ||
| 195 | extern void os_usr1_process(int pid); | 196 | extern void os_usr1_process(int pid); |
| 197 | #endif | ||
| 196 | extern long os_ptrace_ldt(long pid, long addr, long data); | 198 | extern long os_ptrace_ldt(long pid, long addr, long data); |
| 197 | 199 | ||
| 198 | extern int os_getpid(void); | 200 | extern int os_getpid(void); |
| @@ -261,7 +263,6 @@ extern void block_signals(void); | |||
| 261 | extern void unblock_signals(void); | 263 | extern void unblock_signals(void); |
| 262 | extern int get_signals(void); | 264 | extern int get_signals(void); |
| 263 | extern int set_signals(int enable); | 265 | extern int set_signals(int enable); |
| 264 | extern void os_usr1_signal(int on); | ||
| 265 | 266 | ||
| 266 | /* trap.c */ | 267 | /* trap.c */ |
| 267 | extern void os_fill_handlinfo(struct kern_handlers h); | 268 | extern void os_fill_handlinfo(struct kern_handlers h); |
diff --git a/arch/um/os-Linux/process.c b/arch/um/os-Linux/process.c index c692a192957a..76bdd6712417 100644 --- a/arch/um/os-Linux/process.c +++ b/arch/um/os-Linux/process.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include "longjmp.h" | 21 | #include "longjmp.h" |
| 22 | #include "skas_ptrace.h" | 22 | #include "skas_ptrace.h" |
| 23 | #include "kern_constants.h" | 23 | #include "kern_constants.h" |
| 24 | #include "uml-config.h" | ||
| 24 | 25 | ||
| 25 | #define ARBITRARY_ADDR -1 | 26 | #define ARBITRARY_ADDR -1 |
| 26 | #define FAILURE_PID -1 | 27 | #define FAILURE_PID -1 |
| @@ -131,10 +132,12 @@ void os_kill_ptraced_process(int pid, int reap_child) | |||
| 131 | CATCH_EINTR(waitpid(pid, NULL, 0)); | 132 | CATCH_EINTR(waitpid(pid, NULL, 0)); |
| 132 | } | 133 | } |
| 133 | 134 | ||
| 135 | #ifdef UML_CONFIG_MODE_TT | ||
| 134 | void os_usr1_process(int pid) | 136 | void os_usr1_process(int pid) |
| 135 | { | 137 | { |
| 136 | kill(pid, SIGUSR1); | 138 | kill(pid, SIGUSR1); |
| 137 | } | 139 | } |
| 140 | #endif | ||
| 138 | 141 | ||
| 139 | /* Don't use the glibc version, which caches the result in TLS. It misses some | 142 | /* Don't use the glibc version, which caches the result in TLS. It misses some |
| 140 | * syscalls, and also breaks with clone(), which does not unshare the TLS. | 143 | * syscalls, and also breaks with clone(), which does not unshare the TLS. |
diff --git a/arch/um/os-Linux/signal.c b/arch/um/os-Linux/signal.c index b897e8592d77..266768629fee 100644 --- a/arch/um/os-Linux/signal.c +++ b/arch/um/os-Linux/signal.c | |||
| @@ -243,8 +243,3 @@ int set_signals(int enable) | |||
| 243 | 243 | ||
| 244 | return ret; | 244 | return ret; |
| 245 | } | 245 | } |
| 246 | |||
| 247 | void os_usr1_signal(int on) | ||
| 248 | { | ||
| 249 | change_sig(SIGUSR1, on); | ||
| 250 | } | ||
