Commit-ID: 323f54ed0f3ce20e9946c961fc928ccdb80d9345 Gitweb: http://git.kernel.org/tip/323f54ed0f3ce20e9946c961fc928ccdb80d9345 Author: Tom Rini <tr...@ti.com> AuthorDate: Thu, 25 Jul 2013 14:26:10 -0400 Committer: Ingo Molnar <mi...@kernel.org> CommitDate: Thu, 25 Jul 2013 21:54:01 +0200
numa: Mark __node_set() as __always_inline It is posible for some compilers to decide that __node_set() does not need to be made turned into an inline function. When the compiler does this on an __init function calling it on __initdata we get a section mismatch warning now. Use __always_inline to ensure that we will be inlined. Reported-by: Paul Bolle <pebo...@tiscali.nl> Cc: Jianpeng Ma <majianp...@gmail.com> Cc: Rusty Russell <ru...@rustcorp.com.au> Cc: Lai Jiangshan <la...@cn.fujitsu.com> Cc: Yasuaki Ishimatsu <isimatu.yasu...@jp.fujitsu.com> Cc: Wen Congyang <we...@cn.fujitsu.com> Cc: Jiang Liu <jiang....@huawei.com> Cc: KOSAKI Motohiro <kosaki.motoh...@jp.fujitsu.com> Cc: Minchan Kim <minchan....@gmail.com> Cc: Mel Gorman <mgor...@suse.de> Cc: David Rientjes <rient...@google.com> Cc: Yinghai Lu <ying...@kernel.org> Cc: Greg KH <g...@kroah.com> Signed-off-by: Tom Rini <tr...@ti.com> Link: http://lkml.kernel.org/r/1374776770-32361-1-git-send-email-tr...@ti.com Signed-off-by: Ingo Molnar <mi...@kernel.org> --- include/linux/nodemask.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/include/linux/nodemask.h b/include/linux/nodemask.h index 4e2cbfa..58b9a02 100644 --- a/include/linux/nodemask.h +++ b/include/linux/nodemask.h @@ -98,8 +98,17 @@ typedef struct { DECLARE_BITMAP(bits, MAX_NUMNODES); } nodemask_t; extern nodemask_t _unused_nodemask_arg_; +/* + * The inline keyword gives the compiler room to decide to inline, or + * not inline a function as it sees best. However, as these functions + * are called in both __init and non-__init functions, if they are not + * inlined we will end up with a section mis-match error (of the type of + * freeable items not being freed). So we must use __always_inline here + * to fix the problem. If other functions in the future also end up in + * this situation they will also need to be annotated as __always_inline + */ #define node_set(node, dst) __node_set((node), &(dst)) -static inline void __node_set(int node, volatile nodemask_t *dstp) +static __always_inline void __node_set(int node, volatile nodemask_t *dstp) { set_bit(node, dstp->bits); } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
