arm: Remove no-longer-required RCU_NONIDLE wrapper
merge fix
L2 OC - add 2 steps