Commit 6eebad1a authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Thomas Gleixner

lockdep: __always_inline more for noinstr

vmlinux.o: warning: objtool: debug_locks_off()+0xd: call to __debug_locks_off() leaves .noinstr.text section
vmlinux.o: warning: objtool: match_held_lock()+0x6a: call to look_up_lock_class.isra.0() leaves .noinstr.text section
vmlinux.o: warning: objtool: lock_is_held_type()+0x90: call to lockdep_recursion_finish() leaves .noinstr.text section
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lkml.kernel.org/r/20200603114052.185201076@infradead.org

parent 5ef22793
...@@ -12,7 +12,7 @@ extern int debug_locks __read_mostly; ...@@ -12,7 +12,7 @@ extern int debug_locks __read_mostly;
extern int debug_locks_silent __read_mostly; extern int debug_locks_silent __read_mostly;
static inline int __debug_locks_off(void) static __always_inline int __debug_locks_off(void)
{ {
return xchg(&debug_locks, 0); return xchg(&debug_locks, 0);
} }
......
...@@ -393,7 +393,7 @@ void lockdep_init_task(struct task_struct *task) ...@@ -393,7 +393,7 @@ void lockdep_init_task(struct task_struct *task)
task->lockdep_recursion = 0; task->lockdep_recursion = 0;
} }
static inline void lockdep_recursion_finish(void) static __always_inline void lockdep_recursion_finish(void)
{ {
if (WARN_ON_ONCE(--current->lockdep_recursion)) if (WARN_ON_ONCE(--current->lockdep_recursion))
current->lockdep_recursion = 0; current->lockdep_recursion = 0;
...@@ -801,7 +801,7 @@ static int count_matching_names(struct lock_class *new_class) ...@@ -801,7 +801,7 @@ static int count_matching_names(struct lock_class *new_class)
} }
/* used from NMI context -- must be lockless */ /* used from NMI context -- must be lockless */
static inline struct lock_class * static __always_inline struct lock_class *
look_up_lock_class(const struct lockdep_map *lock, unsigned int subclass) look_up_lock_class(const struct lockdep_map *lock, unsigned int subclass)
{ {
struct lockdep_subclass_key *key; struct lockdep_subclass_key *key;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment