1 files changed, 7 insertions, 7 deletions

diff --git a/arch/sparc64/kernel/entry.S b/arch/sparc64/kernel/entry.S
index 8059531bf0a..c9b0d7af64a 100644
--- a/arch/sparc64/kernel/entry.S
+++ b/arch/sparc64/kernel/entry.S
@@ -429,16 +429,16 @@ do_ivec:
         stxa            %g0, [%g0] ASI_INTR_RECEIVE
         membar          #Sync
 
-        sethi           %hi(ivector_table), %g2
-        sllx            %g3, 3, %g3
-        or              %g2, %lo(ivector_table), %g2
+        sethi           %hi(ivector_table_pa), %g2
+        ldx             [%g2 + %lo(ivector_table_pa)], %g2
+        sllx            %g3, 4, %g3
         add             %g2, %g3, %g3
 
-        TRAP_LOAD_IRQ_WORK(%g6, %g1)
+        TRAP_LOAD_IRQ_WORK_PA(%g6, %g1)
 
-        lduw            [%g6], %g5              /* g5 = irq_work(cpu) */
-        stw             %g5, [%g3 + 0x00]       /* bucket->irq_chain = g5 */
-        stw             %g3, [%g6]              /* irq_work(cpu) = bucket */
+        ldx             [%g6], %g5
+        stxa            %g5, [%g3] ASI_PHYS_USE_EC
+        stx             %g3, [%g6]
         wr              %g0, 1 << PIL_DEVICE_IRQ, %set_softint
         retry
 do_ivec_xcall: