diff options
Diffstat (limited to 'arch/um/include/os.h')
-rw-r--r-- | arch/um/include/os.h | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/arch/um/include/os.h b/arch/um/include/os.h index 5c74da410451..688d181b5f8a 100644 --- a/arch/um/include/os.h +++ b/arch/um/include/os.h | |||
@@ -16,6 +16,8 @@ | |||
16 | #include "sysdep/tls.h" | 16 | #include "sysdep/tls.h" |
17 | #include "sysdep/archsetjmp.h" | 17 | #include "sysdep/archsetjmp.h" |
18 | 18 | ||
19 | #define CATCH_EINTR(expr) while ((errno = 0, ((expr) < 0)) && (errno == EINTR)) | ||
20 | |||
19 | #define OS_TYPE_FILE 1 | 21 | #define OS_TYPE_FILE 1 |
20 | #define OS_TYPE_DIR 2 | 22 | #define OS_TYPE_DIR 2 |
21 | #define OS_TYPE_SYMLINK 3 | 23 | #define OS_TYPE_SYMLINK 3 |
@@ -273,8 +275,9 @@ extern void stack_protections(unsigned long address); | |||
273 | extern void task_protections(unsigned long address); | 275 | extern void task_protections(unsigned long address); |
274 | extern int raw(int fd); | 276 | extern int raw(int fd); |
275 | extern void setup_machinename(char *machine_out); | 277 | extern void setup_machinename(char *machine_out); |
276 | extern void setup_hostinfo(void); | 278 | extern void setup_hostinfo(char *buf, int len); |
277 | extern int setjmp_wrapper(void (*proc)(void *, void *), ...); | 279 | extern int setjmp_wrapper(void (*proc)(void *, void *), ...); |
280 | extern void os_dump_core(void); | ||
278 | 281 | ||
279 | /* time.c */ | 282 | /* time.c */ |
280 | #define BILLION (1000 * 1000 * 1000) | 283 | #define BILLION (1000 * 1000 * 1000) |
@@ -297,13 +300,12 @@ extern long syscall_stub_data(struct mm_id * mm_idp, | |||
297 | unsigned long *data, int data_count, | 300 | unsigned long *data, int data_count, |
298 | void **addr, void **stub_addr); | 301 | void **addr, void **stub_addr); |
299 | extern int map(struct mm_id * mm_idp, unsigned long virt, | 302 | extern int map(struct mm_id * mm_idp, unsigned long virt, |
300 | unsigned long len, int r, int w, int x, int phys_fd, | 303 | unsigned long len, int prot, int phys_fd, |
301 | unsigned long long offset, int done, void **data); | 304 | unsigned long long offset, int done, void **data); |
302 | extern int unmap(struct mm_id * mm_idp, void *addr, unsigned long len, | 305 | extern int unmap(struct mm_id * mm_idp, unsigned long addr, unsigned long len, |
303 | int done, void **data); | 306 | int done, void **data); |
304 | extern int protect(struct mm_id * mm_idp, unsigned long addr, | 307 | extern int protect(struct mm_id * mm_idp, unsigned long addr, |
305 | unsigned long len, int r, int w, int x, int done, | 308 | unsigned long len, unsigned int prot, int done, void **data); |
306 | void **data); | ||
307 | 309 | ||
308 | /* skas/process.c */ | 310 | /* skas/process.c */ |
309 | extern int is_skas_winch(int pid, int fd, void *data); | 311 | extern int is_skas_winch(int pid, int fd, void *data); |
@@ -339,8 +341,11 @@ extern void maybe_sigio_broken(int fd, int read); | |||
339 | 341 | ||
340 | /* skas/trap */ | 342 | /* skas/trap */ |
341 | extern void sig_handler_common_skas(int sig, void *sc_ptr); | 343 | extern void sig_handler_common_skas(int sig, void *sc_ptr); |
342 | extern void user_signal(int sig, union uml_pt_regs *regs, int pid); | ||
343 | 344 | ||
345 | /* sys-x86_64/prctl.c */ | ||
344 | extern int os_arch_prctl(int pid, int code, unsigned long *addr); | 346 | extern int os_arch_prctl(int pid, int code, unsigned long *addr); |
345 | 347 | ||
348 | /* tty.c */ | ||
349 | int get_pty(void); | ||
350 | |||
346 | #endif | 351 | #endif |