diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-15 13:32:39 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-15 13:32:39 -0400 |
| commit | e7849f16c13476288fe4fbd420975e8456c75aa0 (patch) | |
| tree | a4f4f4a720210dd4a7879f979c9c79b6d0b75a3f /include/linux | |
| parent | af5329cdf51cdd208a323e521faa46800a16d2ec (diff) | |
| parent | 131b943ae643b1ad6febd67cdbb31d955706ecf4 (diff) | |
Merge branch 'core/topology' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core/topology' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
cputopology: always define CPU topology information, clean up
cpu topology: always define CPU topology information
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/topology.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/include/linux/topology.h b/include/linux/topology.h index 24f3d2282e11..2158fc0d5a56 100644 --- a/include/linux/topology.h +++ b/include/linux/topology.h | |||
| @@ -179,4 +179,17 @@ void arch_update_cpu_topology(void); | |||
| 179 | #endif | 179 | #endif |
| 180 | #endif /* CONFIG_NUMA */ | 180 | #endif /* CONFIG_NUMA */ |
| 181 | 181 | ||
| 182 | #ifndef topology_physical_package_id | ||
| 183 | #define topology_physical_package_id(cpu) ((void)(cpu), -1) | ||
| 184 | #endif | ||
| 185 | #ifndef topology_core_id | ||
| 186 | #define topology_core_id(cpu) ((void)(cpu), 0) | ||
| 187 | #endif | ||
| 188 | #ifndef topology_thread_siblings | ||
| 189 | #define topology_thread_siblings(cpu) cpumask_of_cpu(cpu) | ||
| 190 | #endif | ||
| 191 | #ifndef topology_core_siblings | ||
| 192 | #define topology_core_siblings(cpu) cpumask_of_cpu(cpu) | ||
| 193 | #endif | ||
| 194 | |||
| 182 | #endif /* _LINUX_TOPOLOGY_H */ | 195 | #endif /* _LINUX_TOPOLOGY_H */ |