Merge branch 'WIP.locking/atomics' into locking/core

Merge two uncontroversial cleanups from this branch while the rest is being reworked.

Signed-off-by: Ingo Molnar <mingo@kernel.org>