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

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Update defconfig.
  [SPARC64]: Don't double-export synchronize_irq.
  [SPARC64]: Move over to GENERIC_HARDIRQS.
  [SPARC64]: Virtualize IRQ numbers.
  [SPARC64]: Kill ino_bucket->pil
  [SPARC]: Kill __irq_itoa().
  [SPARC64]: bp->pil can never be zero
  [SPARC64]: Send all device interrupts via one PIL.
  [SPARC]: Fix iommu_flush_iotlb end address
  [SPARC]: Mark smp init functions as cpuinit
  [SPARC]: Add missing rw can_lock macros
  [SPARC]: Setup cpu_possible_map
  [SPARC]: Add topology_init()

1 files changed, 5 insertions, 10 deletions

diff --git a/arch/sparc64/kernel/sun4v_ivec.S b/arch/sparc64/kernel/sun4v_ivec.S
index b49a68bdda43..49703c3c5769 100644
--- a/arch/sparc64/kernel/sun4v_ivec.S
+++ b/arch/sparc64/kernel/sun4v_ivec.S
@@ -5,6 +5,7 @@
 
 #include <asm/cpudata.h>
 #include <asm/intr_queue.h>
+#include <asm/pil.h>
 
         .text
         .align  32
@@ -102,23 +103,17 @@ sun4v_dev_mondo:
 
         /* Get &ivector_table[IVEC] into %g4.  */
         sethi   %hi(ivector_table), %g4
-        sllx    %g3, 5, %g3
+        sllx    %g3, 3, %g3
         or      %g4, %lo(ivector_table), %g4
         add     %g4, %g3, %g4
 
-        /* Load IRQ %pil into %g5.  */
-        ldub    [%g4 + 0x04], %g5
-
         /* Insert ivector_table[] entry into __irq_work[] queue.  */
-        sllx    %g5, 2, %g3
-        lduw    [%g1 + %g3], %g2        /* g2 = irq_work(cpu, pil) */
+        lduw    [%g1], %g2              /* g2 = irq_work(cpu) */
         stw     %g2, [%g4 + 0x00]       /* bucket->irq_chain = g2 */
-        stw     %g4, [%g1 + %g3]        /* irq_work(cpu, pil) = bucket */
+        stw     %g4, [%g1]              /* irq_work(cpu) = bucket */
 
         /* Signal the interrupt by setting (1 << pil) in %softint.  */
-        mov     1, %g2
-        sllx    %g2, %g5, %g2
-        wr      %g2, 0x0, %set_softint
+        wr      %g0, 1 << PIL_DEVICE_IRQ, %set_softint
 
 sun4v_dev_mondo_queue_empty:
         retry