10 files changed, 53 insertions, 141 deletions

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index ca5580e4d81..1666de84d47 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -29,6 +29,7 @@ config SPARC
         select GENERIC_IRQ_SHOW
         select USE_GENERIC_SMP_HELPERS if SMP
         select GENERIC_PCI_IOMAP
+        select HAVE_NMI_WATCHDOG if SPARC64
 
 config SPARC32
         def_bool !64BIT
diff --git a/arch/sparc/include/asm/irq_64.h b/arch/sparc/include/asm/irq_64.h
index 16dcae6d56e..abf6afe82ca 100644
--- a/arch/sparc/include/asm/irq_64.h
+++ b/arch/sparc/include/asm/irq_64.h
@@ -95,7 +95,6 @@ void arch_trigger_all_cpu_backtrace(void);
 extern void *hardirq_stack[NR_CPUS];
 extern void *softirq_stack[NR_CPUS];
 #define __ARCH_HAS_DO_SOFTIRQ
-#define ARCH_HAS_NMI_WATCHDOG
 
 #define NO_IRQ          0xffffffff
 
diff --git a/arch/sparc/include/asm/pci_32.h b/arch/sparc/include/asm/pci_32.h
index 6de7f7bf956..dc503297481 100644
--- a/arch/sparc/include/asm/pci_32.h
+++ b/arch/sparc/include/asm/pci_32.h
@@ -52,14 +52,6 @@ static inline void pci_dma_burst_advice(struct pci_dev *pdev,
  * 64Kbytes by the Host controller.
  */
 
-extern void
-pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region,
-                        struct resource *res);
-
-extern void
-pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,
-                        struct pci_bus_region *region);
-
 static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
 {
         return PCI_IRQ_NONE;
diff --git a/arch/sparc/include/asm/pci_64.h b/arch/sparc/include/asm/pci_64.h
index 755a4bb6bcd..1633b718d3b 100644
--- a/arch/sparc/include/asm/pci_64.h
+++ b/arch/sparc/include/asm/pci_64.h
@@ -73,14 +73,6 @@ extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
                                enum pci_mmap_state mmap_state,
                                int write_combine);
 
