diff options
-rw-r--r-- | arch/um/drivers/pty.c | 1 | ||||
-rw-r--r-- | arch/um/include/os.h | 6 | ||||
-rw-r--r-- | arch/um/include/user.h | 19 | ||||
-rw-r--r-- | arch/um/include/user_util.h | 18 | ||||
-rw-r--r-- | arch/um/os-Linux/sys-i386/tls.c | 1 |
5 files changed, 16 insertions, 29 deletions
diff --git a/arch/um/drivers/pty.c b/arch/um/drivers/pty.c index 829a5eca8c07..aa311afa9667 100644 --- a/arch/um/drivers/pty.c +++ b/arch/um/drivers/pty.c | |||
@@ -4,6 +4,7 @@ | |||
4 | */ | 4 | */ |
5 | 5 | ||
6 | #include <stdio.h> | 6 | #include <stdio.h> |
7 | #include <stdlib.h> | ||
7 | #include <unistd.h> | 8 | #include <unistd.h> |
8 | #include <string.h> | 9 | #include <string.h> |
9 | #include <errno.h> | 10 | #include <errno.h> |
diff --git a/arch/um/include/os.h b/arch/um/include/os.h index 22666b4a8be7..394adcded0bf 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 |
@@ -341,6 +343,10 @@ extern void maybe_sigio_broken(int fd, int read); | |||
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); | 344 | extern void user_signal(int sig, union uml_pt_regs *regs, int pid); |
343 | 345 | ||
346 | /* sys-x86_64/prctl.c */ | ||
344 | extern int os_arch_prctl(int pid, int code, unsigned long *addr); | 347 | extern int os_arch_prctl(int pid, int code, unsigned long *addr); |
345 | 348 | ||
349 | /* tty.c */ | ||
350 | int get_pty(void); | ||
351 | |||
346 | #endif | 352 | #endif |
diff --git a/arch/um/include/user.h b/arch/um/include/user.h index acadce3f271f..a6da62608254 100644 --- a/arch/um/include/user.h +++ b/arch/um/include/user.h | |||
@@ -6,6 +6,14 @@ | |||
6 | #ifndef __USER_H__ | 6 | #ifndef __USER_H__ |
7 | #define __USER_H__ | 7 | #define __USER_H__ |
8 | 8 | ||
9 | /* | ||
10 | * The usual definition - copied here because the kernel provides its own, | ||
11 | * fancier, type-safe, definition. Using that one would require | ||
12 | * copying too much infrastructure for my taste, so userspace files | ||
13 | * get less checking than kernel files. | ||
14 | */ | ||
15 | #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) | ||
16 | |||
9 | extern void panic(const char *fmt, ...) | 17 | extern void panic(const char *fmt, ...) |
10 | __attribute__ ((format (printf, 1, 2))); | 18 | __attribute__ ((format (printf, 1, 2))); |
11 | extern int printk(const char *fmt, ...) | 19 | extern int printk(const char *fmt, ...) |
@@ -18,14 +26,3 @@ extern unsigned long strlcpy(char *, const char *, unsigned long); | |||
18 | extern unsigned long strlcat(char *, const char *, unsigned long); | 26 | extern unsigned long strlcat(char *, const char *, unsigned long); |
19 | 27 | ||
20 | #endif | 28 | #endif |
21 | |||
22 | /* | ||
23 | * Overrides for Emacs so that we follow Linus's tabbing style. | ||
24 | * Emacs will notice this stuff at the end of the file and automatically | ||
25 | * adjust the settings for this buffer only. This must remain at the end | ||
26 | * of the file. | ||
27 | * --------------------------------------------------------------------------- | ||
28 | * Local variables: | ||
29 | * c-file-style: "linux" | ||
30 | * End: | ||
31 | */ | ||
diff --git a/arch/um/include/user_util.h b/arch/um/include/user_util.h index f04776e2436f..7fa5c68f0620 100644 --- a/arch/um/include/user_util.h +++ b/arch/um/include/user_util.h | |||
@@ -8,31 +8,13 @@ | |||
8 | 8 | ||
9 | #include "sysdep/ptrace.h" | 9 | #include "sysdep/ptrace.h" |
10 | 10 | ||
11 | /* Copied from kernel.h and compiler-gcc.h */ | ||
12 | |||
13 | /* Force a compilation error if condition is true, but also produce a | ||
14 | result (of value 0 and type size_t), so the expression can be used | ||
15 | e.g. in a structure initializer (or where-ever else comma expressions | ||
16 | aren't permitted). */ | ||
17 | #define BUILD_BUG_ON_ZERO(e) (sizeof(char[1 - 2 * !!(e)]) - 1) | ||
18 | |||
19 | /* &a[0] degrades to a pointer: a different type from an array */ | ||
20 | #define __must_be_array(a) \ | ||
21 | BUILD_BUG_ON_ZERO(__builtin_types_compatible_p(typeof(a), typeof(&a[0]))) | ||
22 | |||
23 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr)) | ||
24 | |||
25 | #define CATCH_EINTR(expr) while ((errno = 0, ((expr) < 0)) && (errno == EINTR)) | ||
26 | |||
27 | extern int mode_tt; | 11 | extern int mode_tt; |
28 | 12 | ||
29 | extern int grantpt(int __fd); | 13 | extern int grantpt(int __fd); |
30 | extern int unlockpt(int __fd); | 14 | extern int unlockpt(int __fd); |
31 | extern char *ptsname(int __fd); | ||
32 | 15 | ||
33 | extern void *add_signal_handler(int sig, void (*handler)(int)); | 16 | extern void *add_signal_handler(int sig, void (*handler)(int)); |
34 | extern void input_cb(void (*proc)(void *), void *arg, int arg_len); | 17 | extern void input_cb(void (*proc)(void *), void *arg, int arg_len); |
35 | extern int get_pty(void); | ||
36 | extern int switcheroo(int fd, int prot, void *from, void *to, int size); | 18 | extern int switcheroo(int fd, int prot, void *from, void *to, int size); |
37 | extern void do_exec(int old_pid, int new_pid); | 19 | extern void do_exec(int old_pid, int new_pid); |
38 | extern void tracer_panic(char *msg, ...) | 20 | extern void tracer_panic(char *msg, ...) |
diff --git a/arch/um/os-Linux/sys-i386/tls.c b/arch/um/os-Linux/sys-i386/tls.c index 256532034c62..8ba132482970 100644 --- a/arch/um/os-Linux/sys-i386/tls.c +++ b/arch/um/os-Linux/sys-i386/tls.c | |||
@@ -5,6 +5,7 @@ | |||
5 | #include <unistd.h> | 5 | #include <unistd.h> |
6 | 6 | ||
7 | #include "sysdep/tls.h" | 7 | #include "sysdep/tls.h" |
8 | #include "user.h" | ||
8 | #include "user_util.h" | 9 | #include "user_util.h" |
9 | 10 | ||
10 | /* Checks whether host supports TLS, and sets *tls_min according to the value | 11 | /* Checks whether host supports TLS, and sets *tls_min according to the value |