Fix mismerge of arch/arm/kernel/smp.c