git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v6.8-rc4' into x86/percpu, to resolve conflicts and refresh the branch
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
include
/
asm
/
preempt.h
diff --git
a/arch/x86/include/asm/preempt.h
b/arch/x86/include/asm/preempt.h
index af77235fded63b64ec99844778796a294cf29d0a..919909d8cb77e3d630af36bf7df00f10fc3765f2 100644
(file)
--- a/
arch/x86/include/asm/preempt.h
+++ b/
arch/x86/include/asm/preempt.h
@@
-91,7
+91,7
@@
static __always_inline void __preempt_count_sub(int val)
*/
static __always_inline bool __preempt_count_dec_and_test(void)
{
- return GEN_UNARY_RMWcc("decl",
pcpu_hot.preempt_count
, e,
+ return GEN_UNARY_RMWcc("decl",
__my_cpu_var(pcpu_hot.preempt_count)
, e,
__percpu_arg([var]));
}