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()

23 files changed, 25 insertions, 108 deletions

diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
index 05983a312d50..92923bf27233 100644
--- a/drivers/atm/fore200e.c
+++ b/drivers/atm/fore200e.c
@@ -167,13 +167,9 @@ fore200e_atm2fore_aal(int aal)
 static char*
 fore200e_irq_itoa(int irq)
 {
-#if defined(__sparc_v9__)
-    return __irq_itoa(irq);
-#else
     static char str[8];
     sprintf(str, "%d", irq);
     return str;
-#endif
 }
 
 
diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c
index 7cac6d05d723..f6686fcce809 100644
--- a/drivers/char/rtc.c
+++ b/drivers/char/rtc.c
@@ -960,10 +960,6 @@ found:
          * PCI Slot 2 INTA# (and some INTx# in Slot 1).
          */
         if (request_irq(rtc_irq, rtc_interrupt, SA_SHIRQ, "rtc", (void *)&rtc_port)) {
-                /*
-                 * Standard way for sparc to print irq's is to use
-                 * __irq_itoa(). I think for EBus it's ok to use %d.
-                 */
                 printk(KERN_ERR "rtc: cannot register IRQ %d\n", rtc_irq);
                 return -EIO;
         }
diff --git a/drivers/fc4/soc.c b/drivers/fc4/soc.c
index ec1f94738c59..cf8768b8d1f1 100644
--- a/drivers/fc4/soc.c
+++ b/drivers/fc4/soc.c
@@ -643,7 +643,7 @@ static inline void soc_init(struct sbus_dev *sdev, int no)
                 return;
         }
 
-        SOD(("SOC uses IRQ%s\n", __irq_itoa(irq)))
+        SOD(("SOC uses IRQ %d\n", irq))
         
         s->port[0].fc.irq = irq;
         s->port[1].fc.irq = irq;
diff --git a/drivers/fc4/socal.c b/drivers/fc4/socal.c
index 922e9613b2cf..f52d1e5bd5a5 100644
--- a/drivers/fc4/socal.c
+++ b/drivers/fc4/socal.c
@@ -767,7 +767,7 @@ static inline void socal_init(struct sbus_dev *sdev, int no)
                 return;
         }
 
-        SOD(("SOCAL uses IRQ %s\n", __irq_itoa(irq)))
+        SOD(("SOCAL uses IRQ %d\n", irq))
         
         s->port[0].fc.irq = irq;
         s->port[1].fc.irq = irq;
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 1b7b4c531bc2..9ebf8ae2a5e3 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -1138,16 +1138,11 @@ static int init_irq (ide_hwif_t *hwif)
                 spin_unlock_irq(&ide_lock);
         }
 
-#if !defined(__mc68000__) && !defined(CONFIG_APUS) && !defined(__sparc__)
+#if !defined(__mc68000__) && !defined(CONFIG_APUS)
         printk("%s at 0x%03lx-0x%03lx,0x%03lx on irq %d", hwif->name,
                 hwif->io_ports[IDE_DATA_OFFSET],
                 hwif->io_ports[IDE_DATA_OFFSET]+7,
                 hwif->io_ports[IDE_CONTROL_OFFSET], hwif->irq);
-#elif defined(__sparc__)
-        printk("%s at 0x%03lx-0x%03lx,0x%03lx on irq %s", hwif->name,
-                hwif->io_ports[IDE_DATA_OFFSET],
-                hwif->io_ports[IDE_DATA_OFFSET]+7,
-                hwif->io_ports[IDE_CONTROL_OFFSET], __irq_itoa(hwif->irq));
 #else
         printk("%s at 0x%08lx on irq %d", hwif->name,
                 hwif->io_ports[IDE_DATA_OFFSET], hwif->irq);
diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c
index 462ed3006c30..c11e3b2e67a6 100644
--- a/drivers/ide/setup-pci.c
+++ b/drivers/ide/setup-pci.c
@@ -694,13 +694,8 @@ static int do_ide_setup_pci_device(struct pci_dev *dev, ide_pci_device_t *d,
                                 goto out;
                 }
                 if (noisy)
-#ifdef __sparc__
-                        printk(KERN_INFO "%s: 100%% native mode on irq %s\n",
-                               d->name, __irq_itoa(pciirq));
-#else
                         printk(KERN_INFO "%s: 100%% native mode on irq %d\n",
                                 d->name, pciirq);
-#endif
         }
 
         /* FIXME: silent failure can happen */
