diff options
author | David S. Miller <davem@hutch.davemloft.net> | 2007-06-05 00:48:33 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-06-05 00:50:05 -0400 |
commit | a2f9f6bbb30e60ee9f9f83cede960123a65876a2 (patch) | |
tree | 84388015bd5ba7c4d01fc256d8fb6a2f3d2a93a9 /include/asm-sparc64/topology.h | |
parent | 5cd342df96e911fb8135fb3d58f33c2c5af9ffab (diff) |
[SPARC64]: Fix {mc,smt}_capable().
It's not just sun4v hypervisor platforms that should return true
for this, sun4u with UltraSPARC-IV should return true too.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/asm-sparc64/topology.h')
-rw-r--r-- | include/asm-sparc64/topology.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/asm-sparc64/topology.h b/include/asm-sparc64/topology.h index 4880f7ca0b60..290ac75f385b 100644 --- a/include/asm-sparc64/topology.h +++ b/include/asm-sparc64/topology.h | |||
@@ -2,14 +2,12 @@ | |||
2 | #define _ASM_SPARC64_TOPOLOGY_H | 2 | #define _ASM_SPARC64_TOPOLOGY_H |
3 | 3 | ||
4 | #ifdef CONFIG_SMP | 4 | #ifdef CONFIG_SMP |
5 | #include <asm/spitfire.h> | ||
6 | |||
7 | #define topology_physical_package_id(cpu) (cpu_data(cpu).proc_id) | 5 | #define topology_physical_package_id(cpu) (cpu_data(cpu).proc_id) |
8 | #define topology_core_id(cpu) (cpu_data(cpu).core_id) | 6 | #define topology_core_id(cpu) (cpu_data(cpu).core_id) |
9 | #define topology_core_siblings(cpu) (cpu_core_map[cpu]) | 7 | #define topology_core_siblings(cpu) (cpu_core_map[cpu]) |
10 | #define topology_thread_siblings(cpu) (cpu_sibling_map[cpu]) | 8 | #define topology_thread_siblings(cpu) (cpu_sibling_map[cpu]) |
11 | #define mc_capable() (tlb_type == hypervisor) | 9 | #define mc_capable() (sparc64_multi_core) |
12 | #define smt_capable() (tlb_type == hypervisor) | 10 | #define smt_capable() (sparc64_multi_core) |
13 | #endif /* CONFIG_SMP */ | 11 | #endif /* CONFIG_SMP */ |
14 | 12 | ||
15 | #include <asm-generic/topology.h> | 13 | #include <asm-generic/topology.h> |