Changes in kernel/arch/sparc64/src/trap/sun4u/interrupt.c [da1bafb:d99c1d2] in mainline

File:

• kernel/arch/sparc64/src/trap/sun4u/interrupt.c (modified) (4 diffs)

kernel/arch/sparc64/src/trap/sun4u/interrupt.c

@@ -55 +55 @@
 void interrupt(int n, istate_t *istate)
 {
-        uint64_t status = asi_u64_read(ASI_INTR_DISPATCH_STATUS, 0);
+        uint64_t status;
+        uint64_t intrcv;
+        uint64_t data0;
+        status = asi_u64_read(ASI_INTR_DISPATCH_STATUS, 0);
         if (status & (!INTR_DISPATCH_STATUS_BUSY))
                 panic("Interrupt Dispatch Status busy bit not set\n");
-        
-        uint64_t intrcv = asi_u64_read(ASI_INTR_RECEIVE, 0);
+
+        intrcv = asi_u64_read(ASI_INTR_RECEIVE, 0);
 #if defined (US)
-        uint64_t data0 = asi_u64_read(ASI_INTR_R, ASI_UDB_INTR_R_DATA_0);
+        data0 = asi_u64_read(ASI_INTR_R, ASI_UDB_INTR_R_DATA_0);
 #elif defined (US3)
-        uint64_t data0 = asi_u64_read(ASI_INTR_R, VA_INTR_R_DATA_0);
+        data0 = asi_u64_read(ASI_INTR_R, VA_INTR_R_DATA_0);
 #endif
-        
+
         irq_t *irq = irq_dispatch_and_lock(data0);
         if (irq) {
@@ -72 +75 @@
                  */
                 irq->handler(irq);
-                
                 /*
                  * See if there is a clear-interrupt-routine and call it.
                  */
-                if (irq->cir)
+                if (irq->cir) {
                         irq->cir(irq->cir_arg, irq->inr);
-                
-                irq_spinlock_unlock(&irq->lock, false);
+                }
+                spinlock_unlock(&irq->lock);
         } else if (data0 > config.base) {
                 /*
@@ -88 +90 @@
                  */
 #ifdef CONFIG_SMP
-                if (data0 == (uintptr_t) tlb_shootdown_ipi_recv)
+                if (data0 == (uintptr_t) tlb_shootdown_ipi_recv) {
                         tlb_shootdown_ipi_recv();
+                }
 #endif
         } else {
@@ -98 +101 @@
                 printf("cpu%u: spurious interrupt (intrcv=%#" PRIx64
                     ", data0=%#" PRIx64 ")\n", CPU->id, intrcv, data0);
-#else
-                (void) intrcv;
 #endif
         }
-        
+
         membar();
         asi_u64_write(ASI_INTR_RECEIVE, 0, 0);