summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>2022-06-22 14:46:31 +0900
committerakpm <akpm@linux-foundation.org>2022-07-17 17:31:41 -0700
commitbd27acaac24e4b252ee28dddcabaee80456d0faf (patch)
tree15ce393dfd030112d4e56f80f311f5777e075751 /lib
parent953257a9252a9b3c58ca68fc5bf26fc65e5b1cb8 (diff)
downloadlinux-stable-bd27acaac24e4b252ee28dddcabaee80456d0faf.tar.gz
linux-stable-bd27acaac24e4b252ee28dddcabaee80456d0faf.tar.bz2
linux-stable-bd27acaac24e4b252ee28dddcabaee80456d0faf.zip
lib/smp_processor_id: fix imbalanced instrumentation_end() call
Currently instrumentation_end() won't be called if printk_ratelimit() returned false. Link: https://lkml.kernel.org/r/a636d8e0-ad32-5888-acac-671f7f553bb3@I-love.SAKURA.ne.jp Fixes: 126f21f0e8d46e2c ("lib/smp_processor_id: Move it into noinstr section") Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Alexandre Chartre <alexandre.chartre@oracle.com> Cc: Peter Zijlstra <peterz@infradead.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'lib')
-rw-r--r--lib/smp_processor_id.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/smp_processor_id.c b/lib/smp_processor_id.c
index 046ac6297c78..a2bb7738c373 100644
--- a/lib/smp_processor_id.c
+++ b/lib/smp_processor_id.c
@@ -47,9 +47,9 @@ unsigned int check_preemption_disabled(const char *what1, const char *what2)
printk("caller is %pS\n", __builtin_return_address(0));
dump_stack();
- instrumentation_end();
out_enable:
+ instrumentation_end();
preempt_enable_no_resched_notrace();
out:
return this_cpu;