diff options
author | Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> | 2006-03-31 05:30:23 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-31 15:18:52 -0500 |
commit | dd77aec07aec5cb81aed3b4ef79c1ff8bd0e2a68 (patch) | |
tree | 2f1e75e362acce09b789a309b685a1d791b35a24 /arch/um/include/os.h | |
parent | aa6758d4867cd07bd76105ade6177fe6148e559a (diff) |
[PATCH] uml: tls support: hack to make it compile on any host
Copy the definition of struct user_desc (with another name) for use by
userspace sources (where we use the host headers, and we can't be sure about
their content) to make sure UML compiles.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Acked-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/um/include/os.h')
-rw-r--r-- | arch/um/include/os.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/um/include/os.h b/arch/um/include/os.h index e9e1db1e08d0..1b780b5dacbe 100644 --- a/arch/um/include/os.h +++ b/arch/um/include/os.h | |||
@@ -13,6 +13,7 @@ | |||
13 | #include "kern_util.h" | 13 | #include "kern_util.h" |
14 | #include "skas/mm_id.h" | 14 | #include "skas/mm_id.h" |
15 | #include "irq_user.h" | 15 | #include "irq_user.h" |
16 | #include "sysdep/tls.h" | ||
16 | 17 | ||
17 | #define OS_TYPE_FILE 1 | 18 | #define OS_TYPE_FILE 1 |
18 | #define OS_TYPE_DIR 2 | 19 | #define OS_TYPE_DIR 2 |
@@ -238,10 +239,10 @@ extern int helper_wait(int pid); | |||
238 | 239 | ||
239 | 240 | ||
240 | /* tls.c */ | 241 | /* tls.c */ |
241 | extern int os_set_thread_area(void *data, int pid); | 242 | extern int os_set_thread_area(user_desc_t *info, int pid); |
242 | extern int os_get_thread_area(void *data, int pid); | 243 | extern int os_get_thread_area(user_desc_t *info, int pid); |
243 | /* umid.c */ | ||
244 | 244 | ||
245 | /* umid.c */ | ||
245 | extern int umid_file_name(char *name, char *buf, int len); | 246 | extern int umid_file_name(char *name, char *buf, int len); |
246 | extern int set_umid(char *name); | 247 | extern int set_umid(char *name); |
247 | extern char *get_umid(void); | 248 | extern char *get_umid(void); |