Commit 323f54ed authored Jul 25, 2013 by Tom Rini Committed by Ingo Molnar Jul 25, 2013

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 <pebolle@tiscali.nl>
Cc: Jianpeng Ma <majianpeng@gmail.com>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Lai Jiangshan <laijs@cn.fujitsu.com>
Cc: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Cc: Wen Congyang <wency@cn.fujitsu.com>
Cc: Jiang Liu <jiang.liu@huawei.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Minchan Kim <minchan.kim@gmail.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: David Rientjes <rientjes@google.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Tom Rini <trini@ti.com>
Link: http://lkml.kernel.org/r/1374776770-32361-1-git-send-email-trini@ti.com


Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent 87e3c8ae

include/linux/nodemask.h

+10 −1

Original line number	Diff line number	Diff line
		@@ -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);
		}