Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux...

Pull tile update from Chris Metcalf:
 "The interesting bug fix is support for the upcoming "4.2" release of
  the Tilera hypervisor, which by default launches Linux at privilege
  level 2 instead of 1.  The fix lets new and old hypervisors and
  Linuxes interoperate more smoothly, so I've tagged it for
  stable@kernel.org so that older Linuxes will be able to boot under the
  newer hypervisor."

* 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
  usb: tilegx: fix memleak when create hcd fail
  arch/tile: remove inline marking of EXPORT_SYMBOL functions
  rtc: rtc-tile: add missing platform_device_unregister() when module exit
  tile: support new Tilera hypervisor

diff --combined arch/tile/Kconfig
index 5b6a40dd5556765d4abf6fdc059fd54ad7c3ecb2,41a2a0becc18b70ca4622604391ccc5c48f0badc..3aa37669ff8c655ba1c44a9b2b3e8e8375c5d16e
--- 1/arch/tile/Kconfig
--- 2/arch/tile/Kconfig
+++ b/arch/tile/Kconfig
@@@ -16,15 -16,12 +16,15 @@@ config TIL
        select GENERIC_PENDING_IRQ if SMP
        select GENERIC_IRQ_SHOW
        select HAVE_DEBUG_BUGVERBOSE
 -      select HAVE_SYSCALL_WRAPPERS if TILEGX
        select VIRT_TO_BUS
        select SYS_HYPERVISOR
 +      select ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
        select ARCH_HAVE_NMI_SAFE_CMPXCHG
        select GENERIC_CLOCKEVENTS
        select MODULES_USE_ELF_RELA
 +      select HAVE_ARCH_TRACEHOOK
 +      select HAVE_SYSCALL_TRACEPOINTS
 +      select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
  
  # FIXME: investigate whether we need/want these options.
  #     select HAVE_IOREMAP_PROT
@@@ -43,6 -40,9 +43,6 @@@ config MM
  config GENERIC_CSUM
        def_bool y
  
 -config SEMAPHORE_SLEEPERS
 -      def_bool y
 -
  config HAVE_ARCH_ALLOC_REMAP
        def_bool y
  
@@@ -67,6 -67,12 +67,6 @@@ config HUGETLB_SUPER_PAGE
  config RWSEM_GENERIC_SPINLOCK
        def_bool y
  
 -# We have a very flat architecture from a migration point of view,
 -# so save boot time by presetting this (particularly useful on tile-sim).
 -config DEFAULT_MIGRATION_COST
 -      int
 -      default "10000000"
 -
  # We only support gcc 4.4 and above, so this should work.
  config ARCH_SUPPORTS_OPTIMIZED_INLINING
        def_bool y
@@@ -108,6 -114,13 +108,6 @@@ config STRICT_DEVME
  config SMP
        def_bool y
  
 -# Allow checking for compile-time determined overflow errors in
 -# copy_from_user().  There are still unprovable places in the
 -# generic code as of 2.6.34, so this option is not really compatible
 -# with -Werror, which is more useful in general.
 -config DEBUG_COPY_FROM_USER
 -      def_bool n
 -
  config HVC_TILE
        depends on TTY
        select HVC_DRIVER
@@@ -355,11 -368,17 +355,17 @@@ config HARDWAL
  config KERNEL_PL
        int "Processor protection level for kernel"
        range 1 2
-       default "1"
+       default 2 if TILEGX
+       default 1 if !TILEGX
        ---help---
-         This setting determines the processor protection level the
-         kernel will be built to run at.  Generally you should use
-         the default value here.
+         Since MDE 4.2, the Tilera hypervisor runs the kernel
+         at PL2 by default.  If running under an older hypervisor,
+         or as a KVM guest, you must run at PL1.  (The current
+         hypervisor may also be recompiled with "make HV_PL=2" to
+         allow it to run a kernel at PL1, but clients running at PL1
+         are not expected to be supported indefinitely.)
+ 
+         If you're not sure, don't change the default.
  
  source "arch/tile/gxio/Kconfig"
  
@@@ -407,6 -426,11 +413,6 @@@ endmen
  
  menu "Executable file formats"
  
 -# only elf supported
 -config KCORE_ELF
 -      def_bool y
 -      depends on PROC_FS
 -
  source "fs/Kconfig.binfmt"
  
  endmenu

diff --combined drivers/rtc/rtc-tile.c
index 249b6531f119daa54b17c242fe72d83b7241f955,35dc926a6c5a498dcbeaf27dcdbf48a016f09e96..fc3dee95f16618a86ec59d86272947b27882500c
--- 1/drivers/rtc/rtc-tile.c
--- 2/drivers/rtc/rtc-tile.c
+++ b/drivers/rtc/rtc-tile.c
@@@ -80,8 -80,8 +80,8 @@@ static int tile_rtc_probe(struct platfo
  {
        struct rtc_device *rtc;
  
 -      rtc = rtc_device_register("tile",
 -                                &dev->dev, &tile_rtc_ops, THIS_MODULE);
 +      rtc = devm_rtc_device_register(&dev->dev, "tile",
 +                              &tile_rtc_ops, THIS_MODULE);
  
        if (IS_ERR(rtc))
                return PTR_ERR(rtc);
@@@ -96,6 -96,11 +96,6 @@@
   */
  static int tile_rtc_remove(struct platform_device *dev)
  {
 -      struct rtc_device *rtc = platform_get_drvdata(dev);
 -
 -      if (rtc)
 -              rtc_device_unregister(rtc);
 -
        platform_set_drvdata(dev, NULL);
  
        return 0;
@@@ -146,6 -151,7 +146,7 @@@ exit_driver_unregister
   */
  static void __exit tile_rtc_driver_exit(void)
  {
+       platform_device_unregister(tile_rtc_platform_device);
        platform_driver_unregister(&tile_rtc_platform_driver);
  }