Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

Pull arch/tile changes from Chris Metcalf:
 "These mostly just address smaller issues reported to me"

* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
  arch: tile: kernel: unaligned.c: Cleaning up uninitialized variables
  drivers/tty/hvc/hvc_tile.c: use PTR_ERR_OR_ZERO
  replace strict_strto* call with kstrto*
  tile: Update comments for generic idle conversion
  tile: cleanup the comment in init_pgprot
  tile: use BOOTMEM_DEFAULT instead of magic number 0 for reserve_bootmem flags

diff --combined arch/tile/include/asm/thread_info.h
index d767ff9,80ba7d4..48e4fd0
--- 1/arch/tile/include/asm/thread_info.h
--- 2/arch/tile/include/asm/thread_info.h
+++ b/arch/tile/include/asm/thread_info.h
@@@ -94,7 -94,7 +94,7 @@@ register unsigned long stack_pointer __
  /* Sit on a nap instruction until interrupted. */
  extern void smp_nap(void);
  
- /* Enable interrupts racelessly and nap forever: helper for cpu_idle(). */
+ /* Enable interrupts racelessly and nap forever: helper for arch_cpu_idle(). */
  extern void _cpu_idle(void);
  
  #else /* __ASSEMBLY__ */
@@@ -129,7 -129,6 +129,7 @@@
  #define TIF_MEMDIE            7       /* OOM killer at work */
  #define TIF_NOTIFY_RESUME     8       /* callback before returning to user */
  #define TIF_SYSCALL_TRACEPOINT        9       /* syscall tracepoint instrumentation */
 +#define TIF_POLLING_NRFLAG    10      /* idle is polling for TIF_NEED_RESCHED */
  
  #define _TIF_SIGPENDING               (1<<TIF_SIGPENDING)
  #define _TIF_NEED_RESCHED     (1<<TIF_NEED_RESCHED)
@@@ -141,7 -140,6 +141,7 @@@
  #define _TIF_MEMDIE           (1<<TIF_MEMDIE)
  #define _TIF_NOTIFY_RESUME    (1<<TIF_NOTIFY_RESUME)
  #define _TIF_SYSCALL_TRACEPOINT       (1<<TIF_SYSCALL_TRACEPOINT)
 +#define _TIF_POLLING_NRFLAG   (1<<TIF_POLLING_NRFLAG)
  
  /* Work to do on any return to user space. */
  #define _TIF_ALLWORK_MASK \
@@@ -164,6 -162,7 +164,6 @@@
  #ifdef __tilegx__
  #define TS_COMPAT             0x0001  /* 32-bit compatibility mode */
  #endif
 -#define TS_POLLING            0x0004  /* in idle loop but not sleeping */
  #define TS_RESTORE_SIGMASK    0x0008  /* restore signal mask in do_signal */
  
  #ifndef __ASSEMBLY__

diff --combined drivers/tty/hvc/hvc_tile.c
index 147d49e,af4e3d1..df37486
--- 1/drivers/tty/hvc/hvc_tile.c
--- 2/drivers/tty/hvc/hvc_tile.c
+++ b/drivers/tty/hvc/hvc_tile.c
@@@ -133,14 -133,14 +133,14 @@@ static int hvc_tile_probe(struct platfo
        int tile_hvc_irq;
  
        /* Create our IRQ and register it. */
 -      tile_hvc_irq = create_irq();
 -      if (tile_hvc_irq < 0)
 +      tile_hvc_irq = irq_alloc_hwirq(-1);
 +      if (!tile_hvc_irq)
                return -ENXIO;
  
        tile_irq_activate(tile_hvc_irq, TILE_IRQ_PERCPU);
        hp = hvc_alloc(0, tile_hvc_irq, &hvc_tile_get_put_ops, 128);
        if (IS_ERR(hp)) {
 -              destroy_irq(tile_hvc_irq);
 +              irq_free_hwirq(tile_hvc_irq);
                return PTR_ERR(hp);
        }
        dev_set_drvdata(&pdev->dev, hp);
@@@ -155,7 -155,7 +155,7 @@@ static int hvc_tile_remove(struct platf
  
        rc = hvc_remove(hp);
        if (rc == 0)
 -              destroy_irq(hp->data);
 +              irq_free_hwirq(hp->data);
  
        return rc;
  }
@@@ -196,7 -196,7 +196,7 @@@ static int __init hvc_tile_init(void
  #ifndef __tilegx__
        struct hvc_struct *hp;
        hp = hvc_alloc(0, 0, &hvc_tile_get_put_ops, 128);
-       return IS_ERR(hp) ? PTR_ERR(hp) : 0;
+       return PTR_ERR_OR_ZERO(hp);
  #else
        platform_device_register(&hvc_tile_pdev);
        return platform_driver_register(&hvc_tile_driver);