summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>2006-04-11 05:53:34 (GMT)
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-11 13:18:36 (GMT)
commit5b0e94787f1b8fdcd370fc6303579d171b941080 (patch)
tree037465ee69e0eb405982e04afe127bdcedfb90a6 /arch
parent7c45ad16f0b64f5fdc64cb0e86aa548d7f4d60c1 (diff)
downloadlinux-fsl-qoriq-5b0e94787f1b8fdcd370fc6303579d171b941080.tar.xz
[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 'arch')
-rw-r--r--arch/um/include/kern_util.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/um/include/kern_util.h b/arch/um/include/kern_util.h
index 4255713..efa3d33 100644
--- a/arch/um/include/kern_util.h
+++ b/arch/um/include/kern_util.h
@@ -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);