diff --git a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c
index 11f13778f139..c031650a1c74 100644
--- a/drivers/ieee1394/ohci1394.c
+++ b/drivers/ieee1394/ohci1394.c
@@ -586,11 +586,7 @@ static void ohci_initialize(struct ti_ohci *ohci)
         reg_write(ohci, OHCI1394_HCControlSet, OHCI1394_HCControl_linkEnable);
 
         buf = reg_read(ohci, OHCI1394_Version);
-#ifndef __sparc__
         sprintf (irq_buf, "%d", ohci->dev->irq);
-#else
-        sprintf (irq_buf, "%s", __irq_itoa(ohci->dev->irq));
-#endif
         PRINT(KERN_INFO, "OHCI-1394 %d.%d (PCI): IRQ=[%s]  "
               "MMIO=[%lx-%lx]  Max Packet=[%d]  IR/IT contexts=[%d/%d]",
               ((((buf) >> 16) & 0xf) + (((buf) >> 20) & 0xf) * 10),
diff --git a/drivers/ieee1394/pcilynx.c b/drivers/ieee1394/pcilynx.c
index e2edc41e1b6f..e29dfd280bee 100644
--- a/drivers/ieee1394/pcilynx.c
+++ b/drivers/ieee1394/pcilynx.c
@@ -1252,11 +1252,7 @@ static int __devinit add_card(struct pci_dev *dev,
         /* Fix buggy cards with autoboot pin not tied low: */
         reg_write(lynx, DMA0_CHAN_CTRL, 0);
 
-#ifndef __sparc__
         sprintf (irq_buf, "%d", dev->irq);
-#else
-        sprintf (irq_buf, "%s", __irq_itoa(dev->irq));
-#endif
 
         if (!request_irq(dev->irq, lynx_irq_handler, SA_SHIRQ,
                          PCILYNX_DRIVER_NAME, lynx)) {
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index a30084076ac8..59690cbabfca 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -63,9 +63,6 @@
 #ifdef CONFIG_MTRR
 #include <asm/mtrr.h>
 #endif
-#ifdef __sparc__
-#include <asm/irq.h>                    /* needed for __irq_itoa() proto */
-#endif
 
 #include "mptbase.h"
 
@@ -1394,13 +1391,8 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
                 r = request_irq(pdev->irq, mpt_interrupt, SA_SHIRQ, ioc->name, ioc);
 
                 if (r < 0) {
-#ifndef __sparc__
                         printk(MYIOC_s_ERR_FMT "Unable to allocate interrupt %d!\n",
                                         ioc->name, pdev->irq);
-#else
-                        printk(MYIOC_s_ERR_FMT "Unable to allocate interrupt %s!\n",
-                                        ioc->name, __irq_itoa(pdev->irq));
-#endif
                         list_del(&ioc->list);
                         iounmap(mem);
                         kfree(ioc);
@@ -1412,11 +1404,7 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
                 pci_set_master(pdev);                   /* ?? */
                 pci_set_drvdata(pdev, ioc);
 
-#ifndef __sparc__
                 dprintk((KERN_INFO MYNAM ": %s installed at interrupt %d\n", ioc->name, pdev->irq));
-#else
-                dprintk((KERN_INFO MYNAM ": %s installed at interrupt %s\n", ioc->name, __irq_itoa(pdev->irq)));
-#endif
         }
 
         /* Check for "bound ports" (929, 929X, 1030, 1035) to reduce redundant resets.
@@ -5647,11 +5635,7 @@ mpt_print_ioc_summary(MPT_ADAPTER *ioc, char *buffer, int *size, int len, int sh
                         a[5], a[4], a[3], a[2], a[1], a[0]);
         }
 
-#ifndef __sparc__
         y += sprintf(buffer+len+y, ", IRQ=%d", ioc->pci_irq);
-#else
-        y += sprintf(buffer+len+y, ", IRQ=%s", __irq_itoa(ioc->pci_irq));
-#endif
 
         if (!ioc->active)
                 y += sprintf(buffer+len+y, " (disabled)");
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c
index 274b0138d442..e27778926eba 100644
--- a/drivers/net/3c59x.c
+++ b/drivers/net/3c59x.c
@@ -1382,17 +1382,12 @@ static int __devinit vortex_probe1(struct device *gendev,
         for (i = 0; i < 6; i++)
                 iowrite8(dev->dev_addr[i], ioaddr + i);
 
-#ifdef __sparc__
-        if (print_info)
-                printk(", IRQ %s\n", __irq_itoa(dev->irq));
-#else
         if (print_info)
                 printk(", IRQ %d\n", dev->irq);
         /* Tell them about an invalid IRQ. */
         if (dev->irq <= 0 || dev->irq >= NR_IRQS)
                 printk(KERN_WARNING " *** Warning: IRQ %d is unlikely to work! ***\n",
                            dev->irq);
-#endif
 
         EL3WINDOW(4);
         step = (ioread8(ioaddr + Wn4_NetDiag) & 0x1e) >> 1;
diff --git a/drivers/net/acenic.c b/drivers/net/acenic.c
index b508812e97ac..23ff22ba5d31 100644
--- a/drivers/net/acenic.c
+++ b/drivers/net/acenic.c
@@ -579,11 +579,7 @@ static int __devinit acenic_probe_one(struct pci_dev *pdev,
         }
 
         printk("Gigabit Ethernet at 0x%08lx, ", dev->base_addr);
-#ifdef __sparc__
-        printk("irq %s\n", __irq_itoa(pdev->irq));
-#else
-        printk("irq %i\n", pdev->irq);
-#endif
+        printk("irq %d\n", pdev->irq);
 
 #ifdef CONFIG_ACENIC_OMIT_TIGON_I
         if ((readl(&ap->regs->HostCtrl) >> 28) == 4) {
diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c
index 9f046cae2f71..bd5d2668a362 100644
--- a/drivers/net/sunhme.c
+++ b/drivers/net/sunhme.c
@@ -2221,13 +2221,8 @@ static int happy_meal_open(struct net_device *dev)
                 if (request_irq(dev->irq, &happy_meal_interrupt,
                                 SA_SHIRQ, dev->name, (void *)dev)) {
                         HMD(("EAGAIN\n"));
-#ifdef __sparc__
-                        printk(KERN_ERR "happy_meal(SBUS): Can't order irq %s to go.\n",
-                               __irq_itoa(dev->irq));
-#else
                         printk(KERN_ERR "happy_meal(SBUS): Can't order irq %d to go.\n",
                                dev->irq);
-#endif
 
                         return -EAGAIN;
                 }
diff --git a/drivers/net/sunlance.c b/drivers/net/sunlance.c
index b7d87d4690b4..6381243d8d00 100644
--- a/drivers/net/sunlance.c
+++ b/drivers/net/sunlance.c
@@ -936,7 +936,7 @@ static int lance_open(struct net_device *dev)
 
         if (request_irq(dev->irq, &lance_interrupt, SA_SHIRQ,
                         lancestr, (void *) dev)) {
-                printk(KERN_ERR "Lance: Can't get irq %s\n", __irq_itoa(dev->irq));
+                printk(KERN_ERR "Lance: Can't get irq %d\n", dev->irq);
                 return -EAGAIN;
         }
 
diff --git a/drivers/sbus/char/cpwatchdog.c b/drivers/sbus/char/cpwatchdog.c
index fd2cc7782f76..5bf3dd901b65 100644
--- a/drivers/sbus/char/cpwatchdog.c
+++ b/drivers/sbus/char/cpwatchdog.c
@@ -304,8 +304,8 @@ static int wd_open(struct inode *inode, struct file *f)
                                                 SA_SHIRQ,
                                                 WD_OBPNAME,
                                                 (void *)wd_dev.regs)) {
-                        printk("%s: Cannot register IRQ %s\n", 
-                                WD_OBPNAME, __irq_itoa(wd_dev.irq));
+                        printk("%s: Cannot register IRQ %d\n", 
+                                WD_OBPNAME, wd_dev.irq);
                         return(-EBUSY);
                 }
                 wd_dev.initialized = 1;
diff --git a/drivers/sbus/char/uctrl.c b/drivers/sbus/char/uctrl.c
index e2d9a7c85427..575b1f7ed410 100644
--- a/drivers/sbus/char/uctrl.c
+++ b/drivers/sbus/char/uctrl.c
@@ -400,7 +400,7 @@ static int __init ts102_uctrl_init(void)
         }
 
         driver->regs->uctrl_intr = UCTRL_INTR_RXNE_REQ|UCTRL_INTR_RXNE_MSK;
-        printk("uctrl: 0x%x (irq %s)\n", driver->regs, __irq_itoa(driver->irq));
+        printk("uctrl: 0x%x (irq %d)\n", driver->regs, driver->irq);
         uctrl_get_event_status();
         uctrl_get_external_status();
         return 0;
diff --git a/drivers/scsi/esp.c b/drivers/scsi/esp.c
index 87a8c3d2072c..0a3e45d7a972 100644
--- a/drivers/scsi/esp.c
+++ b/drivers/scsi/esp.c
@@ -821,8 +821,8 @@ static int __init esp_register_irq(struct esp *esp)
                 return -1;
         }
 
