]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'tip/auto-latest'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 11 Feb 2016 02:04:12 +0000 (13:04 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 11 Feb 2016 02:04:12 +0000 (13:04 +1100)
1  2 
Documentation/kernel-parameters.txt
MAINTAINERS
arch/arm64/kernel/setup.c
arch/mips/Kconfig
kernel/memremap.c

index 9a53c929f017d16527270bc2244352edf1d34cd8,52a4cf89bf80d0baf2ba1f62f2fb051972d16a50..0119c87186013b577e322f76c409a110ca4a8dc0
@@@ -666,7 -666,7 +666,7 @@@ bytes respectively. Such letter suffixe
  
        clearcpuid=BITNUM [X86]
                        Disable CPUID feature X for the kernel. See
-                       arch/x86/include/asm/cpufeature.h for the valid bit
+                       arch/x86/include/asm/cpufeatures.h for the valid bit
                        numbers. Note the Linux specific bits are not necessarily
                        stable over kernel options, but the vendor specific
                        ones should be.
        ip=             [IP_PNP]
                        See Documentation/filesystems/nfs/nfsroot.txt.
  
+       irqaffinity=    [SMP] Set the default irq affinity mask
+                       Format:
+                       <cpu number>,...,<cpu number>
+                       or
+                       <cpu number>-<cpu number>
+                       (must be a positive range in ascending order)
+                       or a mixture
+                       <cpu number>,...,<cpu number>-<cpu number>
        irqfixup        [HW]
                        When an interrupt is not handled search all handlers
                        for it. Intended to get systems with badly broken
  
        nointroute      [IA-64]
  
+       noinvpcid       [X86] Disable the INVPCID cpu feature.
        nojitter        [IA-64] Disables jitter checking for ITC timers.
  
        no-kvmclock     [X86,KVM] Disable paravirtualized KVM clock driver
  
        sched_debug     [KNL] Enables verbose scheduler debug messages.
  
+       schedstats=     [KNL,X86] Enable or disable scheduled statistics.
+                       Allowed values are enable and disable. This feature
+                       incurs a small amount of overhead in the scheduler
+                       but is useful for debugging and performance tuning.
        skew_tick=      [KNL] Offset the periodic timer tick per cpu to mitigate
                        xtime_lock contention on larger systems, and/or RCU lock
                        contention on all systems with CONFIG_MAXSMP set.
                        The default value of this parameter is determined by
                        the config option CONFIG_WQ_POWER_EFFICIENT_DEFAULT.
  
 +      workqueue.debug_force_rr_cpu
 +                      Workqueue used to implicitly guarantee that work
 +                      items queued without explicit CPU specified are put
 +                      on the local CPU.  This guarantee is no longer true
 +                      and while local CPU is still preferred work items
 +                      may be put on foreign CPUs.  This debug option
 +                      forces round-robin CPU selection to flush out
 +                      usages which depend on the now broken guarantee.
 +                      When enabled, memory and cache locality will be
 +                      impacted.
 +
        x2apic_phys     [X86-64,APIC] Use x2apic physical mode instead of
                        default x2apic cluster mode on platforms
                        supporting x2apic.
diff --combined MAINTAINERS
index 44b695df962b0af0ee9aa6ad438823164f355286,b5fab14ffac7a353d0c3716f7bd8bba97eb134ec..750f24c94fc0d94abed800521f41c5cc7895ee1a
@@@ -673,19 -673,11 +673,19 @@@ F:      drivers/gpu/drm/radeon/radeon_kfd.
  F:    drivers/gpu/drm/radeon/radeon_kfd.h
  F:    include/uapi/linux/kfd_ioctl.h
  
 +AMD SEATTLE DEVICE TREE SUPPORT
 +M:    Brijesh Singh <brijeshkumar.singh@amd.com>
 +M:    Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
 +M:    Tom Lendacky <thomas.lendacky@amd.com>
 +S:    Supported
 +F:    arch/arm64/boot/dts/amd/
 +
  AMD XGBE DRIVER
  M:    Tom Lendacky <thomas.lendacky@amd.com>
  L:    netdev@vger.kernel.org
  S:    Supported
  F:    drivers/net/ethernet/amd/xgbe/
 +F:    arch/arm64/boot/dts/amd/amd-seattle-xgbe*.dtsi
  
  AMS (Apple Motion Sensor) DRIVER
  M:    Michael Hanselmann <linux-kernel@hansmi.ch>
@@@ -835,12 -827,6 +835,12 @@@ S:       Maintaine
  F:    drivers/net/arcnet/
  F:    include/uapi/linux/if_arcnet.h
  
 +ARM HDLCD DRM DRIVER
 +M:    Liviu Dudau <liviu.dudau@arm.com>
 +S:    Supported
 +F:    drivers/gpu/drm/arm/
 +F:    Documentation/devicetree/bindings/display/arm,hdlcd.txt
 +
  ARM MFM AND FLOPPY DRIVERS
  M:    Ian Molton <spyro@f2s.com>
  S:    Maintained
@@@ -1440,9 -1426,7 +1440,9 @@@ F:      arch/arm/boot/dts/qcom-*.dt
  F:    arch/arm/boot/dts/qcom-*.dtsi
  F:    arch/arm/mach-qcom/
  F:    arch/arm64/boot/dts/qcom/*
 +F:    drivers/i2c/busses/i2c-qup.c
  F:    drivers/soc/qcom/
 +F:    drivers/spi/spi-qup.c
  F:    drivers/tty/serial/msm_serial.h
  F:    drivers/tty/serial/msm_serial.c
  F:    drivers/*/pm8???-*
@@@ -1512,7 -1496,6 +1512,7 @@@ F:      arch/arm/mach-s5p*
  F:    arch/arm/mach-exynos*/
  F:    drivers/*/*s3c2410*
  F:    drivers/*/*/*s3c2410*
 +F:    drivers/soc/samsung/*
  F:    drivers/spi/spi-s3c*
  F:    sound/soc/samsung/*
  F:    Documentation/arm/Samsung/
@@@ -2168,7 -2151,7 +2168,7 @@@ M:      Marek Lindner <mareklindner@neomailb
  M:    Simon Wunderlich <sw@simonwunderlich.de>
  M:    Antonio Quartulli <a@unstable.cc>
  L:    b.a.t.m.a.n@lists.open-mesh.org
 -W:    http://www.open-mesh.org/
 +W:    https://www.open-mesh.org/
  S:    Maintained
  F:    net/batman-adv/
  
@@@ -2440,6 -2423,7 +2440,7 @@@ F:      arch/mips/bmips/
  F:    arch/mips/include/asm/mach-bmips/*
  F:    arch/mips/kernel/*bmips*
  F:    arch/mips/boot/dts/brcm/bcm*.dts*
+ F:    drivers/irqchip/irq-bcm63*
  F:    drivers/irqchip/irq-bcm7*
  F:    drivers/irqchip/irq-brcmstb*
  F:    include/linux/bcm963xx_nvram.h
@@@ -8136,14 -8120,6 +8137,14 @@@ S:    Supporte
  F:    fs/overlayfs/
  F:    Documentation/filesystems/overlayfs.txt
  
 +ORANGEFS FILESYSTEM
 +M:    Mike Marshall <hubcap@omnibond.com>
 +L:    pvfs2-developers@beowulf-underground.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux.git
 +S:    Supported
 +F:    fs/orangefs/
 +F:    Documentation/filesystems/orangefs.txt
 +
  P54 WIRELESS DRIVER
  M:    Christian Lamparter <chunkeey@googlemail.com>
  L:    linux-wireless@vger.kernel.org
@@@ -9812,11 -9788,10 +9813,11 @@@ S:   Supporte
  F:    drivers/scsi/be2iscsi/
  
  Emulex 10Gbps NIC BE2, BE3-R, Lancer, Skyhawk-R DRIVER
 -M:    Sathya Perla <sathya.perla@avagotech.com>
 -M:    Ajit Khaparde <ajit.khaparde@avagotech.com>
 -M:    Padmanabh Ratnakar <padmanabh.ratnakar@avagotech.com>
 -M:    Sriharsha Basavapatna <sriharsha.basavapatna@avagotech.com>
 +M:    Sathya Perla <sathya.perla@broadcom.com>
 +M:    Ajit Khaparde <ajit.khaparde@broadcom.com>
 +M:    Padmanabh Ratnakar <padmanabh.ratnakar@broadcom.com>
 +M:    Sriharsha Basavapatna <sriharsha.basavapatna@broadcom.com>
 +M:    Somnath Kotur <somnath.kotur@broadcom.com>
  L:    netdev@vger.kernel.org
  W:    http://www.emulex.com
  S:    Supported
@@@ -10875,14 -10850,6 +10876,14 @@@ L: linux-omap@vger.kernel.or
  S:    Maintained
  F:    drivers/thermal/ti-soc-thermal/
  
 +TI VPE/CAL DRIVERS
 +M:    Benoit Parrot <bparrot@ti.com>
 +L:    linux-media@vger.kernel.org
 +W:    http://linuxtv.org/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +S:    Maintained
 +F:    drivers/media/platform/ti-vpe/
 +
  TI CDCE706 CLOCK DRIVER
  M:    Max Filippov <jcmvbkbc@gmail.com>
  S:    Maintained
index cfed56f0ad26d64714b137f124ac8112b12331b1,450987d99b9b9e497411a79f34781a3cb242df6e..28c0f90c9c10136aa560cde98e873c9ae53a7ca1
@@@ -62,7 -62,6 +62,7 @@@
  #include <asm/memblock.h>
  #include <asm/efi.h>
  #include <asm/xen/hypervisor.h>
 +#include <asm/mmu_context.h>
  
  phys_addr_t __fdt_pointer __initdata;
  
@@@ -74,13 -73,13 +74,13 @@@ static struct resource mem_res[] = 
                .name = "Kernel code",
                .start = 0,
                .end = 0,
-               .flags = IORESOURCE_MEM
+               .flags = IORESOURCE_SYSTEM_RAM
        },
        {
                .name = "Kernel data",
                .start = 0,
                .end = 0,
-               .flags = IORESOURCE_MEM
+               .flags = IORESOURCE_SYSTEM_RAM
        }
  };
  
@@@ -211,7 -210,7 +211,7 @@@ static void __init request_standard_res
                res->name  = "System RAM";
                res->start = __pfn_to_phys(memblock_region_memory_base_pfn(region));
                res->end = __pfn_to_phys(memblock_region_memory_end_pfn(region)) - 1;
-               res->flags = IORESOURCE_MEM | IORESOURCE_BUSY;
+               res->flags = IORESOURCE_SYSTEM_RAM | IORESOURCE_BUSY;
  
                request_resource(&iomem_resource, res);
  
@@@ -314,12 -313,6 +314,12 @@@ void __init setup_arch(char **cmdline_p
         */
        local_async_enable();
  
 +      /*
 +       * TTBR0 is only used for the identity mapping at this stage. Make it
 +       * point to zero page to avoid speculatively fetching new entries.
 +       */
 +      cpu_uninstall_idmap();
 +
        efi_init();
        arm64_memblock_init();
  
diff --combined arch/mips/Kconfig
index 0f6b20a702feb6588f35eb92cc27aef171ad3bef,eb079ac36dc896596a8d109b5a6956071c01f4c6..cc172671797d15fb7a335d6d0bda44889cd839fd
@@@ -137,7 -137,7 +137,7 @@@ config ATH7
        select SYS_SUPPORTS_32BIT_KERNEL
        select SYS_SUPPORTS_BIG_ENDIAN
        select SYS_SUPPORTS_MIPS16
 -      select SYS_SUPPORTS_ZBOOT
 +      select SYS_SUPPORTS_ZBOOT_UART_PROM
        select USE_OF
        help
          Support for the Atheros AR71XX/AR724X/AR913X SoCs.
@@@ -151,6 -151,7 +151,7 @@@ config BMIPS_GENERI
        select CSRC_R4K
        select SYNC_R4K
        select COMMON_CLK
+       select BCM6345_L1_IRQ
        select BCM7038_L1_IRQ
        select BCM7120_L2_IRQ
        select BRCMSTB_L2_IRQ
diff --combined kernel/memremap.c
index 57cb5f98fbd6be21c941729831072ed87cad8542,4dee6e37decd16eefc0fdcf390197cba5acc81a3..f80167d6a66d00e1151462df65886965ec4cb357
@@@ -47,7 -47,7 +47,7 @@@ static void *try_ram_remap(resource_siz
   * being mapped does not have i/o side effects and the __iomem
   * annotation is not applicable.
   *
-  * MEMREMAP_WB - matches the default mapping for "System RAM" on
+  * MEMREMAP_WB - matches the default mapping for System RAM on
   * the architecture.  This is usually a read-allocate write-back cache.
   * Morever, if MEMREMAP_WB is specified and the requested remap region is RAM
   * memremap() will bypass establishing a new mapping and instead return
   * MEMREMAP_WT - establish a mapping whereby writes either bypass the
   * cache or are written through to memory and never exist in a
   * cache-dirty state with respect to program visibility.  Attempts to
-  * map "System RAM" with this mapping type will fail.
+  * map System RAM with this mapping type will fail.
   */
  void *memremap(resource_size_t offset, size_t size, unsigned long flags)
  {
-       int is_ram = region_intersects(offset, size, "System RAM");
+       int is_ram = region_intersects(offset, size,
+                                      IORESOURCE_SYSTEM_RAM, IORES_DESC_NONE);
        void *addr = NULL;
  
        if (is_ram == REGION_MIXED) {
@@@ -76,7 -77,7 +77,7 @@@
                 * MEMREMAP_WB is special in that it can be satisifed
                 * from the direct map.  Some archs depend on the
                 * capability of memremap() to autodetect cases where
-                * the requested range is potentially in "System RAM"
+                * the requested range is potentially in System RAM.
                 */
                if (is_ram == REGION_INTERSECTS)
                        addr = try_ram_remap(offset, size);
@@@ -88,7 -89,7 +89,7 @@@
         * If we don't have a mapping yet and more request flags are
         * pending then we will be attempting to establish a new virtual
         * address mapping.  Enforce that this mapping is not aliasing
-        * "System RAM"
+        * System RAM.
         */
        if (!addr && is_ram == REGION_INTERSECTS && flags) {
                WARN_ONCE(1, "memremap attempted on ram %pa size: %#lx\n",
@@@ -226,8 -227,7 +227,8 @@@ static void devm_memremap_pages_release
        struct dev_pagemap *pgmap = &page_map->pgmap;
  
        if (percpu_ref_tryget_live(pgmap->ref)) {
 -              dev_WARN(dev, "%s: page mapping is still live!\n", __func__);
 +              dev_WARN(dev, true, "%s: page mapping is still live!\n",
 +                       __func__);
                percpu_ref_put(pgmap->ref);
        }
  
@@@ -270,7 -270,7 +271,7 @@@ void *devm_memremap_pages(struct devic
                struct percpu_ref *ref, struct vmem_altmap *altmap)
  {
        int is_ram = region_intersects(res->start, resource_size(res),
-                       "System RAM");
+                                      IORESOURCE_SYSTEM_RAM, IORES_DESC_NONE);
        resource_size_t key, align_start, align_size, align_end;
        struct dev_pagemap *pgmap;
        struct page_map *page_map;