diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
| commit | bac30d1a78d0f11c613968fc8b351a91ed465386 (patch) | |
| tree | e52f3c876522a2f6047a6ec1c27df2e8a79486b8 /arch/um/include/skas/skas.h | |
| parent | e8222502ee6157e2713da9e0792c21f4ad458d50 (diff) | |
| parent | ca9ba4471c1203bb6e759b76e83167fec54fe590 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'arch/um/include/skas/skas.h')
| -rw-r--r-- | arch/um/include/skas/skas.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/um/include/skas/skas.h b/arch/um/include/skas/skas.h index 86357282d681..853b26f148c5 100644 --- a/arch/um/include/skas/skas.h +++ b/arch/um/include/skas/skas.h | |||
| @@ -17,7 +17,6 @@ extern int user_thread(unsigned long stack, int flags); | |||
| 17 | extern void new_thread_proc(void *stack, void (*handler)(int sig)); | 17 | extern void new_thread_proc(void *stack, void (*handler)(int sig)); |
| 18 | extern void new_thread_handler(int sig); | 18 | extern void new_thread_handler(int sig); |
| 19 | extern void handle_syscall(union uml_pt_regs *regs); | 19 | extern void handle_syscall(union uml_pt_regs *regs); |
| 20 | extern void user_signal(int sig, union uml_pt_regs *regs, int pid); | ||
| 21 | extern int new_mm(unsigned long stack); | 20 | extern int new_mm(unsigned long stack); |
| 22 | extern void get_skas_faultinfo(int pid, struct faultinfo * fi); | 21 | extern void get_skas_faultinfo(int pid, struct faultinfo * fi); |
| 23 | extern long execute_syscall_skas(void *r); | 22 | extern long execute_syscall_skas(void *r); |