-        printk("esp%d: IRQ %s ", esp->esp_id,
-               __irq_itoa(esp->ehost->irq));
+        printk("esp%d: IRQ %d ", esp->esp_id,
+               esp->ehost->irq);
 
         return 0;
 }
diff --git a/drivers/scsi/qlogicpti.c b/drivers/scsi/qlogicpti.c
index c7e78dcf09df..7c27ecc6fb5d 100644
--- a/drivers/scsi/qlogicpti.c
+++ b/drivers/scsi/qlogicpti.c
@@ -725,7 +725,7 @@ static int __init qpti_register_irq(struct qlogicpti *qpti)
                         SA_SHIRQ, "Qlogic/PTI", qpti))
                 goto fail;
 
-        printk("qpti%d: IRQ %s ", qpti->qpti_id, __irq_itoa(qpti->irq));
+        printk("qpti%d: IRQ %d ", qpti->qpti_id, qpti->irq);
 
         return 0;
 
@@ -988,8 +988,8 @@ const char *qlogicpti_info(struct Scsi_Host *host)
         static char buf[80];
         struct qlogicpti *qpti = (struct qlogicpti *) host->hostdata;
 
-        sprintf(buf, "PTI Qlogic,ISP SBUS SCSI irq %s regs at %p",
-                __irq_itoa(qpti->qhost->irq), qpti->qregs);
+        sprintf(buf, "PTI Qlogic,ISP SBUS SCSI irq %d regs at %p",
+                qpti->qhost->irq, qpti->qregs);
         return buf;
 }
 
