Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] uml: fix "extern-vs-static" proto conflict in TLS code

Browse source 
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:
Paolo 'Blaisorblade' Giarrusso 2006-04-10 22:53:34 -07:00 committed by Linus Torvalds
parent 7c45ad16f0
commit 5b0e94787f
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/um/include/kern_util.h
View file

@ -117,10 +117,6 @@ extern struct task_struct *get_task(int pid, int require);
extern void machine_halt(void); extern void machine_halt(void);
extern int is_syscall(unsigned long addr); 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 void free_irq(unsigned int, void *);
extern int cpu(void); extern int cpu(void);

3
include/asm-um/ptrace-i386.h
View file

@ -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_skas(struct task_struct *from, struct task_struct *to);
extern int arch_switch_tls_tt(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) 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); return CHOOSE_MODE_PROC(do_get_thread_area_tt, do_get_thread_area_skas, info);