7 files changed, 41 insertions, 38 deletions

diff --git a/arch/tile/configs/tilegx_defconfig b/arch/tile/configs/tilegx_defconfig
index 91de7dd7427f..37dc9364c4a1 100644
--- a/arch/tile/configs/tilegx_defconfig
+++ b/arch/tile/configs/tilegx_defconfig
@@ -218,7 +218,6 @@ CONFIG_MACVLAN=m
 CONFIG_MACVTAP=m
 CONFIG_NETCONSOLE=m
 CONFIG_NETCONSOLE_DYNAMIC=y
-CONFIG_NETPOLL_TRAP=y
 CONFIG_TUN=y
 CONFIG_VETH=m
 CONFIG_NET_DSA_MV88E6060=y
diff --git a/arch/tile/configs/tilepro_defconfig b/arch/tile/configs/tilepro_defconfig
index c7702b7ab7a5..76a2781dec2c 100644
--- a/arch/tile/configs/tilepro_defconfig
+++ b/arch/tile/configs/tilepro_defconfig
@@ -337,7 +337,6 @@ CONFIG_MACVLAN=m
 CONFIG_MACVTAP=m
 CONFIG_NETCONSOLE=m
 CONFIG_NETCONSOLE_DYNAMIC=y
-CONFIG_NETPOLL_TRAP=y
 CONFIG_TUN=y
 CONFIG_VETH=m
 CONFIG_NET_DSA_MV88E6060=y
diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild
index e6462b8a6284..b4c488b65745 100644
--- a/arch/tile/include/asm/Kbuild
+++ b/arch/tile/include/asm/Kbuild
@@ -11,7 +11,6 @@ generic-y += errno.h
 generic-y += exec.h
 generic-y += fb.h
 generic-y += fcntl.h
-generic-y += hash.h
 generic-y += hw_irq.h
 generic-y += ioctl.h
 generic-y += ioctls.h
diff --git a/arch/tile/include/asm/io.h b/arch/tile/include/asm/io.h
index 4353539fb887..6ef4ecab1df2 100644
--- a/arch/tile/include/asm/io.h
+++ b/arch/tile/include/asm/io.h
@@ -241,6 +241,10 @@ static inline void writeq(u64 val, unsigned long addr)
 #define readw_relaxed readw
 #define readl_relaxed readl
 #define readq_relaxed readq
+#define writeb_relaxed writeb
+#define writew_relaxed writew
+#define writel_relaxed writel
+#define writeq_relaxed writeq
 
 #define ioread8 readb
 #define ioread16 readw
diff --git a/arch/tile/kernel/early_printk.c b/arch/tile/kernel/early_printk.c
index b608e00e7f6d..aefb2c086726 100644
--- a/arch/tile/kernel/early_printk.c
+++ b/arch/tile/kernel/early_printk.c
@@ -43,13 +43,20 @@ static struct console early_hv_console = {
 
 void early_panic(const char *fmt, ...)
 {
-        va_list ap;
+        struct va_format vaf;
+        va_list args;
+
         arch_local_irq_disable_all();
-        va_start(ap, fmt);
-        early_printk("Kernel panic - not syncing: ");
-        early_vprintk(fmt, ap);
-        early_printk("\n");
-        va_end(ap);
+
+        va_start(args, fmt);
+
+        vaf.fmt = fmt;
+        vaf.va = &args;
+
+        early_printk("Kernel panic - not syncing: %pV", &vaf);
+
+        va_end(args);
+
         dump_stack();
         hv_halt();
 }
diff --git a/arch/tile/kernel/pci_gx.c b/arch/tile/kernel/pci_gx.c
index 47e048e31641..2c95f37ebbed 100644
--- a/arch/tile/kernel/pci_gx.c
+++ b/arch/tile/kernel/pci_gx.c
@@ -1441,7 +1441,7 @@ static struct pci_ops tile_cfg_ops = {
 static unsigned int tilegx_msi_startup(struct irq_data *d)
 {
         if (d->msi_desc)
-                unmask_msi_irq(d);
+                pci_msi_unmask_irq(d);
 
         return 0;
 }
@@ -1453,14 +1453,14 @@ static void tilegx_msi_ack(struct irq_data *d)
 
 static void tilegx_msi_mask(struct irq_data *d)
 {
-        mask_msi_irq(d);
+        pci_msi_mask_irq(d);
         __insn_mtspr(SPR_IPI_MASK_SET_K, 1UL << d->irq);
 }
 
 static void tilegx_msi_unmask(struct irq_data *d)
 {
         __insn_mtspr(SPR_IPI_MASK_RESET_K, 1UL << d->irq);
-        unmask_msi_irq(d);
+        pci_msi_unmask_irq(d);
 }
 
 static struct irq_chip tilegx_msi_chip = {
@@ -1573,7 +1573,7 @@ int arch_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *desc)
         msg.address_hi = msi_addr >> 32;
         msg.address_lo = msi_addr & 0xffffffff;
 
-        write_msi_msg(irq, &msg);
+        pci_write_msi_msg(irq, &msg);
         irq_set_chip_and_handler(irq, &tilegx_msi_chip, handle_level_irq);
         irq_set_handler_data(irq, controller);
 
diff --git a/arch/tile/kernel/setup.c b/arch/tile/kernel/setup.c
index f183f1c92b4f..864eea69556d 100644
--- a/arch/tile/kernel/setup.c
+++ b/arch/tile/kernel/setup.c
@@ -533,11 +533,10 @@ static void __init setup_memory(void)
                         }
                 }
                 physpages -= dropped_pages;
