projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'spi-fix-v6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi
[linux-2.6-microblaze.git]
/
lib
/
smp_processor_id.c
diff --git
a/lib/smp_processor_id.c
b/lib/smp_processor_id.c
index
046ac62
..
a2bb773
100644
(file)
--- 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;