1. 17 4月, 2015 2 次提交
    • L
      Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · 714d8e7e
      Linus Torvalds 提交于
      Pull arm64 updates from Will Deacon:
       "Here are the core arm64 updates for 4.1.
      
        Highlights include a significant rework to head.S (allowing us to boot
        on machines with physical memory at a really high address), an AES
        performance boost on Cortex-A57 and the ability to run a 32-bit
        userspace with 64k pages (although this requires said userspace to be
        built with a recent binutils).
      
        The head.S rework spilt over into KVM, so there are some changes under
        arch/arm/ which have been acked by Marc Zyngier (KVM co-maintainer).
        In particular, the linker script changes caused us some issues in
        -next, so there are a few merge commits where we had to apply fixes on
        top of a stable branch.
      
        Other changes include:
      
         - AES performance boost for Cortex-A57
         - AArch32 (compat) userspace with 64k pages
         - Cortex-A53 erratum workaround for #845719
         - defconfig updates (new platforms, PCI, ...)"
      
      * tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: (39 commits)
        arm64: fix midr range for Cortex-A57 erratum 832075
        arm64: errata: add workaround for cortex-a53 erratum #845719
        arm64: Use bool function return values of true/false not 1/0
        arm64: defconfig: updates for 4.1
        arm64: Extract feature parsing code from cpu_errata.c
        arm64: alternative: Allow immediate branch as alternative instruction
        arm64: insn: Add aarch64_insn_decode_immediate
        ARM: kvm: round HYP section to page size instead of log2 upper bound
        ARM: kvm: assert on HYP section boundaries not actual code size
        arm64: head.S: ensure idmap_t0sz is visible
        arm64: pmu: add support for interrupt-affinity property
        dt: pmu: extend ARM PMU binding to allow for explicit interrupt affinity
        arm64: head.S: ensure visibility of page tables
        arm64: KVM: use ID map with increased VA range if required
        arm64: mm: increase VA range of identity map
        ARM: kvm: implement replacement for ld's LOG2CEIL()
        arm64: proc: remove unused cpu_get_pgd macro
        arm64: enforce x1|x2|x3 == 0 upon kernel entry as per boot protocol
        arm64: remove __calc_phys_offset
        arm64: merge __enable_mmu and __turn_mmu_on
        ...
      714d8e7e
    • L
      Merge tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux · d19d5efd
      Linus Torvalds 提交于
      Pull powerpc updates from Michael Ellerman:
      
       - Numerous minor fixes, cleanups etc.
      
       - More EEH work from Gavin to remove its dependency on device_nodes.
      
       - Memory hotplug implemented entirely in the kernel from Nathan
         Fontenot.
      
       - Removal of redundant CONFIG_PPC_OF by Kevin Hao.
      
       - Rewrite of VPHN parsing logic & tests from Greg Kurz.
      
       - A fix from Nish Aravamudan to reduce memory usage by clamping
         nodes_possible_map.
      
       - Support for pstore on powernv from Hari Bathini.
      
       - Removal of old powerpc specific byte swap routines by David Gibson.
      
       - Fix from Vasant Hegde to prevent the flash driver telling you it was
         flashing your firmware when it wasn't.
      
       - Patch from Ben Herrenschmidt to add an OPAL heartbeat driver.
      
       - Fix for an oops causing get/put_cpu_var() imbalance in perf by Jan
         Stancek.
      
       - Some fixes for migration from Tyrel Datwyler.
      
       - A new syscall to switch the cpu endian by Michael Ellerman.
      
       - Large series from Wei Yang to implement SRIOV, reviewed and acked by
         Bjorn.
      
       - A fix for the OPAL sensor driver from Cédric Le Goater.
      
       - Fixes to get STRICT_MM_TYPECHECKS building again by Michael Ellerman.
      
       - Large series from Daniel Axtens to make our PCI hooks per PHB rather
         than per machine.
      
       - Small patch from Sam Bobroff to explicitly abort non-suspended
         transactions on syscalls, plus a test to exercise it.
      
       - Numerous reworks and fixes for the 24x7 PMU from Sukadev Bhattiprolu.
      
       - Small patch to enable the hard lockup detector from Anton Blanchard.
      
       - Fix from Dave Olson for missing L2 cache information on some CPUs.
      
       - Some fixes from Michael Ellerman to get Cell machines booting again.
      
       - Freescale updates from Scott: Highlights include BMan device tree
         nodes, an MSI erratum workaround, a couple minor performance
         improvements, config updates, and misc fixes/cleanup.
      
      * tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux: (196 commits)
        powerpc/powermac: Fix build error seen with powermac smp builds
        powerpc/pseries: Fix compile of memory hotplug without CONFIG_MEMORY_HOTREMOVE
        powerpc: Remove PPC32 code from pseries specific find_and_init_phbs()
        powerpc/cell: Fix iommu breakage caused by controller_ops change
        powerpc/eeh: Fix crash in eeh_add_device_early() on Cell
        powerpc/perf: Cap 64bit userspace backtraces to PERF_MAX_STACK_DEPTH
        powerpc/perf/hv-24x7: Fail 24x7 initcall if create_events_from_catalog() fails
        powerpc/pseries: Correct memory hotplug locking
        powerpc: Fix missing L2 cache size in /sys/devices/system/cpu
        powerpc: Add ppc64 hard lockup detector support
        oprofile: Disable oprofile NMI timer on ppc64
        powerpc/perf/hv-24x7: Add missing put_cpu_var()
        powerpc/perf/hv-24x7: Break up single_24x7_request
        powerpc/perf/hv-24x7: Define update_event_count()
        powerpc/perf/hv-24x7: Whitespace cleanup
        powerpc/perf/hv-24x7: Define add_event_to_24x7_request()
        powerpc/perf/hv-24x7: Rename hv_24x7_event_update
        powerpc/perf/hv-24x7: Move debug prints to separate function
        powerpc/perf/hv-24x7: Drop event_24x7_request()
        powerpc/perf/hv-24x7: Use pr_devel() to log message
        ...
      
      Conflicts:
      	tools/testing/selftests/powerpc/Makefile
      	tools/testing/selftests/powerpc/tm/Makefile
      d19d5efd
  2. 16 4月, 2015 38 次提交