diff --git a/drivers/scsi/sym53c8xx_2/sym_glue.c b/drivers/scsi/sym53c8xx_2/sym_glue.c
index 9c83b4d39a26..7677fba2ceb5 100644
--- a/drivers/scsi/sym53c8xx_2/sym_glue.c
+++ b/drivers/scsi/sym53c8xx_2/sym_glue.c
@@ -54,14 +54,8 @@
 #define NAME53C         "sym53c"
 #define NAME53C8XX      "sym53c8xx"
 
-/* SPARC just has to be different ... */
-#ifdef __sparc__
-#define IRQ_FMT "%s"
-#define IRQ_PRM(x) __irq_itoa(x)
-#else
 #define IRQ_FMT "%d"
 #define IRQ_PRM(x) (x)
-#endif
 
 struct sym_driver_setup sym_driver_setup = SYM_LINUX_DRIVER_SETUP;
 unsigned int sym_debug_flags = 0;
diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c
index 2b4f96541b8e..4cdb610cdd37 100644
--- a/drivers/serial/sunsu.c
+++ b/drivers/serial/sunsu.c
@@ -1295,9 +1295,9 @@ static int __init sunsu_kbd_ms_init(struct uart_sunsu_port *up, int channel)
         if (up->port.type == PORT_UNKNOWN)
                 return -1;
 
