diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sparc/include/asm/smp_64.h | 1 | ||||
| -rw-r--r-- | arch/sparc/kernel/mdesc.c | 4 | ||||
| -rw-r--r-- | arch/sparc/kernel/prom_64.c | 3 | ||||
| -rw-r--r-- | arch/sparc/kernel/smp_64.c | 2 |
4 files changed, 0 insertions, 10 deletions
diff --git a/arch/sparc/include/asm/smp_64.h b/arch/sparc/include/asm/smp_64.h index dd3bef4b9896..05710393959f 100644 --- a/arch/sparc/include/asm/smp_64.h +++ b/arch/sparc/include/asm/smp_64.h | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | 32 | ||
| 33 | DECLARE_PER_CPU(cpumask_t, cpu_sibling_map); | 33 | DECLARE_PER_CPU(cpumask_t, cpu_sibling_map); |
| 34 | extern cpumask_t cpu_core_map[NR_CPUS]; | 34 | extern cpumask_t cpu_core_map[NR_CPUS]; |
| 35 | extern int sparc64_multi_core; | ||
| 36 | 35 | ||
| 37 | extern void arch_send_call_function_single_ipi(int cpu); | 36 | extern void arch_send_call_function_single_ipi(int cpu); |
| 38 | extern void arch_send_call_function_ipi_mask(const struct cpumask *mask); | 37 | extern void arch_send_call_function_ipi_mask(const struct cpumask *mask); |
diff --git a/arch/sparc/kernel/mdesc.c b/arch/sparc/kernel/mdesc.c index b90bf23e3aab..a1a4400d4025 100644 --- a/arch/sparc/kernel/mdesc.c +++ b/arch/sparc/kernel/mdesc.c | |||
| @@ -896,10 +896,6 @@ void mdesc_fill_in_cpu_data(cpumask_t *mask) | |||
| 896 | 896 | ||
| 897 | mdesc_iterate_over_cpus(fill_in_one_cpu, NULL, mask); | 897 | mdesc_iterate_over_cpus(fill_in_one_cpu, NULL, mask); |
| 898 | 898 | ||
| 899 | #ifdef CONFIG_SMP | ||
| 900 | sparc64_multi_core = 1; | ||
| 901 | #endif | ||
| 902 | |||
| 903 | hp = mdesc_grab(); | 899 | hp = mdesc_grab(); |
| 904 | 900 | ||
| 905 | set_core_ids(hp); | 901 | set_core_ids(hp); |
diff --git a/arch/sparc/kernel/prom_64.c b/arch/sparc/kernel/prom_64.c index 6b39125eb927..9a690d39c01b 100644 --- a/arch/sparc/kernel/prom_64.c +++ b/arch/sparc/kernel/prom_64.c | |||
| @@ -555,9 +555,6 @@ static void *fill_in_one_cpu(struct device_node *dp, int cpuid, int arg) | |||
| 555 | 555 | ||
| 556 | cpu_data(cpuid).core_id = portid + 1; | 556 | cpu_data(cpuid).core_id = portid + 1; |
| 557 | cpu_data(cpuid).proc_id = portid; | 557 | cpu_data(cpuid).proc_id = portid; |
| 558 | #ifdef CONFIG_SMP | ||
| 559 | sparc64_multi_core = 1; | ||
| 560 | #endif | ||
| 561 | } else { | 558 | } else { |
| 562 | cpu_data(cpuid).dcache_size = | 559 | cpu_data(cpuid).dcache_size = |
| 563 | of_getintprop_default(dp, "dcache-size", 16 * 1024); | 560 | of_getintprop_default(dp, "dcache-size", 16 * 1024); |
diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c index b085311dcd0e..9781048161ab 100644 --- a/arch/sparc/kernel/smp_64.c +++ b/arch/sparc/kernel/smp_64.c | |||
| @@ -53,8 +53,6 @@ | |||
| 53 | 53 | ||
| 54 | #include "cpumap.h" | 54 | #include "cpumap.h" |
| 55 | 55 | ||
| 56 | int sparc64_multi_core __read_mostly; | ||
| 57 | |||
| 58 | DEFINE_PER_CPU(cpumask_t, cpu_sibling_map) = CPU_MASK_NONE; | 56 | DEFINE_PER_CPU(cpumask_t, cpu_sibling_map) = CPU_MASK_NONE; |
| 59 | cpumask_t cpu_core_map[NR_CPUS] __read_mostly = | 57 | cpumask_t cpu_core_map[NR_CPUS] __read_mostly = |
| 60 | { [0 ... NR_CPUS-1] = CPU_MASK_NONE }; | 58 | { [0 ... NR_CPUS-1] = CPU_MASK_NONE }; |
