diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 00:59:34 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 00:59:34 -0500 |
| commit | 725b2805fd5d729b0db59fe8fc992e97523782c7 (patch) | |
| tree | 04ca7c7ed6e918029898a6c5301488e60d0564d4 /include/asm-x86_64/topology.h | |
| parent | 9ac341ae799413708e674bc65c8a72c90dae8d34 (diff) | |
| parent | cac0e8e8bb2e7a086643bdd00c41d900a79bb4fa (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'include/asm-x86_64/topology.h')
| -rw-r--r-- | include/asm-x86_64/topology.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/asm-x86_64/topology.h b/include/asm-x86_64/topology.h index 2fa7f27381b4..c642f5d9882d 100644 --- a/include/asm-x86_64/topology.h +++ b/include/asm-x86_64/topology.h | |||
| @@ -57,6 +57,15 @@ extern int __node_distance(int, int); | |||
| 57 | 57 | ||
| 58 | #endif | 58 | #endif |
| 59 | 59 | ||
| 60 | #ifdef CONFIG_SMP | ||
| 61 | #define topology_physical_package_id(cpu) \ | ||
| 62 | (phys_proc_id[cpu] == BAD_APICID ? -1 : phys_proc_id[cpu]) | ||
| 63 | #define topology_core_id(cpu) \ | ||
| 64 | (cpu_core_id[cpu] == BAD_APICID ? 0 : cpu_core_id[cpu]) | ||
| 65 | #define topology_core_siblings(cpu) (cpu_core_map[cpu]) | ||
| 66 | #define topology_thread_siblings(cpu) (cpu_sibling_map[cpu]) | ||
| 67 | #endif | ||
| 68 | |||
| 60 | #include <asm-generic/topology.h> | 69 | #include <asm-generic/topology.h> |
| 61 | 70 | ||
| 62 | #endif | 71 | #endif |