1. 06 Oct, 2012 2 commits
    • Linus Torvalds's avatar
      Merge branch 'slab/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux · 125b79d7
      Linus Torvalds authored
      Pull SLAB changes from Pekka Enberg:
       "New and noteworthy:
      
        * More SLAB allocator unification patches from Christoph Lameter and
          others.  This paves the way for slab memcg patches that hopefully
          will land in v3.8.
      
        * SLAB tracing improvements from Ezequiel Garcia.
      
        * Kernel tainting upon SLAB corruption from Dave Jones.
      
        * Miscellanous SLAB allocator bug fixes and improvements from various
          people."
      
      * 'slab/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux: (43 commits)
        slab: Fix build failure in __kmem_cache_create()
        slub: init_kmem_cache_cpus() and put_cpu_partial() can be static
        mm/slab: Fix kmem_cache_alloc_node_trace() declaration
        Revert "mm/slab: Fix kmem_cache_alloc_node_trace() declaration"
        mm, slob: fix build breakage in __kmalloc_node_track_caller
        mm/slab: Fix kmem_cache_alloc_node_trace() declaration
        mm/slab: Fix typo _RET_IP -> _RET_IP_
        mm, slub: Rename slab_alloc() -> slab_alloc_node() to match SLAB
        mm, slab: Rename __cache_alloc() -> slab_alloc()
        mm, slab: Match SLAB and SLUB kmem_cache_alloc_xxx_trace() prototype
        mm, slab: Replace 'caller' type, void* -> unsigned long
        mm, slob: Add support for kmalloc_track_caller()
        mm, slab: Remove silly function slab_buffer_size()
        mm, slob: Use NUMA_NO_NODE instead of -1
        mm, sl[au]b: Taint kernel when we detect a corrupted slab
        slab: Only define slab_error for DEBUG
        slab: fix the DEADLOCK issue on l3 alien lock
        slub: Zero initial memory segment for kmem_cache and kmem_cache_node
        Revert "mm/sl[aou]b: Move sysfs_slab_add to common"
        mm/sl[aou]b: Move kmem_cache refcounting to common code
        ...
      125b79d7
    • Linus Torvalds's avatar
      Merge tag 'stable/for-linus-3.7-arm-tag' of... · f1c6872e
      Linus Torvalds authored
      Merge tag 'stable/for-linus-3.7-arm-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
      
      Pull ADM Xen support from Konrad Rzeszutek Wilk:
      
        Features:
         * Allow a Linux guest to boot as initial domain and as normal guests
           on Xen on ARM (specifically ARMv7 with virtualized extensions).  PV
           console, block and network frontend/backends are working.
        Bug-fixes:
         * Fix compile linux-next fallout.
         * Fix PVHVM bootup crashing.
      
        The Xen-unstable hypervisor (so will be 4.3 in a ~6 months), supports
        ARMv7 platforms.
      
        The goal in implementing this architecture is to exploit the hardware
        as much as possible.  That means use as little as possible of PV
        operations (so no PV MMU) - and use existing PV drivers for I/Os
        (network, block, console, etc).  This is similar to how PVHVM guests
        operate in X86 platform nowadays - except that on ARM there is no need
        for QEMU.  The end result is that we share a lot of the generic Xen
        drivers and infrastructure.
      
        Details on how to compile/boot/etc are available at this Wiki:
      
          http://wiki.xen.org/wiki/Xen_ARMv7_with_Virtualization_Extensions
      
        and this blog has links to a technical discussion/presentations on the
        overall architecture:
      
          http://blog.xen.org/index.php/2012/09/21/xensummit-sessions-new-pvh-virtualisation-mode-for-arm-cortex-a15arm-servers-and-x86/
      
      * tag 'stable/for-linus-3.7-arm-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: (21 commits)
        xen/xen_initial_domain: check that xen_start_info is initialized
        xen: mark xen_init_IRQ __init
        xen/Makefile: fix dom-y build
        arm: introduce a DTS for Xen unprivileged virtual machines
        MAINTAINERS: add myself as Xen ARM maintainer
        xen/arm: compile netback
        xen/arm: compile blkfront and blkback
        xen/arm: implement alloc/free_xenballooned_pages with alloc_pages/kfree
        xen/arm: receive Xen events on ARM
        xen/arm: initialize grant_table on ARM
        xen/arm: get privilege status
        xen/arm: introduce CONFIG_XEN on ARM
        xen: do not compile manage, balloon, pci, acpi, pcpu and cpu_hotplug on ARM
        xen/arm: Introduce xen_ulong_t for unsigned long
        xen/arm: Xen detection and shared_info page mapping
        docs: Xen ARM DT bindings
        xen/arm: empty implementation of grant_table arch specific functions
        xen/arm: sync_bitops
        xen/arm: page.h definitions
        xen/arm: hypercalls
        ...
      f1c6872e
  2. 05 Oct, 2012 38 commits