aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2007-05-06 17:51:09 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-07 15:13:01 -0400
commit24fa6c0832f4513ac897082d7d803970a40cc1b0 (patch)
tree261c0b7612f74b703ce88efb7dd22548779e1399 /arch/um
parent4ff83ce1114827f707b7f1f4f2e5f69de9df94ac (diff)
uml: move remaining useful contents of user_util.h
Rescue the useful contents of the soon-to-be-gone user-util.h. pty.c now gets ptsname from stdlib.h like it should have always done. CATCH_EINTR is now in os.h, although perhaps all usage should be under os-Linux at some point. get_pty is also in os.h. This patch restores the old definition of ARRAY_SIZE in user.h. This file is included only in userspace files, so there will be no conflict with the kernel's new ARRAY_SIZE. The copy of the kernel's ARRAY_SIZE and associated infrastructure is now gone. Signed-off-by: Jeff Dike <jdike@linux.intel.com> Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um')
-rw-r--r--arch/um/drivers/pty.c1
-rw-r--r--arch/um/include/os.h6
-rw-r--r--arch/um/include/user.h19
-rw-r--r--arch/um/include/user_util.h18
-rw-r--r--arch/um/os-Linux/sys-i386/tls.c1
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);
341extern void sig_handler_common_skas(int sig, void *sc_ptr); 343extern void sig_handler_common_skas(int sig, void *sc_ptr);
342extern void user_signal(int sig, union uml_pt_regs *regs, int pid); 344extern void user_signal(int sig, union uml_pt_regs *regs, int pid);
343 345
346/* sys-x86_64/prctl.c */
344extern int os_arch_prctl(int pid, int code, unsigned long *addr); 347extern int os_arch_prctl(int pid, int code, unsigned long *addr);
345 348
349/* tty.c */
350int 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
9extern void panic(const char *fmt, ...) 17extern void panic(const char *fmt, ...)
10 __attribute__ ((format (printf, 1, 2))); 18 __attribute__ ((format (printf, 1, 2)));
11extern int printk(const char *fmt, ...) 19extern int printk(const char *fmt, ...)
@@ -18,14 +26,3 @@ extern unsigned long strlcpy(char *, const char *, unsigned long);
18extern unsigned long strlcat(char *, const char *, unsigned long); 26extern 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
27extern int mode_tt; 11extern int mode_tt;
28 12
29extern int grantpt(int __fd); 13extern int grantpt(int __fd);
30extern int unlockpt(int __fd); 14extern int unlockpt(int __fd);
31extern char *ptsname(int __fd);
32 15
33extern void *add_signal_handler(int sig, void (*handler)(int)); 16extern void *add_signal_handler(int sig, void (*handler)(int));
34extern void input_cb(void (*proc)(void *), void *arg, int arg_len); 17extern void input_cb(void (*proc)(void *), void *arg, int arg_len);
35extern int get_pty(void);
36extern int switcheroo(int fd, int prot, void *from, void *to, int size); 18extern int switcheroo(int fd, int prot, void *from, void *to, int size);
37extern void do_exec(int old_pid, int new_pid); 19extern void do_exec(int old_pid, int new_pid);
38extern void tracer_panic(char *msg, ...) 20extern 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