aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/kernel/crash.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/mips/kernel/crash.c')
-rw-r--r--arch/mips/kernel/crash.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/mips/kernel/crash.c b/arch/mips/kernel/crash.c
index d21264681e97..d434d5d5ae6e 100644
--- a/arch/mips/kernel/crash.c
+++ b/arch/mips/kernel/crash.c
@@ -25,9 +25,9 @@ static void crash_shutdown_secondary(void *ignore)
25 return; 25 return;
26 26
27 local_irq_disable(); 27 local_irq_disable();
28 if (!cpu_isset(cpu, cpus_in_crash)) 28 if (!cpumask_test_cpu(cpu, &cpus_in_crash))
29 crash_save_cpu(regs, cpu); 29 crash_save_cpu(regs, cpu);
30 cpu_set(cpu, cpus_in_crash); 30 cpumask_set_cpu(cpu, &cpus_in_crash);
31 31
32 while (!atomic_read(&kexec_ready_to_reboot)) 32 while (!atomic_read(&kexec_ready_to_reboot))
33 cpu_relax(); 33 cpu_relax();
@@ -50,7 +50,7 @@ static void crash_kexec_prepare_cpus(void)
50 */ 50 */
51 pr_emerg("Sending IPI to other cpus...\n"); 51 pr_emerg("Sending IPI to other cpus...\n");
52 msecs = 10000; 52 msecs = 10000;
53 while ((cpus_weight(cpus_in_crash) < ncpus) && (--msecs > 0)) { 53 while ((cpumask_weight(&cpus_in_crash) < ncpus) && (--msecs > 0)) {
54 cpu_relax(); 54 cpu_relax();
55 mdelay(1); 55 mdelay(1);
56 } 56 }
@@ -66,5 +66,5 @@ void default_machine_crash_shutdown(struct pt_regs *regs)
66 crashing_cpu = smp_processor_id(); 66 crashing_cpu = smp_processor_id();
67 crash_save_cpu(regs, crashing_cpu); 67 crash_save_cpu(regs, crashing_cpu);
68 crash_kexec_prepare_cpus(); 68 crash_kexec_prepare_cpus();
69 cpu_set(crashing_cpu, cpus_in_crash); 69 cpumask_set_cpu(crashing_cpu, &cpus_in_crash);
70} 70}