-        printk(KERN_INFO "su%d at 0x%p (irq = %s) is a %s\n",
+        printk(KERN_INFO "su%d at 0x%p (irq = %d) is a %s\n",
                channel,
-               up->port.membase, __irq_itoa(up->port.irq),
+               up->port.membase, up->port.irq,
                sunsu_type(&up->port));
 
 #ifdef CONFIG_SERIO
diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c
index cd49ebbf4a45..5b6569728a9c 100644
--- a/drivers/serial/sunzilog.c
+++ b/drivers/serial/sunzilog.c
@@ -1540,8 +1540,8 @@ static void __init sunzilog_init_kbdms(struct uart_sunzilog_port *up, int channe
                 up->cflag = B4800 | CS8 | CLOCAL | CREAD;
                 baud = 4800;
         }
-        printk(KERN_INFO "zs%d at 0x%p (irq = %s) is a SunZilog\n",
-               channel, up->port.membase, __irq_itoa(zilog_irq));
+        printk(KERN_INFO "zs%d at 0x%p (irq = %d) is a SunZilog\n",
+               channel, up->port.membase, zilog_irq);
 
         up->curregs[R15] = BRKIE;
         brg = BPS_TO_BRG(baud, ZS_CLOCK / ZS_CLOCK_DIVISOR);
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index e2e00ba4e1e6..4bf914d00a14 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -1826,24 +1826,16 @@ int usb_add_hcd(struct usb_hcd *hcd,
 
         /* enable irqs just before we start the controller */
         if (hcd->driver->irq) {
-                char    buf[8], *bufp = buf;
-
-#ifdef __sparc__
-                bufp = __irq_itoa(irqnum);
-#else
-                sprintf(buf, "%d", irqnum);
-#endif
-
                 snprintf(hcd->irq_descr, sizeof(hcd->irq_descr), "%s:usb%d",
                                 hcd->driver->description, hcd->self.busnum);
                 if ((retval = request_irq(irqnum, &usb_hcd_irq, irqflags,
                                 hcd->irq_descr, hcd)) != 0) {
                         dev_err(hcd->self.controller,
-                                        "request interrupt %s failed\n", bufp);
+                                        "request interrupt %d failed\n", irqnum);
                         goto err_request_irq;
                 }
                 hcd->irq = irqnum;
-                dev_info(hcd->self.controller, "irq %s, %s 0x%08llx\n", bufp,
+                dev_info(hcd->self.controller, "irq %d, %s 0x%08llx\n", irqnum,
                                 (hcd->driver->flags & HCD_MEMORY) ?
                                         "io mem" : "io base",
                                         (unsigned long long)hcd->rsrc_start);
diff --git a/drivers/usb/gadget/goku_udc.c b/drivers/usb/gadget/goku_udc.c
index 66b81bbf6bee..5378c1757292 100644
--- a/drivers/usb/gadget/goku_udc.c
+++ b/drivers/usb/gadget/goku_udc.c
@@ -1850,7 +1850,6 @@ static int goku_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         unsigned long           resource, len;
         void __iomem            *base = NULL;
         int                     retval;
-        char                    buf [8], *bufp;
 
         /* if you want to support more than one controller in a system,
          * usb_gadget_driver_{register,unregister}() must change.
@@ -1913,20 +1912,14 @@ static int goku_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         pci_set_drvdata(pdev, dev);
         INFO(dev, "%s\n", driver_desc);
         INFO(dev, "version: " DRIVER_VERSION " %s\n", dmastr());
-#ifndef __sparc__
-        scnprintf(buf, sizeof buf, "%d", pdev->irq);
-        bufp = buf;
-#else
-        bufp = __irq_itoa(pdev->irq);
-#endif
-        INFO(dev, "irq %s, pci mem %p\n", bufp, base);
+        INFO(dev, "irq %d, pci mem %p\n", pdev->irq, base);
 
         /* init to known state, then setup irqs */
         udc_reset(dev);
         udc_reinit (dev);
         if (request_irq(pdev->irq, goku_irq, SA_SHIRQ/*|SA_SAMPLE_RANDOM*/,
                         driver_name, dev) != 0) {
-                DBG(dev, "request interrupt %s failed\n", bufp);
+                DBG(dev, "request interrupt %d failed\n", pdev->irq);
                 retval = -EBUSY;
                 goto done;
         }
diff --git a/drivers/usb/gadget/net2280.c b/drivers/usb/gadget/net2280.c
index 0b9293493957..020d3c42b1af 100644
--- a/drivers/usb/gadget/net2280.c
+++ b/drivers/usb/gadget/net2280.c
@@ -2822,7 +2822,6 @@ static int net2280_probe (struct pci_dev *pdev, const struct pci_device_id *id)
         unsigned long           resource, len;
         void                    __iomem *base = NULL;
         int                     retval, i;
-        char                    buf [8], *bufp;
 
         /* if you want to support more than one controller in a system,
          * usb_gadget_driver_{register,unregister}() must change.
@@ -2896,15 +2895,10 @@ static int net2280_probe (struct pci_dev *pdev, const struct pci_device_id *id)
                 retval = -ENODEV;
                 goto done;
         }
-#ifndef __sparc__
-        scnprintf (buf, sizeof buf, "%d", pdev->irq);
-        bufp = buf;
-#else
-        bufp = __irq_itoa(pdev->irq);
-#endif
+
         if (request_irq (pdev->irq, net2280_irq, SA_SHIRQ, driver_name, dev)
                         != 0) {
-                ERROR (dev, "request interrupt %s failed\n", bufp);
+                ERROR (dev, "request interrupt %d failed\n", pdev->irq);
                 retval = -EBUSY;
                 goto done;
         }
@@ -2953,8 +2947,8 @@ static int net2280_probe (struct pci_dev *pdev, const struct pci_device_id *id)
 
         /* done */
         INFO (dev, "%s\n", driver_desc);
-        INFO (dev, "irq %s, pci mem %p, chip rev %04x\n",
-                        bufp, base, dev->chiprev);
+        INFO (dev, "irq %d, pci mem %p, chip rev %04x\n",
+                        pdev->irq, base, dev->chiprev);
         INFO (dev, "version: " DRIVER_VERSION "; dma %s\n",
                         use_dma
                                 ? (use_dma_chaining ? "chaining" : "enabled")