x86: fpu xstate split fix

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --git a/include/asm-x86/thread_info.h b/include/asm-x86/thread_info.h
index 407b88c170d3228642d2a9835593e4e96166eeb4..77244f17993f303d8e80e8af7b0f71e50e69f0a7 100644 (file)
--- a/include/asm-x86/thread_info.h
+++ b/include/asm-x86/thread_info.h
@@ -9,5 +9,6 @@
 extern void arch_task_cache_init(void);
 extern void free_thread_info(struct thread_info *ti);
 extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src);
+#define arch_task_cache_init arch_task_cache_init
 #endif
 #endif /* _ASM_X86_THREAD_INFO_H */

diff --git a/kernel/fork.c b/kernel/fork.c
index 44a18192c420e85dd3ef8f904cbd9e1db573b553..89fe414645e9b76aa777a0de7b5e9d6777814a0f 100644 (file)
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -132,9 +132,13 @@ void __put_task_struct(struct task_struct *tsk)
                free_task(tsk);
 }
 
-void __attribute__((weak)) arch_task_cache_init(void)
-{
-}
+/*
+ * macro override instead of weak attribute alias, to workaround
+ * gcc 4.1.0 and 4.1.1 bugs with weak attribute and empty functions.
+ */
+#ifndef arch_task_cache_init
+#define arch_task_cache_init()
+#endif
 
 void __init fork_init(unsigned long mempages)
 {