Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 323f54ed0f3ce20e9946c961fc928ccdb80d9345

Authored by Tom Rini
Committed by Ingo Molnar
1 parent 87e3c8ae1c
Exists in smarc-imx_3.14.28_1.0.0_ga and in 1 other branch imx_3.14.28_1.0.0_ga

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>

Showing 1 changed file with 10 additions and 1 deletions Side-by-side Diff

include/linux/nodemask.h
Diff comments   View file @ 323f54e
... ... @@ -98,8 +98,17 @@
98 98 typedef struct { DECLARE_BITMAP(bits, MAX_NUMNODES); } nodemask_t;
99 99 extern nodemask_t _unused_nodemask_arg_;
100 100  
  101 +/*
  102 + * The inline keyword gives the compiler room to decide to inline, or
  103 + * not inline a function as it sees best. However, as these functions
  104 + * are called in both __init and non-__init functions, if they are not
  105 + * inlined we will end up with a section mis-match error (of the type of
  106 + * freeable items not being freed). So we must use __always_inline here
  107 + * to fix the problem. If other functions in the future also end up in
  108 + * this situation they will also need to be annotated as __always_inline
  109 + */
101 110 #define node_set(node, dst) __node_set((node), &(dst))
102   -static inline void __node_set(int node, volatile nodemask_t *dstp)
  111 +static __always_inline void __node_set(int node, volatile nodemask_t *dstp)
103 112 {
104 113 set_bit(node, dstp->bits);
105 114 }