Commit 2b218aea authored Dec 04, 2008 by Linus Torvalds

Merge branch 'sched-fixes-for-linus' of...

Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  sched: don't export sched_mc_power_savings in laptops

parents 3b666ce6 43714539

arch/x86/include/asm/topology.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -239,7 +239,7 @@ struct pci_bus;
		void set_pci_bus_resources_arch_default(struct pci_bus *b);

		#ifdef CONFIG_SMP
		#define mc_capable() (boot_cpu_data.x86_max_cores > 1)
		#define mc_capable() (cpus_weight(per_cpu(cpu_core_map, 0)) != nr_cpu_ids)
		#define smt_capable() (smp_num_siblings > 1)
		#endif