aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um/include
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2006-03-27 04:14:33 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-27 11:44:38 -0500
commitf206aabb035318ac4bafbf0b87798335de3634df (patch)
tree0fac4b6f593af478f0792e6c94f0881fd81645cd /arch/um/include
parent8e367065eea04a6fde5cb8f3854164af99c45693 (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.h5
-rw-r--r--arch/um/include/sigio.h2
-rw-r--r--arch/um/include/user_util.h1
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);
311extern void os_set_ioignore(void); 311extern void os_set_ioignore(void);
312extern void init_irq_signals(int on_sigstack); 312extern void init_irq_signals(int on_sigstack);
313 313
314/* sigio.c */
315extern void write_sigio_workaround(void);
316extern int add_sigio_fd(int fd, int read);
317extern 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
9extern int write_sigio_irq(int fd); 9extern int write_sigio_irq(int fd);
10extern int register_sigio_fd(int fd); 10extern int register_sigio_fd(int fd);
11extern int add_sigio_fd(int fd, int read);
12extern int ignore_sigio_fd(int fd);
13extern void sigio_lock(void); 11extern void sigio_lock(void);
14extern void sigio_unlock(void); 12extern 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);
58extern void kill_child_dead(int pid); 58extern void kill_child_dead(int pid);
59extern int cont(int pid); 59extern int cont(int pid);
60extern void check_sigio(void); 60extern void check_sigio(void);
61extern void write_sigio_workaround(void);
62extern void arch_check_bugs(void); 61extern void arch_check_bugs(void);
63extern int cpu_feature(char *what, char *buf, int len); 62extern int cpu_feature(char *what, char *buf, int len);
64extern int arch_handle_signal(int sig, union uml_pt_regs *regs); 63extern int arch_handle_signal(int sig, union uml_pt_regs *regs);