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]: Optimize fault kprobe handling just like powerpc.
  [SPARC]: Wire up utimensat syscall.
  [SPARC64]: Fix request_irq() ignored result warnings in PCI controller code.
  [SPARC64]: Kill asm-sparc64/pbm.h
  [ATYFB]: Fix sparc includes.
  [QLA2XXX]: Fix build on sparc.
  [SPARC64]: Removal of trivial pci_controller_info uses.
  [SPARC64]: Move index info pci_pbm_info.
  [SPARC64]: Move {setup,teardown}_msi_irq into pci_pbm_info.
  [SPARC64]: Move pci_ops into pci_pbm_info.
  [SPARC64] SBUS: Error interrupt registry cleanups.
  [SPARC64] PCI: Use root list of pbm's instead of pci_controller_info's
  [SPARC64] PCI: Kill PROM_PCIRNG_MAX and PROM_PCIIMAP_MAX.
  [SPARC64] PCI: Use common routine to fetch PBM properties.

1 files changed, 6 insertions, 6 deletions

diff --git a/arch/sparc64/kernel/sbus.c b/arch/sparc64/kernel/sbus.c
index 3b05428cc909..91f6e2a74ad5 100644
--- a/arch/sparc64/kernel/sbus.c
+++ b/arch/sparc64/kernel/sbus.c
@@ -1002,24 +1002,24 @@ static void __init sysio_register_error_handlers(struct sbus_bus *sbus)
         u64 control;
 
         irq = sbus_build_irq(sbus, SYSIO_UE_INO);
-        if (request_irq(irq, sysio_ue_handler,
-                        IRQF_SHARED, "SYSIO UE", sbus) < 0) {
+        if (request_irq(irq, sysio_ue_handler, 0,
+                        "SYSIO_UE", sbus) < 0) {
                 prom_printf("SYSIO[%x]: Cannot register UE interrupt.\n",
                             sbus->portid);
                 prom_halt();
         }
 
         irq = sbus_build_irq(sbus, SYSIO_CE_INO);
-        if (request_irq(irq, sysio_ce_handler,
-                        IRQF_SHARED, "SYSIO CE", sbus) < 0) {
+        if (request_irq(irq, sysio_ce_handler, 0,
+                        "SYSIO_CE", sbus) < 0) {
                 prom_printf("SYSIO[%x]: Cannot register CE interrupt.\n",
                             sbus->portid);
                 prom_halt();
         }
 
         irq = sbus_build_irq(sbus, SYSIO_SBUSERR_INO);
-        if (request_irq(irq, sysio_sbus_error_handler,
-                        IRQF_SHARED, "SYSIO SBUS Error", sbus) < 0) {
+        if (request_irq(irq, sysio_sbus_error_handler, 0,
+                        "SYSIO_SBERR", sbus) < 0) {
                 prom_printf("SYSIO[%x]: Cannot register SBUS Error interrupt.\n",
                             sbus->portid);
                 prom_halt();