mirror of https://gitee.com/openkylin/linux.git
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
This commit is contained in:
parent
0a6ba092d1
commit
6c0a9fa62f
|
@ -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);
|
||||
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue