summaryrefslogtreecommitdiffstats
path: root/include/asm-sparc64
diff options
context:
space:
mode:
authorDavid S. Miller <davem@hutch.davemloft.net>2007-06-05 06:48:33 +0200
committerDavid S. Miller <davem@sunset.davemloft.net>2007-06-05 06:50:05 +0200
commita2f9f6bbb30e60ee9f9f83cede960123a65876a2 (patch)
tree84388015bd5ba7c4d01fc256d8fb6a2f3d2a93a9 /include/asm-sparc64
parent[SPARC64]: Make core and sibling groups equal on UltraSPARC-IV. (diff)
downloadlinux-a2f9f6bbb30e60ee9f9f83cede960123a65876a2.tar.xz
linux-a2f9f6bbb30e60ee9f9f83cede960123a65876a2.zip
[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')
-rw-r--r--include/asm-sparc64/smp.h1
-rw-r--r--include/asm-sparc64/topology.h6
2 files changed, 3 insertions, 4 deletions
diff --git a/include/asm-sparc64/smp.h b/include/asm-sparc64/smp.h
index 540021268684..4fb8c4bfb848 100644
--- a/include/asm-sparc64/smp.h
+++ b/include/asm-sparc64/smp.h
@@ -34,6 +34,7 @@ extern cpumask_t phys_cpu_present_map;
extern cpumask_t cpu_sibling_map[NR_CPUS];
extern cpumask_t cpu_core_map[NR_CPUS];
+extern int sparc64_multi_core;
/*
* General functions that each host system must provide.
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 @@
#define _ASM_SPARC64_TOPOLOGY_H
#ifdef CONFIG_SMP
-#include <asm/spitfire.h>
-
#define topology_physical_package_id(cpu) (cpu_data(cpu).proc_id)
#define topology_core_id(cpu) (cpu_data(cpu).core_id)
#define topology_core_siblings(cpu) (cpu_core_map[cpu])
#define topology_thread_siblings(cpu) (cpu_sibling_map[cpu])
-#define mc_capable() (tlb_type == hypervisor)
-#define smt_capable() (tlb_type == hypervisor)
+#define mc_capable() (sparc64_multi_core)
+#define smt_capable() (sparc64_multi_core)
#endif /* CONFIG_SMP */
#include <asm-generic/topology.h>