linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/arch/um/include/os.h b/arch/um/include/os.h
index 5316e8a..2a1c64d 100644 (file)
--- a/arch/um/include/os.h
+++ b/arch/um/include/os.h
@@ -1,4 +1,4 @@
-/*
+/* 
  * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
  * Licensed under the GPL
  */
@@ -12,12 +12,10 @@
 #include "sysdep/ptrace.h"
 #include "kern_util.h"
 #include "skas/mm_id.h"
-#include "irq_user.h"
-#include "sysdep/tls.h"
 
-#define OS_TYPE_FILE 1
-#define OS_TYPE_DIR 2
-#define OS_TYPE_SYMLINK 3
+#define OS_TYPE_FILE 1 
+#define OS_TYPE_DIR 2 
+#define OS_TYPE_SYMLINK 3 
 #define OS_TYPE_CHARDEV 4
 #define OS_TYPE_BLOCKDEV 5
 #define OS_TYPE_FIFO 6
@@ -61,69 +59,68 @@ struct openflags {
 };
 
 #define OPENFLAGS() ((struct openflags) { .r = 0, .w = 0, .s = 0, .c = 0, \
-                                         .t = 0, .a = 0, .e = 0, .cl = 0 })
+                                         .t = 0, .a = 0, .e = 0, .cl = 0 })
 
 static inline struct openflags of_read(struct openflags flags)
 {
-       flags.r = 1;
-       return flags;
+       flags.r = 1; 
+       return(flags);
 }
 
 static inline struct openflags of_write(struct openflags flags)
 {
-       flags.w = 1;
-       return flags;
+       flags.w = 1; 
+       return(flags); 
 }
 
 static inline struct openflags of_rdwr(struct openflags flags)
 {
-       return of_read(of_write(flags));
+       return(of_read(of_write(flags)));
 }
 
 static inline struct openflags of_set_rw(struct openflags flags, int r, int w)
 {
        flags.r = r;
        flags.w = w;
-       return flags;
+       return(flags);
 }
 
 static inline struct openflags of_sync(struct openflags flags)
-{
-       flags.s = 1;
-       return flags;
+{ 
+       flags.s = 1; 
+       return(flags); 
 }
 
 static inline struct openflags of_create(struct openflags flags)
-{
-       flags.c = 1;
-       return flags;
+{ 
+       flags.c = 1; 
+       return(flags); 
 }
-
+ 
 static inline struct openflags of_trunc(struct openflags flags)
-{
-       flags.t = 1;
-       return flags;
+{ 
+       flags.t = 1; 
+       return(flags); 
 }
-
+ 
 static inline struct openflags of_append(struct openflags flags)
-{
-       flags.a = 1;
-       return flags;
+{ 
+       flags.a = 1; 
+       return(flags); 
 }
-
+ 
 static inline struct openflags of_excl(struct openflags flags)
-{
-       flags.e = 1;
-       return flags;
+{ 
+       flags.e = 1; 
+       return(flags); 
 }
 
 static inline struct openflags of_cloexec(struct openflags flags)
-{
-       flags.cl = 1;
-       return flags;
+{ 
+       flags.cl = 1; 
+       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);
@@ -159,21 +156,10 @@ 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);
 extern int can_do_skas(void);
-extern void os_check_bugs(void);
-extern void check_host_supports_tls(int *supports_tls, int *tls_min);
 
 /* Make sure they are clear when running in TT mode. Required by
  * SEGV_MAYBE_FIXABLE */
@@ -199,23 +185,19 @@ extern int os_getpid(void);
 extern int os_getpgrp(void);
 
 extern void init_new_thread_stack(void *sig_stack, void (*usr1_handler)(int));
-extern void init_new_thread_signals(void);
+extern void init_new_thread_signals(int altstack);
 extern int run_kernel_thread(int (*fn)(void *), void *arg, void **jmp_ptr);
 
 extern int os_map_memory(void *virt, int fd, unsigned long long off,
                         unsigned long len, int r, int w, int x);
-extern int os_protect_memory(void *addr, unsigned long len,
+extern int os_protect_memory(void *addr, unsigned long len, 
                             int r, int w, int x);
 extern int os_unmap_memory(void *addr, int len);
-extern int os_drop_memory(void *addr, int length);
-extern int can_drop_memory(void);
 extern void os_flush_stdout(void);
 
 /* tt.c
  * for tt mode only (will be deleted in future...)
  */
-extern void forward_ipi(int fd, int pid);
-extern void kill_child_dead(int pid);
 extern void stop(void);
 extern int wait_for_stop(int pid, int sig, int cont_type, void *relay);
 extern int protect_memory(unsigned long addr, unsigned long len,
@@ -238,12 +220,8 @@ extern int run_helper_thread(int (*proc)(void *), void *arg,
                             int stack_order);
 extern int helper_wait(int pid);
 
-
-/* tls.c */
-extern int os_set_thread_area(user_desc_t *info, int pid);
-extern int os_get_thread_area(user_desc_t *info, int pid);
-
 /* umid.c */
+
 extern int umid_file_name(char *name, char *buf, int len);
 extern int set_umid(char *name);
 extern char *get_umid(void);
@@ -316,24 +294,4 @@ extern void initial_thread_cb_skas(void (*proc)(void *),
 extern void halt_skas(void);
 extern void reboot_skas(void);
 
-/* irq.c */
-extern int os_waiting_for_events(struct irq_fd *active_fds);
-extern int os_create_pollfd(int fd, int events, void *tmp_pfd, int size_tmpfds);
-extern void os_free_irq_by_cb(int (*test)(struct irq_fd *, void *), void *arg,
-               struct irq_fd *active_fds, struct irq_fd ***last_irq_ptr2);
-extern void os_free_irq_later(struct irq_fd *active_fds,
-               int irq, void *dev_id);
-extern int os_get_pollfd(int i);
-extern void os_set_pollfd(int i, int fd);
-extern void os_set_ioignore(void);
-extern void init_irq_signals(int on_sigstack);
-
-/* sigio.c */
-extern int ignore_sigio_fd(int fd);
-extern void maybe_sigio_broken(int fd, int read);
-
-/* 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