100% agree with introducing on_lock separately from the conditional locking.
Not so sure about introducing conditional locking and then converting non-x86
archs. I'd prefer to keep the conditional locking after arch conversion.
If something does go awry, it would be nice to be able to preciesly bisect to
the conditional locking. Ditto if it needs to be reverted because it breaks an
arch.