summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/mips/cavium-octeon/smp.c1
-rw-r--r--arch/mips/include/asm/smp.h2
-rw-r--r--arch/mips/kernel/smp-bmips.c1
-rw-r--r--arch/mips/kernel/smp-cps.c1
-rw-r--r--arch/mips/kernel/smp.c2
-rw-r--r--arch/mips/loongson64/loongson-3/smp.c1
6 files changed, 0 insertions, 8 deletions
diff --git a/arch/mips/cavium-octeon/smp.c b/arch/mips/cavium-octeon/smp.c
index 889c3f49dbc0..a3d731479141 100644
--- a/arch/mips/cavium-octeon/smp.c
+++ b/arch/mips/cavium-octeon/smp.c
@@ -290,7 +290,6 @@ static int octeon_cpu_disable(void)
290 290
291 set_cpu_online(cpu, false); 291 set_cpu_online(cpu, false);
292 calculate_cpu_foreign_map(); 292 calculate_cpu_foreign_map();
293 cpumask_clear_cpu(cpu, &cpu_callin_map);
294 octeon_fixup_irqs(); 293 octeon_fixup_irqs();
295 294
296 __flush_cache_all(); 295 __flush_cache_all();
diff --git a/arch/mips/include/asm/smp.h b/arch/mips/include/asm/smp.h
index 060f23ff1817..f8c5faa93584 100644
--- a/arch/mips/include/asm/smp.h
+++ b/arch/mips/include/asm/smp.h
@@ -46,8 +46,6 @@ extern int __cpu_logical_map[NR_CPUS];
46#define SMP_DUMP 0x8 46#define SMP_DUMP 0x8
47#define SMP_ASK_C0COUNT 0x10 47#define SMP_ASK_C0COUNT 0x10
48 48
49extern cpumask_t cpu_callin_map;
50
51/* Mask of CPUs which are currently definitely operating coherently */ 49/* Mask of CPUs which are currently definitely operating coherently */
52extern cpumask_t cpu_coherent_mask; 50extern cpumask_t cpu_coherent_mask;
53 51
diff --git a/arch/mips/kernel/smp-bmips.c b/arch/mips/kernel/smp-bmips.c
index 6d0f1321e084..f6700dc2fb09 100644
--- a/arch/mips/kernel/smp-bmips.c
+++ b/arch/mips/kernel/smp-bmips.c
@@ -364,7 +364,6 @@ static int bmips_cpu_disable(void)
364 364
365 set_cpu_online(cpu, false); 365 set_cpu_online(cpu, false);
366 calculate_cpu_foreign_map(); 366 calculate_cpu_foreign_map();
367 cpumask_clear_cpu(cpu, &cpu_callin_map);
368 clear_c0_status(IE_IRQ5); 367 clear_c0_status(IE_IRQ5);
369 368
370 local_flush_tlb_all(); 369 local_flush_tlb_all();
diff --git a/arch/mips/kernel/smp-cps.c b/arch/mips/kernel/smp-cps.c
index 6183ad84cc73..44339b470ef4 100644
--- a/arch/mips/kernel/smp-cps.c
+++ b/arch/mips/kernel/smp-cps.c
@@ -399,7 +399,6 @@ static int cps_cpu_disable(void)
399 smp_mb__after_atomic(); 399 smp_mb__after_atomic();
400 set_cpu_online(cpu, false); 400 set_cpu_online(cpu, false);
401 calculate_cpu_foreign_map(); 401 calculate_cpu_foreign_map();
402 cpumask_clear_cpu(cpu, &cpu_callin_map);
403 402
404 return 0; 403 return 0;
405} 404}
diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c
index 03daf9008124..0a831f63b0ec 100644
--- a/arch/mips/kernel/smp.c
+++ b/arch/mips/kernel/smp.c
@@ -48,8 +48,6 @@
48#include <asm/setup.h> 48#include <asm/setup.h>
49#include <asm/maar.h> 49#include <asm/maar.h>
50 50
51cpumask_t cpu_callin_map; /* Bitmask of started secondaries */
52
53int __cpu_number_map[NR_CPUS]; /* Map physical to logical */ 51int __cpu_number_map[NR_CPUS]; /* Map physical to logical */
54EXPORT_SYMBOL(__cpu_number_map); 52EXPORT_SYMBOL(__cpu_number_map);
55 53
diff --git a/arch/mips/loongson64/loongson-3/smp.c b/arch/mips/loongson64/loongson-3/smp.c
index 99aab9f85904..cfcf240cedbe 100644
--- a/arch/mips/loongson64/loongson-3/smp.c
+++ b/arch/mips/loongson64/loongson-3/smp.c
@@ -418,7 +418,6 @@ static int loongson3_cpu_disable(void)
418 418
419 set_cpu_online(cpu, false); 419 set_cpu_online(cpu, false);
420 calculate_cpu_foreign_map(); 420 calculate_cpu_foreign_map();
421 cpumask_clear_cpu(cpu, &cpu_callin_map);
422 local_irq_save(flags); 421 local_irq_save(flags);
423 fixup_irqs(); 422 fixup_irqs();
424 local_irq_restore(flags); 423 local_irq_restore(flags);