Merge branch 'master' into fixes

6 files changed, 42 insertions, 64 deletions

diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
index 70a0de46cd1..11270ca22c0 100644
--- a/arch/tile/Kconfig
+++ b/arch/tile/Kconfig
@@ -321,6 +321,7 @@ config PCI
         bool "PCI support"
         default y
         select PCI_DOMAINS
+        select GENERIC_PCI_IOMAP
         ---help---
           Enable PCI root complex support, so PCIe endpoint devices can
           be attached to the Tile chip.  Many, but not all, PCI devices
diff --git a/arch/tile/include/asm/io.h b/arch/tile/include/asm/io.h
index c9ea1652af0..d2152deb1f3 100644
--- a/arch/tile/include/asm/io.h
+++ b/arch/tile/include/asm/io.h
@@ -204,7 +204,8 @@ static inline long ioport_panic(void)
 
 static inline void __iomem *ioport_map(unsigned long port, unsigned int len)
 {
-        return (void __iomem *) ioport_panic();
+        pr_info("ioport_map: mapping IO resources is unsupported on tile.\n");
+        return NULL;
 }
 
 static inline void ioport_unmap(void __iomem *addr)
diff --git a/arch/tile/include/asm/pci.h b/arch/tile/include/asm/pci.h
index 7f03cefed1b..5d5a635530b 100644
--- a/arch/tile/include/asm/pci.h
+++ b/arch/tile/include/asm/pci.h
@@ -16,6 +16,7 @@
 #define _ASM_TILE_PCI_H
 
 #include <linux/pci.h>
+#include <asm-generic/pci_iomap.h>
 
 /*
  * Structure of a PCI controller (host bridge)
@@ -49,7 +50,6 @@ struct pci_controller {
 int __devinit tile_pci_init(void);
 int __devinit pcibios_init(void);
 
-void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max);
 static inline void pci_iounmap(struct pci_dev *dev, void __iomem *addr) {}
 
 void __devinit pcibios_fixup_bus(struct pci_bus *bus);
@@ -76,13 +76,6 @@ static inline int pcibios_assign_all_busses(void)
         return 1;
 }
 
-/*
- * No special bus mastering setup handling.
- */
-static inline void pcibios_set_master(struct pci_dev *dev)
-{
-}
-
 #define PCIBIOS_MIN_MEM         0
 #define PCIBIOS_MIN_IO          0
 
diff --git a/arch/tile/kernel/machine_kexec.c b/arch/tile/kernel/machine_kexec.c
index e00d7179989..6255f2eab11 100644
--- a/arch/tile/kernel/machine_kexec.c
+++ b/arch/tile/kernel/machine_kexec.c
@@ -248,11 +248,11 @@ static void setup_quasi_va_is_pa(void)
 }
 
 
-NORET_TYPE void machine_kexec(struct kimage *image)
+void machine_kexec(struct kimage *image)
 {
         void *reboot_code_buffer;
-        NORET_TYPE void (*rnk)(unsigned long, void *, unsigned long)
-                ATTRIB_NORET;
+        void (*rnk)(unsigned long, void *, unsigned long)
+                __noreturn;
 
         /* Mask all interrupts before starting to reboot. */
         interrupt_mask_set_mask(~0ULL);
diff --git a/arch/tile/kernel/pci.c b/arch/tile/kernel/pci.c
index 9d610d3fb11..a1bb59eecc1 100644
--- a/arch/tile/kernel/pci.c
+++ b/arch/tile/kernel/pci.c
@@ -395,6 +395,11 @@ void __devinit pcibios_fixup_bus(struct pci_bus *bus)
         /* Nothing needs to be done. */
 }
 
+void pcibios_set_master(struct pci_dev *dev)
+{
+        /* No special bus mastering setup handling. */
+}
+
 /*
  * This can be called from the generic PCI layer, but doesn't need to
  * do anything.
@@ -466,27 +471,6 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)
         return 0;
 }
 
-void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max)
-{
-        unsigned long start = pci_resource_start(dev, bar);
-        unsigned long len = pci_resource_len(dev, bar);
-        unsigned long flags = pci_resource_flags(dev, bar);
-
-        if (!len)
-                return NULL;
-        if (max && len > max)
-                len = max;
-
-        if (!(flags & IORESOURCE_MEM)) {
-                pr_info("PCI: Trying to map invalid resource %#lx\n", flags);
-                start = 0;
-        }
-
-        return (void __iomem *)start;
-}
-EXPORT_SYMBOL(pci_iomap);
-
-
 /****************************************************************
  *
  * Tile PCI config space read/write routines
diff --git a/arch/tile/kernel/sysfs.c b/arch/tile/kernel/sysfs.c
index 60290826809..f862b005eb7 100644
--- a/arch/tile/kernel/sysfs.c
+++ b/arch/tile/kernel/sysfs.c
@@ -14,7 +14,7 @@
  * /sys entry support.
  */
 
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/cpu.h>
 #include <linux/slab.h>
 #include <linux/smp.h>
@@ -32,55 +32,55 @@ static ssize_t get_hv_confstr(char *page, int query)
         return n;
 }
 
