diff options
Diffstat (limited to 'arch/um/include/shared/os.h')
| -rw-r--r-- | arch/um/include/shared/os.h | 17 | 
1 files changed, 2 insertions, 15 deletions
| diff --git a/arch/um/include/shared/os.h b/arch/um/include/shared/os.h index 96d400387c93..00214059d9ec 100644 --- a/arch/um/include/shared/os.h +++ b/arch/um/include/shared/os.h @@ -159,20 +159,11 @@ extern int os_create_unix_socket(const char *file, int len, int close_on_exec);  extern int os_shutdown_socket(int fd, int r, int w);  extern void os_close_file(int fd);  extern int os_rcv_fd(int fd, int *helper_pid_out); -extern int create_unix_socket(char *file, int len, int close_on_exec);  extern int os_connect_socket(const char *name);  extern int os_file_type(char *file);  extern int os_file_mode(const 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);  extern unsigned os_major(unsigned long long dev);  extern unsigned os_minor(unsigned long long dev);  extern unsigned long long os_makedev(unsigned major, unsigned minor); @@ -232,14 +223,13 @@ extern char *get_umid(void);  /* signal.c */  extern void timer_set_signal_handler(void);  extern void set_sigstack(void *sig_stack, int size); -extern void remove_sigstack(void);  extern void set_handler(int sig);  extern void send_sigio_to_self(void);  extern int change_sig(int signal, int on);  extern void block_signals(void);  extern void unblock_signals(void); -extern int set_signals(int enable); -extern int set_signals_trace(int enable); +extern int um_set_signals(int enable); +extern int um_set_signals_trace(int enable);  extern int os_is_signal_stack(void);  extern void deliver_alarm(void);  extern void register_pm_wake_signal(void); @@ -266,7 +256,6 @@ extern int os_timer_create(void);  extern int os_timer_set_interval(unsigned long long nsecs);  extern int os_timer_one_shot(unsigned long long nsecs);  extern void os_timer_disable(void); -extern void uml_idle_timer(void);  extern long long os_persistent_clock_emulation(void);  extern long long os_nsecs(void); @@ -290,8 +279,6 @@ extern int is_skas_winch(int pid, int fd, void *data);  extern int start_userspace(unsigned long stub_stack);  extern int copy_context_skas0(unsigned long stack, int pid);  extern void userspace(struct uml_pt_regs *regs, unsigned long *aux_fp_regs); -extern int map_stub_pages(int fd, unsigned long code, unsigned long data, -			  unsigned long stack);  extern void new_thread(void *stack, jmp_buf *buf, void (*handler)(void));  extern void switch_threads(jmp_buf *me, jmp_buf *you);  extern int start_idle_thread(void *stack, jmp_buf *switch_buf); |