aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>2006-04-11 01:53:34 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-11 09:18:36 -0400
commit5b0e94787f1b8fdcd370fc6303579d171b941080 (patch)
tree037465ee69e0eb405982e04afe127bdcedfb90a6 /include
parent7c45ad16f0b64f5fdc64cb0e86aa548d7f4d60c1 (diff)
[PATCH] uml: fix "extern-vs-static" proto conflict in TLS code
Move the prototype from arch-generic to arch-specific includes because on x86_64 these functions are two static inlines. Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Cc: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
-rw-r--r--include/asm-um/ptrace-i386.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-um/ptrace-i386.h b/include/asm-um/ptrace-i386.h
index 30656c962d74..6e2528bb0083 100644
--- a/include/asm-um/ptrace-i386.h
+++ b/include/asm-um/ptrace-i386.h
@@ -56,6 +56,9 @@ extern int do_get_thread_area_tt(struct user_desc *info);
56extern int arch_switch_tls_skas(struct task_struct *from, struct task_struct *to); 56extern int arch_switch_tls_skas(struct task_struct *from, struct task_struct *to);
57extern int arch_switch_tls_tt(struct task_struct *from, struct task_struct *to); 57extern int arch_switch_tls_tt(struct task_struct *from, struct task_struct *to);
58 58
59extern void arch_switch_to_tt(struct task_struct *from, struct task_struct *to);
60extern void arch_switch_to_skas(struct task_struct *from, struct task_struct *to);
61
59static inline int do_get_thread_area(struct user_desc *info) 62static inline int do_get_thread_area(struct user_desc *info)
60{ 63{
61 return CHOOSE_MODE_PROC(do_get_thread_area_tt, do_get_thread_area_skas, info); 64 return CHOOSE_MODE_PROC(do_get_thread_area_tt, do_get_thread_area_skas, info);