Skip to content
  1. Feb 24, 2013
  2. Feb 22, 2013
    • Linus Torvalds's avatar
      Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 2ef14f46
      Linus Torvalds authored
      Pull x86 mm changes from Peter Anvin:
       "This is a huge set of several partly interrelated (and concurrently
        developed) changes, which is why the branch history is messier than
        one would like.
      
        The *really* big items are two humonguous patchsets mostly developed
        by Yinghai Lu at my request, which completely revamps the way we
        create initial page tables.  In particular, rather than estimating how
        much memory we will need for page tables and then build them into that
        memory -- a calculation that has shown to be incredibly fragile -- we
        now build them (on 64 bits) with the aid of a "pseudo-linear mode" --
        a #PF handler which creates temporary page tables on demand.
      
        This has several advantages:
      
        1. It makes it much easier to support things that need access to data
           very early (a followon patchset uses this to load microcode way
           early in the kernel startup).
      
        2. It allows the kernel and all the kernel data objects to be invoked
           from above the 4 GB limit.  This allows kdump to work on very large
           systems.
      
        3. It greatly reduces the difference between Xen and native (Xen's
           equivalent of the #PF handler are the temporary page tables created
           by the domain builder), eliminating a bunch of fragile hooks.
      
        The patch series also gets us a bit closer to W^X.
      
        Additional work in this pull is the 64-bit get_user() work which you
        were also involved with, and a bunch of cleanups/speedups to
        __phys_addr()/__pa()."
      
      * 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (105 commits)
        x86, mm: Move reserving low memory later in initialization
        x86, doc: Clarify the use of asm("%edx") in uaccess.h
        x86, mm: Redesign get_user with a __builtin_choose_expr hack
        x86: Be consistent with data size in getuser.S
        x86, mm: Use a bitfield to mask nuisance get_user() warnings
        x86/kvm: Fix compile warning in kvm_register_steal_time()
        x86-32: Add support for 64bit get_user()
        x86-32, mm: Remove reference to alloc_remap()
        x86-32, mm: Remove reference to resume_map_numa_kva()
        x86-32, mm: Rip out x86_32 NUMA remapping code
        x86/numa: Use __pa_nodebug() instead
        x86: Don't panic if can not alloc buffer for swiotlb
        mm: Add alloc_bootmem_low_pages_nopanic()
        x86, 64bit, mm: hibernate use generic mapping_init
        x86, 64bit, mm: Mark data/bss/brk to nx
        x86: Merge early kernel reserve for 32bit and 64bit
        x86: Add Crash kernel low reservation
        x86, kdump: Remove crashkernel range find limit for 64bit
        memblock: Add memblock_mem_size()
        x86, boot: Not need to check setup_header version for setup_data
        ...
      2ef14f46
    • Linus Torvalds's avatar
      Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · cb715a83
      Linus Torvalds authored
      Pull x86 cpu updates from Peter Anvin:
       "This is a corrected attempt at the x86/cpu branch, this time with the
        fixes in that makes it not break on KVM (current or past), or any
        other virtualizer which traps on this configuration.
      
        Again, the biggest change here is enabling the WC+ memory type on AMD
        processors, if the BIOS doesn't."
      
      * 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, kvm: Add MSR_AMD64_BU_CFG2 to the list of ignored MSRs
        x86, cpu, amd: Fix WC+ workaround for older virtual hosts
        x86, AMD: Enable WC+ memory type on family 10 processors
        x86, AMD: Clean up init_amd()
        x86/process: Change %8s to %s for pr_warn() in release_thread()
        x86/cpu/hotplug: Remove CONFIG_EXPERIMENTAL dependency
      cb715a83
    • Linus Torvalds's avatar
      Merge tag 'please-pull-misc-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux · 27ea6dfd
      Linus Torvalds authored
      Pull misc ia64 bits from Tony Luck.
      
      * tag 'please-pull-misc-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
        MAINTAINERS: update SGI & ia64 Altix stuff
        sysctl: Enable IA64 "ignore-unaligned-usertrap" to be used cross-arch
      27ea6dfd
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · 81ec44a6
      Linus Torvalds authored
      Pull s390 update from Martin Schwidefsky:
       "The most prominent change in this patch set is the software dirty bit
        patch for s390.  It removes __HAVE_ARCH_PAGE_TEST_AND_CLEAR_DIRTY and
        the page_test_and_clear_dirty primitive which makes the common memory
        management code a bit less obscure.
      
        Heiko fixed most of the PCI related fallout, more often than not
        missing GENERIC_HARDIRQS dependencies.  Notable is one of the 3270
        patches which adds an export to tty_io to be able to resize a tty.
      
        The rest is the usual bunch of cleanups and bug fixes."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (42 commits)
        s390/module: Add missing R_390_NONE relocation type
        drivers/gpio: add missing GENERIC_HARDIRQ dependency
        drivers/input: add couple of missing GENERIC_HARDIRQS dependencies
        s390/cleanup: rename SPP to LPP
        s390/mm: implement software dirty bits
        s390/mm: Fix crst upgrade of mmap with MAP_FIXED
        s390/linker skript: discard exit.data at runtime
        drivers/media: add missing GENERIC_HARDIRQS dependency
        s390/bpf,jit: add vlan tag support
        drivers/net,AT91RM9200: add missing GENERIC_HARDIRQS dependency
        iucv: fix kernel panic at reboot
        s390/Kconfig: sort list of arch selected config options
        phylib: remove !S390 dependeny from Kconfig
        uio: remove !S390 dependency from Kconfig
        dasd: fix sysfs cleanup in dasd_generic_remove
        s390/pci: fix hotplug module init
        s390/pci: cleanup clp page allocation
        s390/pci: cleanup clp inline assembly
        s390/perf: cpum_cf: fallback to software sampling events
        s390/mm: provide PAGE_SHARED define
        ...
      81ec44a6