Merge branch 'linus' into x86/pebs

[linux-2.6-omap-h63xx.git] / arch / um / include / os.h

diff --git a/arch/um/include/os.h b/arch/um/include/os.h
index 0b6b6273330392122c82dc1e9b845f5d03bff3b2..e2716ac8889accd7f33ca8d381f014d3b1bd7283 100644 (file)
--- a/arch/um/include/os.h
+++ b/arch/um/include/os.h
@@ -290,11 +290,15 @@ extern void os_set_ioignore(void);
 extern int add_sigio_fd(int fd);
 extern int ignore_sigio_fd(int fd);
 extern void maybe_sigio_broken(int fd, int read);
+extern void sigio_broken(int fd, int read);
 
 /* sys-x86_64/prctl.c */
 extern int os_arch_prctl(int pid, int code, unsigned long *addr);
 
 /* tty.c */
-int get_pty(void);
+extern int get_pty(void);
+
+/* sys-$ARCH/task_size.c */
+extern unsigned long os_get_task_size(void);
 
 #endif