diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-15 21:07:59 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-15 21:07:59 -0400 |
| commit | 84c3d4aaec3338201b449034beac41635866bddf (patch) | |
| tree | 3412951682fb2dd4feb8a5532f8efbaf8b345933 /include/linux/topology.h | |
| parent | 43d2548bb2ef7e6d753f91468a746784041e522d (diff) | |
| parent | fafa3a3f16723997f039a0193997464d66dafd8f (diff) | |
Merge commit 'origin/master'
Manual merge of:
arch/powerpc/Kconfig
arch/powerpc/kernel/stacktrace.c
arch/powerpc/mm/slice.c
arch/ppc/kernel/smp.c
Diffstat (limited to 'include/linux/topology.h')
| -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 */ |