-extern void
-pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region,
-                        struct resource *res);
-
-extern void
-pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,
-                        struct pci_bus_region *region);
-
 static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
 {
         return PCI_IRQ_NONE;
diff --git a/arch/sparc/include/asm/vga.h b/arch/sparc/include/asm/vga.h
index c69d5b2ba19..ec0e9967d93 100644
--- a/arch/sparc/include/asm/vga.h
+++ b/arch/sparc/include/asm/vga.h
@@ -7,6 +7,7 @@
 #ifndef _LINUX_ASM_VGA_H_
 #define _LINUX_ASM_VGA_H_
 
+#include <linux/bug.h>
 #include <asm/types.h>
 
 #define VT_BUF_HAVE_RW
diff --git a/arch/sparc/include/asm/vio.h b/arch/sparc/include/asm/vio.h
index 9d83d3bcb49..432afa83886 100644
--- a/arch/sparc/include/asm/vio.h
+++ b/arch/sparc/include/asm/vio.h
@@ -284,6 +284,7 @@ struct vio_dev {
 };
 
 struct vio_driver {
+        const char                      *name;
         struct list_head                node;
         const struct vio_device_id      *id_table;
         int (*probe)(struct vio_dev *dev, const struct vio_device_id *id);
@@ -371,7 +372,13 @@ do {	if (vio->debug & VIO_DEBUG_##TYPE) \
                        vio->vdev->channel_id, ## a); \
 } while (0)
 
-extern int vio_register_driver(struct vio_driver *drv);
+extern int __vio_register_driver(struct vio_driver *drv, struct module *owner,
+                                 const char *mod_name);
+/*
+ * vio_register_driver must be a macro so that KBUILD_MODNAME can be expanded
+ */
+#define vio_register_driver(driver)             \
+        __vio_register_driver(driver, THIS_MODULE, KBUILD_MODNAME)
 extern void vio_unregister_driver(struct vio_driver *drv);
 
 static inline struct vio_driver *to_vio_driver(struct device_driver *drv)
diff --git a/arch/sparc/kernel/ds.c b/arch/sparc/kernel/ds.c
index 381edcd5bc2..fea13c7b1ae 100644
--- a/arch/sparc/kernel/ds.c
+++ b/arch/sparc/kernel/ds.c
@@ -1244,10 +1244,7 @@ static struct vio_driver ds_driver = {
         .id_table       = ds_match,
         .probe          = ds_probe,
         .remove         = ds_remove,
-        .driver         = {
-                .name   = "ds",
-                .owner  = THIS_MODULE,
-        }
+        .name           = "ds",
 };
 
 static int __init ds_init(void)
diff --git a/arch/sparc/kernel/leon_pci.c b/arch/sparc/kernel/leon_pci.c
index c7bec25fdb1..aba6b958b2a 100644
--- a/arch/sparc/kernel/leon_pci.c
+++ b/arch/sparc/kernel/leon_pci.c
@@ -15,14 +15,19 @@
 
 /* The LEON architecture does not rely on a BIOS or bootloader to setup
  * PCI for us. The Linux generic routines are used to setup resources,
- * reset values of confuration-space registers settings ae preseved.
+ * reset values of configuration-space register settings are preserved.
+ *
+ * PCI Memory and Prefetchable Memory is direct-mapped. However I/O Space is
+ * accessed through a Window which is translated to low 64KB in PCI space, the
+ * first 4KB is not used so 60KB is available.
  */
 void leon_pci_init(struct platform_device *ofdev, struct leon_pci_info *info)
 {
         LIST_HEAD(resources);
         struct pci_bus *root_bus;
 
-        pci_add_resource(&resources, &info->io_space);
+        pci_add_resource_offset(&resources, &info->io_space,
+                                info->io_space.start - 0x1000);
         pci_add_resource(&resources, &info->mem_space);
 
         root_bus = pci_scan_root_bus(&ofdev->dev, 0, info->ops, info,
@@ -38,44 +43,6 @@ void leon_pci_init(struct platform_device *ofdev, struct leon_pci_info *info)
         }
 }
 
-/* PCI Memory and Prefetchable Memory is direct-mapped. However I/O Space is
- * accessed through a Window which is translated to low 64KB in PCI space, the
- * first 4KB is not used so 60KB is available.
- *
- * This function is used by generic code to translate resource addresses into
- * PCI addresses.
- */
-void pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region,
-                             struct resource *res)
-{
-        struct leon_pci_info *info = dev->bus->sysdata;
-
-        region->start = res->start;
-        region->end = res->end;
-
-        if (res->flags & IORESOURCE_IO) {
-                region->start -= (info->io_space.start - 0x1000);
-                region->end -= (info->io_space.start - 0x1000);
-        }
-}
-EXPORT_SYMBOL(pcibios_resource_to_bus);
-
-/* see pcibios_resource_to_bus() comment */
-void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,
-                             struct pci_bus_region *region)
-{
-        struct leon_pci_info *info = dev->bus->sysdata;
-
-        res->start = region->start;
-        res->end = region->end;
-
-        if (res->flags & IORESOURCE_IO) {
-                res->start += (info->io_space.start - 0x1000);
-                res->end += (info->io_space.start - 0x1000);
-        }
-}
-EXPORT_SYMBOL(pcibios_bus_to_resource);
-
 void __devinit pcibios_fixup_bus(struct pci_bus *pbus)
 {
         struct leon_pci_info *info = pbus->sysdata;
diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c
index bb8bc2e519a..fdaf2181167 100644
--- a/arch/sparc/kernel/pci.c
+++ b/arch/sparc/kernel/pci.c
@@ -375,13 +375,6 @@ static void __devinit apb_calc_first_last(u8 map, u32 *first_p, u32 *last_p)
         *last_p = last;
 }
 
-static void pci_resource_adjust(struct resource *res,
-                                struct resource *root)
-{
-        res->start += root->start;
-        res->end += root->start;
-}
-
 /* For PCI bus devices which lack a 'ranges' property we interrogate
  * the config space values to set the resources, just like the generic
  * Linux PCI probing code does.
@@ -390,7 +383,8 @@ static void __devinit pci_cfg_fake_ranges(struct pci_dev *dev,
                                           struct pci_bus *bus,
                                           struct pci_pbm_info *pbm)
 {
-        struct resource *res;
+        struct pci_bus_region region;
+        struct resource *res, res2;
         u8 io_base_lo, io_limit_lo;
         u16 mem_base_lo, mem_limit_lo;
         unsigned long base, limit;
@@ -412,11 +406,14 @@ static void __devinit pci_cfg_fake_ranges(struct pci_dev *dev,
         res = bus->resource[0];
         if (base <= limit) {
                 res->flags = (io_base_lo & PCI_IO_RANGE_TYPE_MASK) | IORESOURCE_IO;
+                res2.flags = res->flags;
+                region.start = base;
+                region.end = limit + 0xfff;
+                pcibios_bus_to_resource(dev, &res2, &region);
                 if (!res->start)
-                        res->start = base;
+                        res->start = res2.start;
                 if (!res->end)
-                        res->end = limit + 0xfff;
-                pci_resource_adjust(res, &pbm->io_space);
+                        res->end = res2.end;
         }
 
         pci_read_config_word(dev, PCI_MEMORY_BASE, &mem_base_lo);
@@ -428,9 +425,9 @@ static void __devinit pci_cfg_fake_ranges(struct pci_dev *dev,
         if (base <= limit) {
                 res->flags = ((mem_base_lo & PCI_MEMORY_RANGE_TYPE_MASK) |
                               IORESOURCE_MEM);
-                res->start = base;
-                res->end = limit + 0xfffff;
-                pci_resource_adjust(res, &pbm->mem_space);
+                region.start = base;
+                region.end = limit + 0xfffff;
+                pcibios_bus_to_resource(dev, res, &region);
         }
 
         pci_read_config_word(dev, PCI_PREF_MEMORY_BASE, &mem_base_lo);
@@ -459,9 +456,9 @@ static void __devinit pci_cfg_fake_ranges(struct pci_dev *dev,
         if (base <= limit) {
                 res->flags = ((mem_base_lo & PCI_MEMORY_RANGE_TYPE_MASK) |
                               IORESOURCE_MEM | IORESOURCE_PREFETCH);
-                res->start = base;
-                res->end = limit + 0xfffff;
-                pci_resource_adjust(res, &pbm->mem_space);
+                region.start = base;
+                region.end = limit + 0xfffff;
+                pcibios_bus_to_resource(dev, res, &region);
         }
 }
 
@@ -472,6 +469,7 @@ static void __devinit apb_fake_ranges(struct pci_dev *dev,
                                       struct pci_bus *bus,
                                       struct pci_pbm_info *pbm)
 {
+        struct pci_bus_region region;
         struct resource *res;
         u32 first, last;
         u8 map;
@@ -479,18 +477,18 @@ static void __devinit apb_fake_ranges(struct pci_dev *dev,
         pci_read_config_byte(dev, APB_IO_ADDRESS_MAP, &map);
         apb_calc_first_last(map, &first, &last);
         res = bus->resource[0];
-        res->start = (first << 21);
-        res->end = (last << 21) + ((1 << 21) - 1);
         res->flags = IORESOURCE_IO;
-        pci_resource_adjust(res, &pbm->io_space);
+        region.start = (first << 21);
+        region.end = (last << 21) + ((1 << 21) - 1);
+        pcibios_bus_to_resource(dev, res, &region);
 
         pci_read_config_byte(dev, APB_MEM_ADDRESS_MAP, &map);
         apb_calc_first_last(map, &first, &last);
         res = bus->resource[1];
-        res->start = (first << 21);
-        res->end = (last << 21) + ((1 << 21) - 1);
         res->flags = IORESOURCE_MEM;
-        pci_resource_adjust(res, &pbm->mem_space);
+        region.start = (first << 21);
+        region.end = (last << 21) + ((1 << 21) - 1);
+        pcibios_bus_to_resource(dev, res, &region);
 }
 
 static void __devinit pci_of_scan_bus(struct pci_pbm_info *pbm,
@@ -506,6 +504,7 @@ static void __devinit of_scan_pci_bridge(struct pci_pbm_info *pbm,
         struct pci_bus *bus;
         const u32 *busrange, *ranges;
         int len, i, simba;
+        struct pci_bus_region region;
         struct resource *res;
         unsigned int flags;
         u64 size;
@@ -556,8 +555,6 @@ static void __devinit of_scan_pci_bridge(struct pci_pbm_info *pbm,
         }
         i = 1;
         for (; len >= 32; len -= 32, ranges += 8) {
-                struct resource *root;
-
                 flags = pci_parse_of_flags(ranges[0]);
                 size = GET_64BIT(ranges, 6);
                 if (flags == 0 || size == 0)
@@ -569,7 +566,6 @@ static void __devinit of_scan_pci_bridge(struct pci_pbm_info *pbm,
                                        " for bridge %s\n", node->full_name);
                                 continue;
                         }
-                        root = &pbm->io_space;
                 } else {
                         if (i >= PCI_NUM_RESOURCES - PCI_BRIDGE_RESOURCES) {
                                 printk(KERN_ERR "PCI: too many memory ranges"
@@ -578,18 +574,12 @@ static void __devinit of_scan_pci_bridge(struct pci_pbm_info *pbm,
                         }
                         res = bus->resource[i];
                         ++i;
-                        root = &pbm->mem_space;
                 }
 
-                res->start = GET_64BIT(ranges, 1);
-                res->end = res->start + size - 1;
                 res->flags = flags;
-
-                /* Another way to implement this would be to add an of_device
-                 * layer routine that can calculate a resource for a given
-                 * range property value in a PCI device.
-                 */
-                pci_resource_adjust(res, root);
+                region.start = GET_64BIT(ranges, 1);
+                region.end = region.start + size - 1;
+                pcibios_bus_to_resource(dev, res, &region);
         }
 after_ranges:
         sprintf(bus->name, "PCI Bus %04x:%02x", pci_domain_nr(bus),
@@ -691,8 +681,10 @@ struct pci_bus * __devinit pci_scan_one_pbm(struct pci_pbm_info *pbm,
 
         printk("PCI: Scanning PBM %s\n", node->full_name);
 
-        pci_add_resource(&resources, &pbm->io_space);
-        pci_add_resource(&resources, &pbm->mem_space);
+        pci_add_resource_offset(&resources, &pbm->io_space,
+                                pbm->io_space.start);
+        pci_add_resource_offset(&resources, &pbm->mem_space,
+                                pbm->mem_space.start);
         bus = pci_create_root_bus(parent, pbm->pci_first_busno, pbm->pci_ops,
                                   pbm, &resources);
         if (!bus) {
@@ -755,46 +747,6 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)
         return 0;
 }
 
-void pcibios_resource_to_bus(struct pci_dev *pdev, struct pci_bus_region *region,
-                             struct resource *res)
-{
-        struct pci_pbm_info *pbm = pdev->bus->sysdata;
-        struct resource zero_res, *root;
-
-        zero_res.start = 0;
-        zero_res.end = 0;
-        zero_res.flags = res->flags;
-
-        if (res->flags & IORESOURCE_IO)
-                root = &pbm->io_space;
-        else
-                root = &pbm->mem_space;
-
-        pci_resource_adjust(&zero_res, root);
-
-        region->start = res->start - zero_res.start;
-        region->end = res->end - zero_res.start;
-}
-EXPORT_SYMBOL(pcibios_resource_to_bus);
-
-void pcibios_bus_to_resource(struct pci_dev *pdev, struct resource *res,
-                             struct pci_bus_region *region)
-{
-        struct pci_pbm_info *pbm = pdev->bus->sysdata;
-        struct resource *root;
-
-        res->start = region->start;
-        res->end = region->end;
-
-        if (res->flags & IORESOURCE_IO)
-                root = &pbm->io_space;
-        else
-                root = &pbm->mem_space;
-
-        pci_resource_adjust(res, root);
-}
-EXPORT_SYMBOL(pcibios_bus_to_resource);
-
 char * __devinit pcibios_setup(char *str)
 {
         return str;
diff --git a/arch/sparc/kernel/vio.c b/arch/sparc/kernel/vio.c
index f67e28ef598..5cffdc55f07 100644
--- a/arch/sparc/kernel/vio.c
+++ b/arch/sparc/kernel/vio.c
@@ -119,13 +119,17 @@ static struct bus_type vio_bus_type = {
         .remove         = vio_device_remove,
 };
 
-int vio_register_driver(struct vio_driver *viodrv)
+int __vio_register_driver(struct vio_driver *viodrv, struct module *owner,
+                        const char *mod_name)
 {
         viodrv->driver.bus = &vio_bus_type;
+        viodrv->driver.name = viodrv->name;
+        viodrv->driver.owner = owner;
+        viodrv->driver.mod_name = mod_name;
 
         return driver_register(&viodrv->driver);
 }
-EXPORT_SYMBOL(vio_register_driver);
+EXPORT_SYMBOL(__vio_register_driver);
 
 void vio_unregister_driver(struct vio_driver *viodrv)
 {