-static ssize_t chip_width_show(struct sysdev_class *dev,
-                               struct sysdev_class_attribute *attr,
+static ssize_t chip_width_show(struct device *dev,
+                               struct device_attribute *attr,
                                char *page)
 {
         return sprintf(page, "%u\n", smp_width);
 }
-static SYSDEV_CLASS_ATTR(chip_width, 0444, chip_width_show, NULL);
+static DEVICE_ATTR(chip_width, 0444, chip_width_show, NULL);
 
-static ssize_t chip_height_show(struct sysdev_class *dev,
-                                struct sysdev_class_attribute *attr,
+static ssize_t chip_height_show(struct device *dev,
+                                struct device_attribute *attr,
                                 char *page)
 {
         return sprintf(page, "%u\n", smp_height);
 }
-static SYSDEV_CLASS_ATTR(chip_height, 0444, chip_height_show, NULL);
+static DEVICE_ATTR(chip_height, 0444, chip_height_show, NULL);
 
-static ssize_t chip_serial_show(struct sysdev_class *dev,
-                                struct sysdev_class_attribute *attr,
+static ssize_t chip_serial_show(struct device *dev,
+                                struct device_attribute *attr,
                                 char *page)
 {
         return get_hv_confstr(page, HV_CONFSTR_CHIP_SERIAL_NUM);
 }
-static SYSDEV_CLASS_ATTR(chip_serial, 0444, chip_serial_show, NULL);
+static DEVICE_ATTR(chip_serial, 0444, chip_serial_show, NULL);
 
-static ssize_t chip_revision_show(struct sysdev_class *dev,
-                                  struct sysdev_class_attribute *attr,
+static ssize_t chip_revision_show(struct device *dev,
+                                  struct device_attribute *attr,
                                   char *page)
 {
         return get_hv_confstr(page, HV_CONFSTR_CHIP_REV);
 }
-static SYSDEV_CLASS_ATTR(chip_revision, 0444, chip_revision_show, NULL);
+static DEVICE_ATTR(chip_revision, 0444, chip_revision_show, NULL);
 
 
-static ssize_t type_show(struct sysdev_class *dev,
-                            struct sysdev_class_attribute *attr,
+static ssize_t type_show(struct device *dev,
+                            struct device_attribute *attr,
                             char *page)
 {
         return sprintf(page, "tilera\n");
 }
-static SYSDEV_CLASS_ATTR(type, 0444, type_show, NULL);
+static DEVICE_ATTR(type, 0444, type_show, NULL);
 
 #define HV_CONF_ATTR(name, conf)                                        \
-        static ssize_t name ## _show(struct sysdev_class *dev,          \
-                                     struct sysdev_class_attribute *attr, \
+        static ssize_t name ## _show(struct device *dev,                \
+                                     struct device_attribute *attr, \
                                      char *page)                        \
         {                                                               \
                 return get_hv_confstr(page, conf);                      \
         }                                                               \
-        static SYSDEV_CLASS_ATTR(name, 0444, name ## _show, NULL);
+        static DEVICE_ATTR(name, 0444, name ## _show, NULL);
 
 HV_CONF_ATTR(version,           HV_CONFSTR_HV_SW_VER)
 HV_CONF_ATTR(config_version,    HV_CONFSTR_HV_CONFIG_VER)
@@ -96,15 +96,15 @@ HV_CONF_ATTR(mezz_description,	HV_CONFSTR_MEZZ_DESC)
 HV_CONF_ATTR(switch_control,    HV_CONFSTR_SWITCH_CONTROL)
 
 static struct attribute *board_attrs[] = {
-        &attr_board_part.attr,
-        &attr_board_serial.attr,
-        &attr_board_revision.attr,
-        &attr_board_description.attr,
-        &attr_mezz_part.attr,
-        &attr_mezz_serial.attr,
-        &attr_mezz_revision.attr,
-        &attr_mezz_description.attr,
-        &attr_switch_control.attr,
+        &dev_attr_board_part.attr,
+        &dev_attr_board_serial.attr,
+        &dev_attr_board_revision.attr,
+        &dev_attr_board_description.attr,
+        &dev_attr_mezz_part.attr,
+        &dev_attr_mezz_serial.attr,
+        &dev_attr_mezz_revision.attr,
+        &dev_attr_mezz_description.attr,
+        &dev_attr_switch_control.attr,
         NULL
 };
 
@@ -151,12 +151,11 @@ hvconfig_bin_read(struct file *filp, struct kobject *kobj,
 
 static int __init create_sysfs_entries(void)
 {
-        struct sysdev_class *cls = &cpu_sysdev_class;
         int err = 0;
 
 #define create_cpu_attr(name)                                           \
         if (!err)                                                       \
-                err = sysfs_create_file(&cls->kset.kobj, &attr_##name.attr);
+                err = device_create_file(cpu_subsys.dev_root, &dev_attr_##name);
         create_cpu_attr(chip_width);
         create_cpu_attr(chip_height);
         create_cpu_attr(chip_serial);
@@ -164,7 +163,7 @@ static int __init create_sysfs_entries(void)
 
 #define create_hv_attr(name)                                            \
         if (!err)                                                       \
-                err = sysfs_create_file(hypervisor_kobj, &attr_##name.attr);
+                err = sysfs_create_file(hypervisor_kobj, &dev_attr_##name);
         create_hv_attr(type);
         create_hv_attr(version);
         create_hv_attr(config_version);