| From 966158273d48b0bcdbfe6efac3f5c123d038d336 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 24 Jun 2021 11:41:10 +0200 |
| Subject: locking/lockdep: Avoid RCU-induced noinstr fail |
| |
| From: Peter Zijlstra <peterz@infradead.org> |
| |
| [ Upstream commit ce0b9c805dd66d5e49fd53ec5415ae398f4c56e6 ] |
| |
| vmlinux.o: warning: objtool: look_up_lock_class()+0xc7: call to rcu_read_lock_any_held() leaves .noinstr.text section |
| |
| Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> |
| Link: https://lore.kernel.org/r/20210624095148.311980536@infradead.org |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| kernel/locking/lockdep.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c |
| index 3ec8fd2e80e53..db109d38f301e 100644 |
| --- a/kernel/locking/lockdep.c |
| +++ b/kernel/locking/lockdep.c |
| @@ -830,7 +830,7 @@ look_up_lock_class(const struct lockdep_map *lock, unsigned int subclass) |
| if (DEBUG_LOCKS_WARN_ON(!irqs_disabled())) |
| return NULL; |
| |
| - hlist_for_each_entry_rcu(class, hash_head, hash_entry) { |
| + hlist_for_each_entry_rcu_notrace(class, hash_head, hash_entry) { |
| if (class->key == key) { |
| /* |
| * Huh! same key, different name? Did someone trample |
| -- |
| 2.33.0 |
| |
