diff options
| author |   Nick Terrell <terrelln@fb.com> | 2022-10-21 16:00:35 -0700 |
|---|---|---|
| committer | Nick Terrell <terrelln@fb.com> | 2022-10-21 16:00:35 -0700 |
| commit | 14e77332e74603efab8347c89d3cda447c3b97c9 (patch) | |
| tree | b7b8a48f4f75590266a763c52e072dda32b228ae /lib/smp_processor_id.c | |
| parent | lib: zstd: clean up double word in comment. (diff) | |
| parent | Merge tag 'for-linus-6.1-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip (diff) | |
| download | wireguard-linux-14e77332e74603efab8347c89d3cda447c3b97c9.tar.xz wireguard-linux-14e77332e74603efab8347c89d3cda447c3b97c9.zip | |
Merge branch 'main' into zstd-next
Diffstat (limited to 'lib/smp_processor_id.c')
| -rw-r--r-- | lib/smp_processor_id.c | 2 |
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; |