[SPARC64]: Fix type and constant sizes wrt. sun4u IMAP/ICLR handling.

Sometimes we were using 32-bit values and the top bits were
getting inadvertantly chopped off.  This will matter for the
forthcoming Fire controller MSI support.

Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 12 insertions, 12 deletions

diff --git a/arch/sparc64/kernel/irq.c b/arch/sparc64/kernel/irq.c
index 384abf410cf0..51b8875a13a8 100644
--- a/arch/sparc64/kernel/irq.c
+++ b/arch/sparc64/kernel/irq.c
@@ -308,7 +308,7 @@ static void sun4u_irq_disable(unsigned int virt_irq)
 
         if (likely(data)) {
                 unsigned long imap = data->imap;
-                u32 tmp = upa_readq(imap);
+                unsigned long tmp = upa_readq(imap);
 
                 tmp &= ~IMAP_VALID;
                 upa_writeq(tmp, imap);
diff --git a/include/asm-sparc64/irq.h b/include/asm-sparc64/irq.h
index e6c436ef9356..c041e10ae7df 100644
--- a/include/asm-sparc64/irq.h
+++ b/include/asm-sparc64/irq.h
@@ -16,21 +16,21 @@
 #include <asm/ptrace.h>
 
 /* IMAP/ICLR register defines */
-#define IMAP_VALID              0x80000000      /* IRQ Enabled          */
-#define IMAP_TID_UPA            0x7c000000      /* UPA TargetID         */
-#define IMAP_TID_JBUS           0x7c000000      /* JBUS TargetID        */
+#define IMAP_VALID              0x80000000UL    /* IRQ Enabled          */
+#define IMAP_TID_UPA            0x7c000000UL    /* UPA TargetID         */
+#define IMAP_TID_JBUS           0x7c000000UL    /* JBUS TargetID        */
 #define IMAP_TID_SHIFT          26
-#define IMAP_AID_SAFARI         0x7c000000      /* Safari AgentID       */
+#define IMAP_AID_SAFARI         0x7c000000UL    /* Safari AgentID       */
 #define IMAP_AID_SHIFT          26
-#define IMAP_NID_SAFARI         0x03e00000      /* Safari NodeID        */
+#define IMAP_NID_SAFARI         0x03e00000UL    /* Safari NodeID        */
 #define IMAP_NID_SHIFT          21
-#define IMAP_IGN                0x000007c0      /* IRQ Group Number     */
-#define IMAP_INO                0x0000003f      /* IRQ Number           */
-#define IMAP_INR                0x000007ff      /* Full interrupt number*/
+#define IMAP_IGN                0x000007c0UL    /* IRQ Group Number     */
+#define IMAP_INO                0x0000003fUL    /* IRQ Number           */
+#define IMAP_INR                0x000007ffUL    /* Full interrupt number*/
 
-#define ICLR_IDLE               0x00000000      /* Idle state           */
-#define ICLR_TRANSMIT           0x00000001      /* Transmit state       */
-#define ICLR_PENDING            0x00000003      /* Pending state        */
+#define ICLR_IDLE               0x00000000UL    /* Idle state           */
+#define ICLR_TRANSMIT           0x00000001UL    /* Transmit state       */
+#define ICLR_PENDING            0x00000003UL    /* Pending state        */
 
 /* The largest number of unique interrupt sources we support.
  * If this needs to ever be larger than 255, you need to change