diff options
author | Jeff Dike <jdike@addtoit.com> | 2006-03-27 04:14:33 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-27 11:44:38 -0500 |
commit | f206aabb035318ac4bafbf0b87798335de3634df (patch) | |
tree | 0fac4b6f593af478f0792e6c94f0881fd81645cd /arch/um/include | |
parent | 8e367065eea04a6fde5cb8f3854164af99c45693 (diff) |
[PATCH] uml: move sigio_user.c to os-Linux/sigio.c
The serial UML OS-abstraction layer patch (um/kernel dir).
This moves sigio_user.c to 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/include')
-rw-r--r-- | arch/um/include/os.h | 5 | ||||
-rw-r--r-- | arch/um/include/sigio.h | 2 | ||||
-rw-r--r-- | arch/um/include/user_util.h | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/arch/um/include/os.h b/arch/um/include/os.h index 6d865d4eade0..53dee8d3cdcc 100644 --- a/arch/um/include/os.h +++ b/arch/um/include/os.h | |||
@@ -311,4 +311,9 @@ extern void os_set_pollfd(int i, int fd); | |||
311 | extern void os_set_ioignore(void); | 311 | extern void os_set_ioignore(void); |
312 | extern void init_irq_signals(int on_sigstack); | 312 | extern void init_irq_signals(int on_sigstack); |
313 | 313 | ||
314 | /* sigio.c */ | ||
315 | extern void write_sigio_workaround(void); | ||
316 | extern int add_sigio_fd(int fd, int read); | ||
317 | extern int ignore_sigio_fd(int fd); | ||
318 | |||
314 | #endif | 319 | #endif |
diff --git a/arch/um/include/sigio.h b/arch/um/include/sigio.h index 1432fcfb3212..fe99ea163c2e 100644 --- a/arch/um/include/sigio.h +++ b/arch/um/include/sigio.h | |||
@@ -8,8 +8,6 @@ | |||
8 | 8 | ||
9 | extern int write_sigio_irq(int fd); | 9 | extern int write_sigio_irq(int fd); |
10 | extern int register_sigio_fd(int fd); | 10 | extern int register_sigio_fd(int fd); |
11 | extern int add_sigio_fd(int fd, int read); | ||
12 | extern int ignore_sigio_fd(int fd); | ||
13 | extern void sigio_lock(void); | 11 | extern void sigio_lock(void); |
14 | extern void sigio_unlock(void); | 12 | extern void sigio_unlock(void); |
15 | 13 | ||
diff --git a/arch/um/include/user_util.h b/arch/um/include/user_util.h index a6f1f176cf84..992a7e1e0fca 100644 --- a/arch/um/include/user_util.h +++ b/arch/um/include/user_util.h | |||
@@ -58,7 +58,6 @@ extern int attach(int pid); | |||
58 | extern void kill_child_dead(int pid); | 58 | extern void kill_child_dead(int pid); |
59 | extern int cont(int pid); | 59 | extern int cont(int pid); |
60 | extern void check_sigio(void); | 60 | extern void check_sigio(void); |
61 | extern void write_sigio_workaround(void); | ||
62 | extern void arch_check_bugs(void); | 61 | extern void arch_check_bugs(void); |
63 | extern int cpu_feature(char *what, char *buf, int len); | 62 | extern int cpu_feature(char *what, char *buf, int len); |
64 | extern int arch_handle_signal(int sig, union uml_pt_regs *regs); | 63 | extern int arch_handle_signal(int sig, union uml_pt_regs *regs); |