diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-05 00:39:55 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-05 00:39:55 -0500 |
| commit | 2b218aea3674d7f8ac853f872b4042d9aa2e1130 (patch) | |
| tree | 404b67143f000f55577ded6fc3d1b2d270ef7ab3 /arch | |
| parent | 3b666ce6a246cb9b89d335738d84af36883b911d (diff) | |
| parent | 43714539eab42b2fa3653ea7bd667b36c2291b11 (diff) | |
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
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/include/asm/topology.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/topology.h b/arch/x86/include/asm/topology.h index 4850e4b02b61..ff386ff50ed7 100644 --- a/arch/x86/include/asm/topology.h +++ b/arch/x86/include/asm/topology.h | |||
| @@ -239,7 +239,7 @@ struct pci_bus; | |||
| 239 | void set_pci_bus_resources_arch_default(struct pci_bus *b); | 239 | void set_pci_bus_resources_arch_default(struct pci_bus *b); |
| 240 | 240 | ||
| 241 | #ifdef CONFIG_SMP | 241 | #ifdef CONFIG_SMP |
| 242 | #define mc_capable() (boot_cpu_data.x86_max_cores > 1) | 242 | #define mc_capable() (cpus_weight(per_cpu(cpu_core_map, 0)) != nr_cpu_ids) |
| 243 | #define smt_capable() (smp_num_siblings > 1) | 243 | #define smt_capable() (smp_num_siblings > 1) |
| 244 | #endif | 244 | #endif |
| 245 | 245 | ||