[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>
This commit is contained in:
Родитель
7c45ad16f0
Коммит
5b0e94787f
|
@ -117,10 +117,6 @@ extern struct task_struct *get_task(int pid, int require);
|
|||
extern void machine_halt(void);
|
||||
extern int is_syscall(unsigned long addr);
|
||||
|
||||
extern void arch_switch_to_tt(struct task_struct *from, struct task_struct *to);
|
||||
|
||||
extern void arch_switch_to_skas(struct task_struct *from, struct task_struct *to);
|
||||
|
||||
extern void free_irq(unsigned int, void *);
|
||||
extern int cpu(void);
|
||||
|
||||
|
|
|
@ -56,6 +56,9 @@ extern int do_get_thread_area_tt(struct user_desc *info);
|
|||
extern int arch_switch_tls_skas(struct task_struct *from, struct task_struct *to);
|
||||
extern int arch_switch_tls_tt(struct task_struct *from, struct task_struct *to);
|
||||
|
||||
extern void arch_switch_to_tt(struct task_struct *from, struct task_struct *to);
|
||||
extern void arch_switch_to_skas(struct task_struct *from, struct task_struct *to);
|
||||
|
||||
static inline int do_get_thread_area(struct user_desc *info)
|
||||
{
|
||||
return CHOOSE_MODE_PROC(do_get_thread_area_tt, do_get_thread_area_skas, info);
|
||||
|
|
Загрузка…
Ссылка в новой задаче