diff options
author | Gennady Sharapov <Gennady.V.Sharapov@intel.com> | 2006-01-08 04:01:29 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-08 23:13:39 -0500 |
commit | 0805d89c151b4800eade4c2f50d39c5253d7d054 (patch) | |
tree | 3ff8a48973e266f5e9eccf6aa38c80282aef12ca /arch/um/kernel/skas | |
parent | b2de464f7f0006bec162559a8db161869d32ee93 (diff) |
[PATCH] uml: move libc-dependent code from signal_user.c
The serial UML OS-abstraction layer patch (um/kernel dir).
This moves all systemcalls from signal_user.c file under os-Linux dir
Signed-off-by: Gennady Sharapov <Gennady.V.Sharapov@intel.com>
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/skas')
-rw-r--r-- | arch/um/kernel/skas/include/skas.h | 1 | ||||
-rw-r--r-- | arch/um/kernel/skas/process.c | 11 | ||||
-rw-r--r-- | arch/um/kernel/skas/process_kern.c | 1 | ||||
-rw-r--r-- | arch/um/kernel/skas/trap_user.c | 2 |
4 files changed, 1 insertions, 14 deletions
diff --git a/arch/um/kernel/skas/include/skas.h b/arch/um/kernel/skas/include/skas.h index daa2f85b684c..01d489de3986 100644 --- a/arch/um/kernel/skas/include/skas.h +++ b/arch/um/kernel/skas/include/skas.h | |||
@@ -22,7 +22,6 @@ extern int start_idle_thread(void *stack, void *switch_buf_ptr, | |||
22 | extern int user_thread(unsigned long stack, int flags); | 22 | extern int user_thread(unsigned long stack, int flags); |
23 | extern void userspace(union uml_pt_regs *regs); | 23 | extern void userspace(union uml_pt_regs *regs); |
24 | extern void new_thread_proc(void *stack, void (*handler)(int sig)); | 24 | extern void new_thread_proc(void *stack, void (*handler)(int sig)); |
25 | extern void remove_sigstack(void); | ||
26 | extern void new_thread_handler(int sig); | 25 | extern void new_thread_handler(int sig); |
27 | extern void handle_syscall(union uml_pt_regs *regs); | 26 | extern void handle_syscall(union uml_pt_regs *regs); |
28 | extern int map(struct mm_id * mm_idp, unsigned long virt, | 27 | extern int map(struct mm_id * mm_idp, unsigned long virt, |
diff --git a/arch/um/kernel/skas/process.c b/arch/um/kernel/skas/process.c index 599d679bd4fc..9264d4021dfe 100644 --- a/arch/um/kernel/skas/process.c +++ b/arch/um/kernel/skas/process.c | |||
@@ -31,7 +31,6 @@ | |||
31 | #include "proc_mm.h" | 31 | #include "proc_mm.h" |
32 | #include "skas_ptrace.h" | 32 | #include "skas_ptrace.h" |
33 | #include "chan_user.h" | 33 | #include "chan_user.h" |
34 | #include "signal_user.h" | ||
35 | #include "registers.h" | 34 | #include "registers.h" |
36 | #include "mem.h" | 35 | #include "mem.h" |
37 | #include "uml-config.h" | 36 | #include "uml-config.h" |
@@ -514,16 +513,6 @@ int start_idle_thread(void *stack, void *switch_buf_ptr, void **fork_buf_ptr) | |||
514 | siglongjmp(**switch_buf, 1); | 513 | siglongjmp(**switch_buf, 1); |
515 | } | 514 | } |
516 | 515 | ||
517 | void remove_sigstack(void) | ||
518 | { | ||
519 | stack_t stack = ((stack_t) { .ss_flags = SS_DISABLE, | ||
520 | .ss_sp = NULL, | ||
521 | .ss_size = 0 }); | ||
522 | |||
523 | if(sigaltstack(&stack, NULL) != 0) | ||
524 | panic("disabling signal stack failed, errno = %d\n", errno); | ||
525 | } | ||
526 | |||
527 | void initial_thread_cb_skas(void (*proc)(void *), void *arg) | 516 | void initial_thread_cb_skas(void (*proc)(void *), void *arg) |
528 | { | 517 | { |
529 | sigjmp_buf here; | 518 | sigjmp_buf here; |
diff --git a/arch/um/kernel/skas/process_kern.c b/arch/um/kernel/skas/process_kern.c index 9c990253966c..09790ccb161c 100644 --- a/arch/um/kernel/skas/process_kern.c +++ b/arch/um/kernel/skas/process_kern.c | |||
@@ -14,7 +14,6 @@ | |||
14 | #include "asm/atomic.h" | 14 | #include "asm/atomic.h" |
15 | #include "kern_util.h" | 15 | #include "kern_util.h" |
16 | #include "time_user.h" | 16 | #include "time_user.h" |
17 | #include "signal_user.h" | ||
18 | #include "skas.h" | 17 | #include "skas.h" |
19 | #include "os.h" | 18 | #include "os.h" |
20 | #include "user_util.h" | 19 | #include "user_util.h" |
diff --git a/arch/um/kernel/skas/trap_user.c b/arch/um/kernel/skas/trap_user.c index 9950a6716fe5..28403d2cafe6 100644 --- a/arch/um/kernel/skas/trap_user.c +++ b/arch/um/kernel/skas/trap_user.c | |||
@@ -5,7 +5,6 @@ | |||
5 | 5 | ||
6 | #include <signal.h> | 6 | #include <signal.h> |
7 | #include <errno.h> | 7 | #include <errno.h> |
8 | #include "signal_user.h" | ||
9 | #include "user_util.h" | 8 | #include "user_util.h" |
10 | #include "kern_util.h" | 9 | #include "kern_util.h" |
11 | #include "task.h" | 10 | #include "task.h" |
@@ -14,6 +13,7 @@ | |||
14 | #include "ptrace_user.h" | 13 | #include "ptrace_user.h" |
15 | #include "sysdep/ptrace.h" | 14 | #include "sysdep/ptrace.h" |
16 | #include "sysdep/ptrace_user.h" | 15 | #include "sysdep/ptrace_user.h" |
16 | #include "os.h" | ||
17 | 17 | ||
18 | void sig_handler_common_skas(int sig, void *sc_ptr) | 18 | void sig_handler_common_skas(int sig, void *sc_ptr) |
19 | { | 19 | { |