diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-08 11:48:51 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-08 11:48:51 -0400 |
| commit | dba58e39ced7af63f2748d12bbb2b4ac83c72391 (patch) | |
| tree | ee15a5e7667b51d0d0f7e8cb39064652f7c84c28 /Documentation/cputopology.txt | |
| parent | 9de36825b321fe9fe9cf73260554251af579f4ca (diff) | |
| parent | 78ff7fae04554b49d29226ed12536268c2500d1f (diff) | |
Merge branches 'tracing/doc', 'tracing/ftrace', 'tracing/printk' and 'tracing/textedit' into tracing/core
Diffstat (limited to 'Documentation/cputopology.txt')
| -rw-r--r-- | Documentation/cputopology.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/cputopology.txt b/Documentation/cputopology.txt index 45932ec21cee..b41f3e58aefa 100644 --- a/Documentation/cputopology.txt +++ b/Documentation/cputopology.txt | |||
| @@ -18,11 +18,11 @@ For an architecture to support this feature, it must define some of | |||
| 18 | these macros in include/asm-XXX/topology.h: | 18 | these macros in include/asm-XXX/topology.h: |
| 19 | #define topology_physical_package_id(cpu) | 19 | #define topology_physical_package_id(cpu) |
| 20 | #define topology_core_id(cpu) | 20 | #define topology_core_id(cpu) |
| 21 | #define topology_thread_siblings(cpu) | 21 | #define topology_thread_cpumask(cpu) |
| 22 | #define topology_core_siblings(cpu) | 22 | #define topology_core_cpumask(cpu) |
| 23 | 23 | ||
| 24 | The type of **_id is int. | 24 | The type of **_id is int. |
| 25 | The type of siblings is cpumask_t. | 25 | The type of siblings is (const) struct cpumask *. |
| 26 | 26 | ||
| 27 | To be consistent on all architectures, include/linux/topology.h | 27 | To be consistent on all architectures, include/linux/topology.h |
| 28 | provides default definitions for any of the above macros that are | 28 | provides default definitions for any of the above macros that are |