From 0d163c70d5baa3c795c220f56c6458586ed76002 Mon Sep 17 00:00:00 2001
From: Suresh Siddha <suresh.b.siddha@intel.com>
Date: Wed, 16 Apr 2008 10:25:35 +0200
Subject: [PATCH] --- yaml --- r: 90989 b: refs/heads/master c:
 2adee9b30d1382fba97825b9c50e4f50a0117c36 h: refs/heads/master i:   90987:
 409a623320a4812fcbf91e002f8d6eec4e3e1121 v: v3

---
 [refs]                              |  2 +-
 trunk/include/asm-x86/thread_info.h |  1 +
 trunk/kernel/fork.c                 | 10 +++++++---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 3387f4e88dfd..8044aad4b0b7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1679f2710ac58df580d3716fab1f42ae50a226eb
+refs/heads/master: 2adee9b30d1382fba97825b9c50e4f50a0117c36
diff --git a/trunk/include/asm-x86/thread_info.h b/trunk/include/asm-x86/thread_info.h
index 407b88c170d3..77244f17993f 100644
--- a/trunk/include/asm-x86/thread_info.h
+++ b/trunk/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/trunk/kernel/fork.c b/trunk/kernel/fork.c
index 44a18192c420..89fe414645e9 100644
--- a/trunk/kernel/fork.c
+++ b/trunk/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)
 {