diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-13 00:54:55 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-13 00:54:55 -0400 |
| commit | 238a5b4bff2e0929a9ceb41f340137f36a6a75d9 (patch) | |
| tree | 825d444ffd70579ab3e9a84f829d0cc6091295a8 /include/linux/topology.h | |
| parent | 17d85bc7564571a1cce23ffdb2d2a33301876925 (diff) | |
| parent | 73e907de7d5cecef43d9949ab8f4fdca508168c7 (diff) | |
Merge branch 'cpus4096' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-x86 into cpus4096
Diffstat (limited to 'include/linux/topology.h')
| -rw-r--r-- | include/linux/topology.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/linux/topology.h b/include/linux/topology.h index a16b9e06f2e5..16b7d6896ce9 100644 --- a/include/linux/topology.h +++ b/include/linux/topology.h | |||
| @@ -38,11 +38,7 @@ | |||
| 38 | #endif | 38 | #endif |
| 39 | 39 | ||
| 40 | #ifndef nr_cpus_node | 40 | #ifndef nr_cpus_node |
| 41 | #define nr_cpus_node(node) \ | 41 | #define nr_cpus_node(node) cpumask_weight(cpumask_of_node(node)) |
| 42 | ({ \ | ||
| 43 | node_to_cpumask_ptr(__tmp__, node); \ | ||
| 44 | cpus_weight(*__tmp__); \ | ||
| 45 | }) | ||
| 46 | #endif | 42 | #endif |
| 47 | 43 | ||
| 48 | #define for_each_node_with_cpus(node) \ | 44 | #define for_each_node_with_cpus(node) \ |