numa: Mark __node_set as __always_inline
PATCH v2 1/1 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.
---
Changes in v2:
- As per KOSAKI Motohiro, add a comment as well about why we need __always_inline to the header.
--- include/linux/nodemask.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
include/linux/nodemask.h +10 -1
@@ -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); }
Signature · 1 line
1.7.9.5
Quoted 6 lines
include/linux/nodemask.h +5
-0+/* +* 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
include/linux/nodemask.h line 114
Quoted 10 lines
include/linux/nodemask.h +5
-1+* 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); }
tip-bot for Tom Rini
merge bot[tip:sched/core] numa: Mark __node_set() as __always_inline
In reply to Tom Rininuma: Mark __node_set() as __always_inline
Commit-ID: 323f54ed0f3ce20e9946c961fc928ccdb80d9345 Gitweb: http://git.kernel.org/tip/323f54ed0f3ce20e9946c961fc928ccdb80d9345 Author: Tom Rini <[email protected]> AuthorDate: Thu, 25 Jul 2013 14:26:10 -0400 Committer: Ingo Molnar <[email protected]> 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.
--- include/linux/nodemask.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
include/linux/nodemask.h +10 -1
@@ -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); }