diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-06-25 09:27:27 -0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-06-25 09:27:27 -0400 |
| commit | 38b22b6e9f46ab8f73ef5734f0e0a000766a9258 (patch) | |
| tree | 2ccc41ef55918d3af43e444bde7648562a031559 /include/asm-i386/topology.h | |
| parent | 3357d4c75f1fb67e7304998c4ad4e9a9fed66fa4 (diff) | |
| parent | b3e112bcc19abd8e9657dca34a87316786e096f3 (diff) | |
Automerge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'include/asm-i386/topology.h')
| -rw-r--r-- | include/asm-i386/topology.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/include/asm-i386/topology.h b/include/asm-i386/topology.h index 98f9e6850cba..6d0f67507b21 100644 --- a/include/asm-i386/topology.h +++ b/include/asm-i386/topology.h | |||
| @@ -60,12 +60,8 @@ static inline int node_to_first_cpu(int node) | |||
| 60 | return first_cpu(mask); | 60 | return first_cpu(mask); |
| 61 | } | 61 | } |
| 62 | 62 | ||
| 63 | /* Returns the number of the node containing PCI bus number 'busnr' */ | 63 | #define pcibus_to_node(bus) mp_bus_id_to_node[(bus)->number] |
| 64 | static inline cpumask_t __pcibus_to_cpumask(int busnr) | 64 | #define pcibus_to_cpumask(bus) node_to_cpumask(pcibus_to_node(bus)) |
| 65 | { | ||
| 66 | return node_to_cpumask(mp_bus_id_to_node[busnr]); | ||
| 67 | } | ||
| 68 | #define pcibus_to_cpumask(bus) __pcibus_to_cpumask(bus->number) | ||
| 69 | 65 | ||
| 70 | /* sched_domains SD_NODE_INIT for NUMAQ machines */ | 66 | /* sched_domains SD_NODE_INIT for NUMAQ machines */ |
| 71 | #define SD_NODE_INIT (struct sched_domain) { \ | 67 | #define SD_NODE_INIT (struct sched_domain) { \ |