From d8e637791d935356288a1d0be10e3ac14427b17a Mon Sep 17 00:00:00 2001
From: Jeff Dike <jdike@addtoit.com>
Date: Mon, 27 Mar 2006 01:14:36 -0800
Subject: [PATCH] --- yaml --- r: 24235 b: refs/heads/master c:
 cf9165a50aa21027d2f0eefc90476ec59ae6d2b8 h: refs/heads/master i:   24233:
 d876e9b4150018f29254cd83b4fe6852909547a6   24231:
 58921581412f11ec2a4af2b8dfae89df021f982c v: v3

---
 [refs]                                 |  2 +-
 trunk/arch/um/include/os.h             | 14 ++++++++++++++
 trunk/arch/um/include/skas/mode-skas.h |  1 -
 trunk/arch/um/include/skas/skas.h      |  1 -
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 2fe079db2cd2..ec0b2cc7fb62 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c554f899b6747c9d8035bf91864d89b337ceb411
+refs/heads/master: cf9165a50aa21027d2f0eefc90476ec59ae6d2b8
diff --git a/trunk/arch/um/include/os.h b/trunk/arch/um/include/os.h
index 53dee8d3cdcc..d3d1bc6074ef 100644
--- a/trunk/arch/um/include/os.h
+++ b/trunk/arch/um/include/os.h
@@ -122,6 +122,7 @@ static inline struct openflags of_cloexec(struct openflags flags)
 	return(flags); 
 }
   
+/* file.c */
 extern int os_stat_file(const char *file_name, struct uml_stat *buf);
 extern int os_stat_fd(const int fd, struct uml_stat *buf);
 extern int os_access(const char *file, int mode);
@@ -157,6 +158,15 @@ extern int os_connect_socket(char *name);
 extern int os_file_type(char *file);
 extern int os_file_mode(char *file, struct openflags *mode_out);
 extern int os_lock_file(int fd, int excl);
+extern void os_flush_stdout(void);
+extern int os_stat_filesystem(char *path, long *bsize_out,
+			      long long *blocks_out, long long *bfree_out,
+			      long long *bavail_out, long long *files_out,
+			      long long *ffree_out, void *fsid_out,
+			      int fsid_size, long *namelen_out,
+			      long *spare_out);
+extern int os_change_dir(char *dir);
+extern int os_fchange_dir(int fd);
 
 /* start_up.c */
 extern void os_early_checks(void);
@@ -316,4 +326,8 @@ extern void write_sigio_workaround(void);
 extern int add_sigio_fd(int fd, int read);
 extern int ignore_sigio_fd(int fd);
 
+/* skas/trap */
+extern void sig_handler_common_skas(int sig, void *sc_ptr);
+extern void user_signal(int sig, union uml_pt_regs *regs, int pid);
+
 #endif
diff --git a/trunk/arch/um/include/skas/mode-skas.h b/trunk/arch/um/include/skas/mode-skas.h
index 260065cfeef1..8bc6916bbbb1 100644
--- a/trunk/arch/um/include/skas/mode-skas.h
+++ b/trunk/arch/um/include/skas/mode-skas.h
@@ -13,7 +13,6 @@ extern unsigned long exec_fp_regs[];
 extern unsigned long exec_fpx_regs[];
 extern int have_fpx_regs;
 
-extern void sig_handler_common_skas(int sig, void *sc_ptr);
 extern void kill_off_processes_skas(void);
 
 #endif
diff --git a/trunk/arch/um/include/skas/skas.h b/trunk/arch/um/include/skas/skas.h
index 86357282d681..853b26f148c5 100644
--- a/trunk/arch/um/include/skas/skas.h
+++ b/trunk/arch/um/include/skas/skas.h
@@ -17,7 +17,6 @@ extern int user_thread(unsigned long stack, int flags);
 extern void new_thread_proc(void *stack, void (*handler)(int sig));
 extern void new_thread_handler(int sig);
 extern void handle_syscall(union uml_pt_regs *regs);
-extern void user_signal(int sig, union uml_pt_regs *regs, int pid);
 extern int new_mm(unsigned long stack);
 extern void get_skas_faultinfo(int pid, struct faultinfo * fi);
 extern long execute_syscall_skas(void *r);