-                pr_warning("Only using %ldMB memory;"
-                       " ignoring %ldMB.\n",
-                       physpages >> (20 - PAGE_SHIFT),
-                       dropped_pages >> (20 - PAGE_SHIFT));
-                pr_warning("Consider using a larger page size.\n");
+                pr_warn("Only using %ldMB memory - ignoring %ldMB\n",
+                        physpages >> (20 - PAGE_SHIFT),
+                        dropped_pages >> (20 - PAGE_SHIFT));
+                pr_warn("Consider using a larger page size\n");
         }
 #endif
 
@@ -564,9 +563,8 @@ static void __init setup_memory(void)
 
 #ifndef __tilegx__
         if (node_end_pfn[0] > MAXMEM_PFN) {
-                pr_warning("Only using %ldMB LOWMEM.\n",
-                       MAXMEM>>20);
-                pr_warning("Use a HIGHMEM enabled kernel.\n");
+                pr_warn("Only using %ldMB LOWMEM\n", MAXMEM >> 20);
+                pr_warn("Use a HIGHMEM enabled kernel\n");
                 max_low_pfn = MAXMEM_PFN;
                 max_pfn = MAXMEM_PFN;
                 node_end_pfn[0] = MAXMEM_PFN;
@@ -1109,8 +1107,8 @@ static void __init load_hv_initrd(void)
         fd = hv_fs_findfile((HV_VirtAddr) initramfs_file);
         if (fd == HV_ENOENT) {
                 if (set_initramfs_file) {
-                        pr_warning("No such hvfs initramfs file '%s'\n",
-                                   initramfs_file);
+                        pr_warn("No such hvfs initramfs file '%s'\n",
+                                initramfs_file);
                         return;
                 } else {
                         /* Try old backwards-compatible name. */
@@ -1123,8 +1121,8 @@ static void __init load_hv_initrd(void)
         stat = hv_fs_fstat(fd);
         BUG_ON(stat.size < 0);
         if (stat.flags & HV_FS_ISDIR) {
-                pr_warning("Ignoring hvfs file '%s': it's a directory.\n",
-                           initramfs_file);
+                pr_warn("Ignoring hvfs file '%s': it's a directory\n",
+                        initramfs_file);
                 return;
         }
         initrd = alloc_bootmem_pages(stat.size);
@@ -1182,9 +1180,8 @@ static void __init validate_hv(void)
         HV_Topology topology = hv_inquire_topology();
         BUG_ON(topology.coord.x != 0 || topology.coord.y != 0);
         if (topology.width != 1 || topology.height != 1) {
-                pr_warning("Warning: booting UP kernel on %dx%d grid;"
-                           " will ignore all but first tile.\n",
-                           topology.width, topology.height);
+                pr_warn("Warning: booting UP kernel on %dx%d grid; will ignore all but first tile\n",
+                        topology.width, topology.height);
         }
 #endif
 
@@ -1205,9 +1202,8 @@ static void __init validate_hv(void)
          * We use a struct cpumask for this, so it must be big enough.
          */
         if ((smp_height * smp_width) > nr_cpu_ids)
-                early_panic("Hypervisor %d x %d grid too big for Linux"
-                            " NR_CPUS %d\n", smp_height, smp_width,
-                            nr_cpu_ids);
+                early_panic("Hypervisor %d x %d grid too big for Linux NR_CPUS %d\n",
+                            smp_height, smp_width, nr_cpu_ids);
 #endif
 
         /*
@@ -1262,10 +1258,9 @@ static void __init validate_va(void)
 
         /* Kernel PCs must have their high bit set; see intvec.S. */
         if ((long)VMALLOC_START >= 0)
-                early_panic(
-                        "Linux VMALLOC region below the 2GB line (%#lx)!\n"
-                        "Reconfigure the kernel with smaller VMALLOC_RESERVE.\n",
-                        VMALLOC_START);
+                early_panic("Linux VMALLOC region below the 2GB line (%#lx)!\n"
+                            "Reconfigure the kernel with smaller VMALLOC_RESERVE\n",
+                            VMALLOC_START);
 #endif
 }
 
@@ -1392,7 +1387,7 @@ static void __init setup_cpu_maps(void)
 
 static int __init dataplane(char *str)
 {
-        pr_warning("WARNING: dataplane support disabled in this kernel\n");
+        pr_warn("WARNING: dataplane support disabled in this kernel\n");
         return 0;
 }
 
@@ -1410,8 +1405,8 @@ void __init setup_arch(char **cmdline_p)
         len = hv_get_command_line((HV_VirtAddr) boot_command_line,
                                   COMMAND_LINE_SIZE);
         if (boot_command_line[0])
-                pr_warning("WARNING: ignoring dynamic command line \"%s\"\n",
-                           boot_command_line);
+                pr_warn("WARNING: ignoring dynamic command line \"%s\"\n",
+                        boot_command_line);
         strlcpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE);
 #else
         char *hv_cmdline;