Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Wrap SMP IPIs with irq_enter()/irq_exit().
  [SPARC64]: Fix args to 64-bit sys_semctl() via sys_ipc().

2 files changed, 24 insertions, 7 deletions

diff --git a/arch/sparc64/kernel/smp.c b/arch/sparc64/kernel/smp.c
index 524b88920947..409dd71f2738 100644
--- a/arch/sparc64/kernel/smp.c
+++ b/arch/sparc64/kernel/smp.c
@@ -866,14 +866,21 @@ 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);
         }
 }
 
@@ -1032,7 +1039,9 @@ 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)
@@ -1040,6 +1049,8 @@ 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
@@ -1059,6 +1070,8 @@ 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)
@@ -1217,6 +1230,8 @@ void smp_penguin_jailcell(int irq, struct pt_regs *regs)
 {
         clear_softint(1 << irq);
 
+        irq_enter();
+
         preempt_disable();
 
         __asm__ __volatile__("flushw");
@@ -1229,6 +1244,8 @@ 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. */
diff --git a/arch/sparc64/kernel/sys_sparc.c b/arch/sparc64/kernel/sys_sparc.c
index 73ed01ba40dc..8d4761f15fa9 100644
--- a/arch/sparc64/kernel/sys_sparc.c
+++ b/arch/sparc64/kernel/sys_sparc.c
@@ -454,8 +454,8 @@ asmlinkage long sys_ipc(unsigned int call, int first, unsigned long second,
                         err = sys_semget(first, (int)second, (int)third);
                         goto out;
                 case SEMCTL: {
-                        err = sys_semctl(first, third,
-                                         (int)second | IPC_64,
+                        err = sys_semctl(first, second,
+                                         (int)third | IPC_64,
                                          (union semun) ptr);
                         goto out;
                 }