Merge master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6

	parent = &sysfs_nodes[cpu_to_node(num)];

#endif /* CONFIG_NUMA */

#ifdef CONFIG_ACPI_BOOT

	/*

	 * If CPEI cannot be re-targetted, and this is

	 * CPEI target, then dont create the control file

	 */

	if (!can_cpei_retarget() && is_cpu_cpei_target(num))

		sysfs_cpus[num].cpu.no_control = 1;

#endif

	return register_cpu(&sysfs_cpus[num].cpu, num, parent);

}