arm/kernel/smp.c: fix a merge derp