x86: merge smp_store_cpu_info