diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2012-05-05 15:05:40 +0000 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2012-05-08 13:55:20 +0200 |
| commit | 6c0a9fa62feb7e9fdefa9720bcc03040c9b0b311 (patch) | |
| tree | 0c91586d2bfc7184ea2b13004147f3ef4753733d | |
| parent | 0a6ba092d1c8c75ae0c0617ef7f4e6f5043af311 (diff) | |
| download | linux-3.10-6c0a9fa62feb7e9fdefa9720bcc03040c9b0b311.tar.gz linux-3.10-6c0a9fa62feb7e9fdefa9720bcc03040c9b0b311.tar.bz2 linux-3.10-6c0a9fa62feb7e9fdefa9720bcc03040c9b0b311.zip | |
fork: Remove the weak insanity
We error out when compiling with gcc4.1.[01] as it miscompiles
__weak. The workaround with magic defines is not longer
necessary. Make it __weak again.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20120505150141.306358267@linutronix.de
| -rw-r--r-- | arch/sh/include/asm/thread_info.h | 1 | ||||
| -rw-r--r-- | arch/x86/include/asm/thread_info.h | 1 | ||||
| -rw-r--r-- | kernel/fork.c | 8 |
3 files changed, 1 insertions, 9 deletions
diff --git a/arch/sh/include/asm/thread_info.h b/arch/sh/include/asm/thread_info.h index 20ee40af16e..09963d4018c 100644 --- a/arch/sh/include/asm/thread_info.h +++ b/arch/sh/include/asm/thread_info.h @@ -98,7 +98,6 @@ static inline struct thread_info *current_thread_info(void) extern struct thread_info *alloc_thread_info_node(struct task_struct *tsk, int node); extern void free_thread_info(struct thread_info *ti); extern void arch_task_cache_init(void); -#define arch_task_cache_init arch_task_cache_init extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src); extern void init_thread_xstate(void); diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h index ad6df8ccd71..8692a166dd4 100644 --- a/arch/x86/include/asm/thread_info.h +++ b/arch/x86/include/asm/thread_info.h @@ -284,6 +284,5 @@ static inline bool is_ia32_task(void) 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 b9372a0bff1..a79b36e2e91 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -203,13 +203,7 @@ void __put_task_struct(struct task_struct *tsk) } EXPORT_SYMBOL_GPL(__put_task_struct); -/* - * 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 __weak arch_task_cache_init(void) { } void __init fork_init(unsigned long mempages) { |