x86: merge SMP definitions of smp.h