x86: cleanup some remaining usages of NR_CPUS where s/b nr_cpu_ids