Revert "[SPARC64]: Wrap SMP IPIs with irq_enter()/irq_exit()."
This reverts commit 2664ef44cf
.
Ingo moved around where the softlockup dependency sits
so this change is no longer necessary.
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -865,21 +865,14 @@ void smp_call_function_client(int irq, struct pt_regs *regs)
|
|||||||
void *info = call_data->info;
|
void *info = call_data->info;
|
||||||
|
|
||||||
clear_softint(1 << irq);
|
clear_softint(1 << irq);
|
||||||
|
|
||||||
irq_enter();
|
|
||||||
|
|
||||||
if (!call_data->wait) {
|
|
||||||
/* let initiator proceed after getting data */
|
|
||||||
atomic_inc(&call_data->finished);
|
|
||||||
}
|
|
||||||
|
|
||||||
func(info);
|
|
||||||
|
|
||||||
irq_exit();
|
|
||||||
|
|
||||||
if (call_data->wait) {
|
if (call_data->wait) {
|
||||||
/* let initiator proceed only after completion */
|
/* let initiator proceed only after completion */
|
||||||
|
func(info);
|
||||||
atomic_inc(&call_data->finished);
|
atomic_inc(&call_data->finished);
|
||||||
|
} else {
|
||||||
|
/* let initiator proceed after getting data */
|
||||||
|
atomic_inc(&call_data->finished);
|
||||||
|
func(info);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1041,9 +1034,7 @@ void smp_receive_signal(int cpu)
|
|||||||
|
|
||||||
void smp_receive_signal_client(int irq, struct pt_regs *regs)
|
void smp_receive_signal_client(int irq, struct pt_regs *regs)
|
||||||
{
|
{
|
||||||
irq_enter();
|
|
||||||
clear_softint(1 << irq);
|
clear_softint(1 << irq);
|
||||||
irq_exit();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void smp_new_mmu_context_version_client(int irq, struct pt_regs *regs)
|
void smp_new_mmu_context_version_client(int irq, struct pt_regs *regs)
|
||||||
@@ -1051,8 +1042,6 @@ void smp_new_mmu_context_version_client(int irq, struct pt_regs *regs)
|
|||||||
struct mm_struct *mm;
|
struct mm_struct *mm;
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
|
|
||||||
irq_enter();
|
|
||||||
|
|
||||||
clear_softint(1 << irq);
|
clear_softint(1 << irq);
|
||||||
|
|
||||||
/* See if we need to allocate a new TLB context because
|
/* See if we need to allocate a new TLB context because
|
||||||
@@ -1072,8 +1061,6 @@ void smp_new_mmu_context_version_client(int irq, struct pt_regs *regs)
|
|||||||
load_secondary_context(mm);
|
load_secondary_context(mm);
|
||||||
__flush_tlb_mm(CTX_HWBITS(mm->context),
|
__flush_tlb_mm(CTX_HWBITS(mm->context),
|
||||||
SECONDARY_CONTEXT);
|
SECONDARY_CONTEXT);
|
||||||
|
|
||||||
irq_exit();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void smp_new_mmu_context_version(void)
|
void smp_new_mmu_context_version(void)
|
||||||
@@ -1239,8 +1226,6 @@ void smp_penguin_jailcell(int irq, struct pt_regs *regs)
|
|||||||
{
|
{
|
||||||
clear_softint(1 << irq);
|
clear_softint(1 << irq);
|
||||||
|
|
||||||
irq_enter();
|
|
||||||
|
|
||||||
preempt_disable();
|
preempt_disable();
|
||||||
|
|
||||||
__asm__ __volatile__("flushw");
|
__asm__ __volatile__("flushw");
|
||||||
@@ -1253,8 +1238,6 @@ void smp_penguin_jailcell(int irq, struct pt_regs *regs)
|
|||||||
prom_world(0);
|
prom_world(0);
|
||||||
|
|
||||||
preempt_enable();
|
preempt_enable();
|
||||||
|
|
||||||
irq_exit();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* /proc/profile writes can call this, don't __init it please. */
|
/* /proc/profile writes can call this, don't __init it please. */
|
||||||
|
Reference in New Issue
Block a user