Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'locking-urgent-2020-05-10' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull locking fix from Thomas Gleixner:
"A single fix for the fallout of the recent futex uacess rework.
With those changes GCC9 fails to analyze arch_futex_atomic_op_inuser()
correctly and emits a 'maybe unitialized' warning. While we usually
ignore compiler stupidity the conditional store is pointless anyway
because the correct case has to store. For the fault case the extra
store does no harm"
* tag 'locking-urgent-2020-05-10' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
ARM: futex: Address build warning
+7
-2
+7
-2
arch/arm/include/asm/futex.h
+7
-2
arch/arm/include/asm/futex.h
···
165
165
preempt_enable();
166
166
#endif
167
167
168
-
if (!ret)
169
-
*oval = oldval;
168
+
/*
169
+
* Store unconditionally. If ret != 0 the extra store is the least
170
+
* of the worries but GCC cannot figure out that __futex_atomic_op()
171
+
* is either setting ret to -EFAULT or storing the old value in
172
+
* oldval which results in a uninitialized warning at the call site.
173
+
*/
174
+
*oval = oldval;
170
175
171
176
return ret;
172
177
}