1 files changed, 5 insertions, 22 deletions

diff --git a/arch/sparc64/kernel/smp.c b/arch/sparc64/kernel/smp.c
index 3aba47624df4..0d6403a630ac 100644
--- a/arch/sparc64/kernel/smp.c
+++ b/arch/sparc64/kernel/smp.c
@@ -865,21 +865,14 @@ void smp_call_function_client(int irq, struct pt_regs *regs)
         void *info = call_data->info;
 
         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) {
                 /* let initiator proceed only after completion */
+                func(info);
                 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)
 {
-        irq_enter();
         clear_softint(1 << irq);
-        irq_exit();
 }
 
 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;
         unsigned long flags;
 
-        irq_enter();
-
         clear_softint(1 << irq);
 
         /* 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);
         __flush_tlb_mm(CTX_HWBITS(mm->context),
                        SECONDARY_CONTEXT);
-
-        irq_exit();
 }
 
 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);
 
-        irq_enter();
-
         preempt_disable();
 
         __asm__ __volatile__("flushw");
@@ -1253,8 +1238,6 @@ void smp_penguin_jailcell(int irq, struct pt_regs *regs)
         prom_world(0);
 
         preempt_enable();
-
-        irq_exit();
 }
 
 /* /proc/profile writes can call this, don't __init it please. */