From: Yong Zhang <yong.zhang@xxxxxxxxxxxxx> Because __cpu_disable is called in atomic context and spinlock is a mutex on -rt. Signed-off-by: Yong Zhang <yong.zhang0@xxxxxxxxx> --- arch/mips/cavium-octeon/smp.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/mips/cavium-octeon/smp.c b/arch/mips/cavium-octeon/smp.c index ef9c34a..473c72b 100644 --- a/arch/mips/cavium-octeon/smp.c +++ b/arch/mips/cavium-octeon/smp.c @@ -257,7 +257,7 @@ DEFINE_PER_CPU(int, cpu_state); extern void fixup_irqs(void); -static DEFINE_SPINLOCK(smp_reserve_lock); +static DEFINE_RAW_SPINLOCK(smp_reserve_lock); static int octeon_cpu_disable(void) { @@ -266,7 +266,7 @@ static int octeon_cpu_disable(void) if (cpu == 0) return -EBUSY; - spin_lock(&smp_reserve_lock); + raw_spin_lock(&smp_reserve_lock); set_cpu_online(cpu, false); cpu_clear(cpu, cpu_callin_map); @@ -277,7 +277,7 @@ static int octeon_cpu_disable(void) flush_cache_all(); local_flush_tlb_all(); - spin_unlock(&smp_reserve_lock); + raw_spin_unlock(&smp_reserve_lock); return 0; } -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-rt-users" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html