Permalink
Commits on Jun 9, 2012
  1. Linux 3.5-rc2

    torvalds committed Jun 9, 2012
Commits on Jun 8, 2012
  1. mm, oom: fix badness score underflow

    David Rientjes committed with torvalds Jun 8, 2012
    If the privileges given to root threads (3% of allowable memory) or a
    negative value of /proc/pid/oom_score_adj happen to exceed the amount of
    rss of a thread, its badness score overflows as a result of commit
    a7f638f ("mm, oom: normalize oom scores to oom_score_adj scale only
    for userspace").
    
    Fix this by making the type signed and return 1, meaning the thread is
    still eligible for kill, if the value is negative.
    
    Reported-by: Dave Jones <davej@redhat.com>
    Acked-by: Oleg Nesterov <oleg@redhat.com>
    Signed-off-by: David Rientjes <rientjes@google.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  2. Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm…

    torvalds committed Jun 8, 2012
    …/linux/kernel/git/tip/tip
    
    Pull scheduler fixes from Ingo Molnar.
    
    * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
      sched: Fix the relax_domain_level boot parameter
      sched: Validate assumptions in sched_init_numa()
      sched: Always initialize cpu-power
      sched: Fix domain iteration
      sched/rt: Fix lockdep annotation within find_lock_lowest_rq()
      sched/numa: Load balance between remote nodes
      sched/x86: Calculate booted cores after construction of sibling_mask
  3. sched/fair: fix lots of kernel-doc warnings

    Randy Dunlap committed with torvalds Jun 8, 2012
    Fix lots of new kernel-doc warnings in kernel/sched/fair.c:
    
      Warning(kernel/sched/fair.c:3625): No description found for parameter 'env'
      Warning(kernel/sched/fair.c:3625): Excess function parameter 'sd' description in 'update_sg_lb_stats'
      Warning(kernel/sched/fair.c:3735): No description found for parameter 'env'
      Warning(kernel/sched/fair.c:3735): Excess function parameter 'sd' description in 'update_sd_pick_busiest'
      Warning(kernel/sched/fair.c:3735): Excess function parameter 'this_cpu' description in 'update_sd_pick_busiest'
      .. more warnings
    
    Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
    Cc: Ingo Molnar <mingo@redhat.com>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  4. Revert "drm/i915/crt: Do not rely upon the HPD presence pin"

    torvalds committed Jun 8, 2012
    This reverts commit 9e612a0.
    
    It incorrectly finds VGA connectors where none are attached, apparently
    not noticing that nothing replied to the EDID queries, and happily using
    the default EDID modes that have nothing to do with actual hardware.
    
    That in turn then causes X to fall down to the lowest common
    denominator, which is usually the default 1024x768 mode that is in the
    default EDID and pretty much anything supports).
    
    I'd suggest that if not relying on the HDP pin, the code should at least
    check whether it gets valid EDID data back, rather than just assume
    there's something on the VGA connector.
    
    Cc: Dave Airlie <airlied@linux.ie>
    Cc: Chris Wilson <chris@chris-wilson.co.uk>
    Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  5. Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kern…

    torvalds committed Jun 8, 2012
    …el/git/tytso/ext4
    
    Pull ext4 bug fixes from Theodore Ts'o:
     "This update contains two bug fixes, both destined for the stable tree.
      Perhaps the most important is one which fixes ext4 when used with file
      systems originally formatted for use with ext3, but then later
      converted to take advantage of ext4."
    
    * tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
      ext4: don't set i_flags in EXT4_IOC_SETFLAGS
      ext4: fix the free blocks calculation for ext3 file systems w/ uninit_bg
  6. Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git…

    torvalds committed Jun 8, 2012
    …/paulus/powerpc
    
    Pull powerpc fixes from Paul Mackerras:
     "Two small fixes for powerpc:
       - a fix for a regression since 3.2 that causes 4-second (or longer)
         pauses
       - a fix for a potential oops when loading kernel modules on 32-bit
         embedded systems."
    
    * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
      powerpc: Fix kernel panic during kernel module load
      powerpc/time: Sanity check of decrementer expiration is necessary
  7. Merge tag 'upstream-3.5-rc2' of git://git.infradead.org/linux-ubifs

    torvalds committed Jun 8, 2012
    Pull UBI/UBIFS fixes from Artem Bityutskiy:
     "Fix UBI and UBIFS - they refuse to work without debugfs.  This was
      broken by the 3.5-rc1 UBI/UBIFS changes when we removed the debugging
      Kconfig switches.
    
      Also, correct locking in 'ubi_wl_flush()' - it was extended to support
      flushing a specific LEB in 3.5-rc1, and the locking was sub-optimal."
    
    * tag 'upstream-3.5-rc2' of git://git.infradead.org/linux-ubifs:
      UBI: correct ubi_wl_flush locking
      UBIFS: fix debugfs-less systems support
      UBI: fix debugfs-less systems support
  8. Revert "vfs: stop d_splice_alias creating directory aliases"

    torvalds committed Jun 8, 2012
    This reverts commit 7732a55 (and commit
    3f50fff, which was a follow-up
    cleanup).
    
    We're chasing an elusive bug that Dave Jones can apparently reproduce
    using his system call fuzzer tool, and that looks like some kind of
    locking ordering problem on the directory i_mutex chain.  Our i_mutex
    locking is rather complex, and depends on the topological ordering of
    the directories, which is why we have been very wary of splicing
    directory entries around.
    
    Of course, we really don't want to ever see aliased unconnected
    directories anyway, so none of this should ever happen, but this revert
    aims to basically get us back to a known older state.
    
    Bruce points to some of the previous discussion at
    
           http://marc.info/?i=<20110310105821.GE22723@ZenIV.linux.org.uk>
    
    and in particular a long post from Neil:
    
           http://marc.info/?i=<20110311150749.2fa2be66@notabene.brown>
    
    It should be noted that it's possible that Dave's problems come from
    other changes altohgether, including possibly just the fact that Dave
    constantly is teachning his fuzzer new tricks.  So what appears to be a
    new bug could in fact be an old one that just gets newly triggered, but
    reverting these patches as "still under heavy discussion" is the right
    thing regardless.
    
    Requested-by: Al Viro <viro@zeniv.linux.org.uk>
    Acked-by: J. Bruce Fields <bfields@fieldses.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  9. Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/l…

    torvalds committed Jun 8, 2012
    …inux/kernel/git/tip/tip
    
    Pull x86 fixes from Ingo Molnar.
    
    * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
      x86/nmi: Fix section mismatch warnings on 32-bit
      x86/uv: Fix UV2 BAU legacy mode
      x86/mm: Only add extra pages count for the first memory range during pre-allocation early page table space
      x86, efi stub: Add .reloc section back into image
      x86/ioapic: Fix NULL pointer dereference on CPU hotplug after disabling irqs
      x86/reboot: Fix a warning message triggered by stop_other_cpus()
      x86/intel/moorestown: Change intel_scu_devices_create() to __devinit
      x86/numa: Set numa_nodes_parsed at acpi_numa_memory_affinity_init()
      x86/gart: Fix kmemleak warning
      x86: mce: Add the dropped timer interval init back
      x86/mce: Fix the MCE poll timer logic
  10. Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/…

    torvalds committed Jun 8, 2012
    …linux/kernel/git/tip/tip
    
    Pull perf fixes from Ingo Molnar:
     "A bit larger than what I'd wish for - half of it is due to hw driver
      updates to Intel Ivy-Bridge which info got recently released,
      cycles:pp should work there now too, amongst other things.  (but we
      are generally making exceptions for hardware enablement of this type.)
    
      There are also callchain fixes in it - responding to mostly
      theoretical (but valid) concerns.  The tooling side sports perf.data
      endianness/portability fixes which did not make it for the merge
      window - and various other fixes as well."
    
    * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (26 commits)
      perf/x86: Check user address explicitly in copy_from_user_nmi()
      perf/x86: Check if user fp is valid
      perf: Limit callchains to 127
      perf/x86: Allow multiple stacks
      perf/x86: Update SNB PEBS constraints
      perf/x86: Enable/Add IvyBridge hardware support
      perf/x86: Implement cycles:p for SNB/IVB
      perf/x86: Fix Intel shared extra MSR allocation
      x86/decoder: Fix bsr/bsf/jmpe decoding with operand-size prefix
      perf: Remove duplicate invocation on perf_event_for_each
      perf uprobes: Remove unnecessary check before strlist__delete
      perf symbols: Check for valid dso before creating map
      perf evsel: Fix 32 bit values endianity swap for sample_id_all header
      perf session: Handle endianity swap on sample_id_all header data
      perf symbols: Handle different endians properly during symbol load
      perf evlist: Pass third argument to ioctl explicitly
      perf tools: Update ioctl documentation for PERF_IOC_FLAG_GROUP
      perf tools: Make --version show kernel version instead of pull req tag
      perf tools: Check if callchain is corrupted
      perf callchain: Make callchain cursors TLS
      ...
  11. Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

    torvalds committed Jun 8, 2012
    Pull drm intel and exynos fixes from Dave Airlie:
     "A bunch of fixes for Intel and exynos, nothing too major, a new intel
      PCI ID, and a fix for CRT detection."
    
    * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
      drm/i915: pch_irq_handler -> {ibx, cpt}_irq_handler
      char/agp: add another Ironlake host bridge
      drm/i915: fix up ivb plane 3 pageflips
      drm/exynos: fixed blending for hdmi graphic layer
      drm/exynos: Remove dummy encoder get_crtc operation implementation
      drm/exynos: Keep a reference to frame buffer GEM objects
      drm/exynos: Don't cast GEM object to Exynos GEM object when not needed
      drm/exynos: DRIVER_BUS_PLATFORM is not a driver feature
      drm/exynos: fixed size type.
      drm/exynos: Use DRM_FORMAT_{NV12, YUV420} instead of DRM_FORMAT_{NV12M, YUV420M}
      drm/i915: hold forcewake around ring hw init
      drm/i915: Mark the ringbuffers as being in the GTT domain
      drm/i915/crt: Do not rely upon the HPD presence pin
      drm/i915: Reset last_retired_head when resetting ring
  12. Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/sc…

    torvalds committed Jun 8, 2012
    …m/linux/kernel/git/tip/tip
    
    Pull leap second timer fix from Thomas Gleixner.
    
    * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
      timekeeping: Fix CLOCK_MONOTONIC inconsistency during leapsecond
  13. Merge tag 'moduleparam-for-linus' of git://git.kernel.org/pub/scm/lin…

    torvalds committed Jun 8, 2012
    …ux/kernel/git/rusty/linux-2.6-for-linus
    
    Pull minor module param fixes from Rusty Russell:
     "One bugfix for multiple moduleparam levels, one removal of overzealous
      printk."
    
    * tag 'moduleparam-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
      init: Drop initcall level output
      module_param: stop double-calling parameters.
  14. x86/nmi: Fix section mismatch warnings on 32-bit

    dzickusrh committed with Ingo Molnar Jun 6, 2012
    It was reported that compiling for 32-bit caused a bunch of
    section mismatch warnings:
    
     VDSOSYM arch/x86/vdso/vdso32-syms.lds
      LD      arch/x86/vdso/built-in.o
      LD      arch/x86/built-in.o
    
     WARNING: arch/x86/built-in.o(.data+0x5af0): Section mismatch in
     reference from the variable test_nmi_ipi_callback_na.10451 to
     the function .init.text:test_nmi_ipi_callback() [...]
    
     WARNING: arch/x86/built-in.o(.data+0x5b04): Section mismatch in
     reference from the variable nmi_unk_cb_na.10399 to the function
     .init.text:nmi_unk_cb() The variable nmi_unk_cb_na.10399
     references the function __init nmi_unk_cb() [...]
    
    Both of these are attributed to the internal representation of
    the nmiaction struct created during register_nmi_handler.  The
    reason for this is that those structs are not defined in the
    init section whereas the rest of the code in nmi_selftest.c is.
    
    To resolve this, I created a new #define,
    register_nmi_handler_initonly, that tags the struct as
    __initdata to resolve the mismatch.  This #define should only be
    used in rare situations where the register/unregister is called
    during init of the kernel.
    
    Big thanks to Jan Beulich for decoding this for me as I didn't
    have a clue what was going on.
    
    Reported-by: Witold Baryluk <baryluk@smp.if.uj.edu.pl>
    Tested-by: Witold Baryluk <baryluk@smp.if.uj.edu.pl>
    Cc: Jan Beulich <JBeulich@suse.com>
    Signed-off-by: Don Zickus <dzickus@redhat.com>
    Link: http://lkml.kernel.org/r/1338991542-23000-1-git-send-email-dzickus@redhat.com
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
  15. powerpc: Fix kernel panic during kernel module load

    Steffen Rumler committed with paulusmack Jun 6, 2012
    This fixes a problem which can causes kernel oopses while loading
    a kernel module.
    
    According to the PowerPC EABI specification, GPR r11 is assigned
    the dedicated function to point to the previous stack frame.
    In the powerpc-specific kernel module loader, do_plt_call()
    (in arch/powerpc/kernel/module_32.c), GPR r11 is also used
    to generate trampoline code.
    
    This combination crashes the kernel, in the case where the compiler
    chooses to use a helper function for saving GPRs on entry, and the
    module loader has placed the .init.text section far away from the
    .text section, meaning that it has to generate a trampoline for
    functions in the .init.text section to call the GPR save helper.
    Because the trampoline trashes r11, references to the stack frame
    using r11 can cause an oops.
    
    The fix just uses GPR r12 instead of GPR r11 for generating the
    trampoline code.  According to the statements from Freescale, this is
    safe from an EABI perspective.
    
    I've tested the fix for kernel 2.6.33 on MPC8541.
    
    Cc: stable@vger.kernel.org
    Signed-off-by: Steffen Rumler <steffen.rumler.ext@nsn.com>
    [paulus@samba.org: reworded the description]
    Signed-off-by: Paul Mackerras <paulus@samba.org>
  16. x86/uv: Fix UV2 BAU legacy mode

    cpwickman committed with Ingo Molnar Jun 7, 2012
    The SGI Altix UV2 BAU (Broadcast Assist Unit) as used for
    tlb-shootdown (selective broadcast mode) always uses UV2
    broadcast descriptor format. There is no need to clear the
    'legacy' (UV1) mode, because the hardware always uses UV2 mode
    for selective broadcast.
    
    But the BIOS uses general broadcast and legacy mode, and the
    hardware pays attention to the legacy mode bit for general
    broadcast. So the kernel must not clear that mode bit.
    
    Signed-off-by: Cliff Wickman <cpw@sgi.com>
    Cc: <stable@kernel.org>
    Link: http://lkml.kernel.org/r/E1SccoO-0002Lh-Cb@eag09.americas.sgi.com
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
  17. x86/mm: Only add extra pages count for the first memory range during …

    Yinghai Lu committed with Ingo Molnar Jun 6, 2012
    …pre-allocation early page table space
    
    Robin found this regression:
    
    | I just tried to boot an 8TB system.  It fails very early in boot with:
    | Kernel panic - not syncing: Cannot find space for the kernel page tables
    
    git bisect commit 722bc6b.
    
    A git revert of that commit does boot past that point on the 8TB
    configuration.
    
    That commit will add up extra pages for all memory range even
    above 4g.
    
    Try to limit that extra page count adding to first entry only.
    
    Bisected-by: Robin Holt <holt@sgi.com>
    Tested-by: Robin Holt <holt@sgi.com>
    Signed-off-by: Yinghai Lu <yinghai@kernel.org>
    Cc: WANG Cong <xiyou.wangcong@gmail.com>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Link: http://lkml.kernel.org/r/CAE9FiQUj3wyzQxtq9yzBNc9u220p8JZ1FYHG7t%3DMOzJ%3D9BZMYA@mail.gmail.com
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
  18. Merge branch 'exynos-drm-fixes' of git://git.infradead.org/users/kmpa…

    Dave Airlie committed Jun 8, 2012
    …rk/linux-samsung into drm-fixes
    
    * 'exynos-drm-fixes' of git://git.infradead.org/users/kmpark/linux-samsung:
      drm/exynos: fixed blending for hdmi graphic layer
      drm/exynos: Remove dummy encoder get_crtc operation implementation
      drm/exynos: Keep a reference to frame buffer GEM objects
      drm/exynos: Don't cast GEM object to Exynos GEM object when not needed
      drm/exynos: DRIVER_BUS_PLATFORM is not a driver feature
      drm/exynos: fixed size type.
      drm/exynos: Use DRM_FORMAT_{NV12, YUV420} instead of DRM_FORMAT_{NV12M, YUV420M}
  19. Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danve…

    Dave Airlie committed Jun 8, 2012
    …t/drm-intel into drm-fixes
    
    * 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel:
      drm/i915: pch_irq_handler -> {ibx, cpt}_irq_handler
      char/agp: add another Ironlake host bridge
      drm/i915: fix up ivb plane 3 pageflips
      drm/i915: hold forcewake around ring hw init
      drm/i915: Mark the ringbuffers as being in the GTT domain
      drm/i915/crt: Do not rely upon the HPD presence pin
      drm/i915: Reset last_retired_head when resetting ring
  20. init: Drop initcall level output

    Borislav Petkov committed with rustyrussell Jun 1, 2012
    9fb48c7 ("params: add 3rd arg to option handler callback
    signature") added similar lines to dmesg:
    
    initlevel:0=early, 4 registered initcalls
    initlevel:1=core, 31 registered initcalls
    initlevel:2=postcore, 11 registered initcalls
    initlevel:3=arch, 7 registered initcalls
    initlevel:4=subsys, 40 registered initcalls
    initlevel:5=fs, 30 registered initcalls
    initlevel:6=device, 250 registered initcalls
    initlevel:7=late, 35 registered initcalls
    
    but they don't contain any info for the general user staring at dmesg.
    I'm very doubtful the count of initcalls registered per level helps
    anyone so drop that output completely.
    
    Cc: Jim Cromie <jim.cromie@gmail.com>
    Cc: Rusty Russell <rusty@rustcorp.com.au>
    Cc: Jason Baron <jbaron@redhat.com>
    Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
  21. module_param: stop double-calling parameters.

    rustyrussell committed Jun 8, 2012
    Commit 026cee0 "params:
    <level>_initcall-like kernel parameters" set old-style module
    parameters to level 0.  And we call those level 0 calls where we used
    to, early in start_kernel().
    
    We also loop through the initcall levels and call the levelled
    module_params before the corresponding initcall.  Unfortunately level
    0 is early_init(), so we call the standard module_param calls twice.
    
    (Turns out most things don't care, but at least ubi.mtd does).
    
    Change the level to -1 for standard module_param calls.
    
    Reported-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
    Cc: stable@kernel.org
  22. powerpc/time: Sanity check of decrementer expiration is necessary

    paulusmack committed Jun 1, 2012
    This reverts 68568ad ("powerpc/time: Remove unnecessary sanity check
    of decrementer expiration").  We do need to check whether we have reached
    the expiration time of the next event, because we sometimes get an early
    decrementer interrupt, most notably when we set the decrementer to 1 in
    arch_irq_work_raise().  The effect of not having the sanity check is that
    if timer_interrupt() gets called early, we leave the decrementer set to
    its maximum value, which means we then don't get any more decrementer
    interrupts for about 4 seconds (or longer, depending on timebase
    frequency).  I saw these pauses as a consequence of getting a stray
    hypervisor decrementer interrupt left over from exiting a KVM guest.
    
    This isn't quite a straight revert because of changes to the surrounding
    code, but it restores the same algorithm as was previously used.
    
    Cc: stable@vger.kernel.org
    Acked-by: Anton Blanchard <anton@samba.org>
    Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Paul Mackerras <paulus@samba.org>
  23. Revert "mm: correctly synchronize rss-counters at exit/exec"

    torvalds committed Jun 8, 2012
    This reverts commit 40af1bb.
    
    It's horribly and utterly broken for at least the following reasons:
    
     - calling sync_mm_rss() from mmput() is fundamentally wrong, because
       there's absolutely no reason to believe that the task that does the
       mmput() always does it on its own VM.  Example: fork, ptrace, /proc -
       you name it.
    
     - calling it *after* having done mmdrop() on it is doubly insane, since
       the mm struct may well be gone now.
    
     - testing mm against NULL before you call it is insane too, since a
    NULL mm there would have caused oopses long before.
    
    .. and those are just the three bugs I found before I decided to give up
    looking for me and revert it asap.  I should have caught it before I
    even took it, but I trusted Andrew too much.
    
    Cc: Konstantin Khlebnikov <khlebnikov@openvz.org>
    Cc: Markus Trippelsdorf <markus@trippelsdorf.de>
    Cc: Hugh Dickins <hughd@google.com>
    Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    Cc: Oleg Nesterov <oleg@redhat.com>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Commits on Jun 7, 2012
  1. ext4: don't set i_flags in EXT4_IOC_SETFLAGS

    taoma-tm committed with tytso Jun 7, 2012
    Commit 7990696 uses the ext4_{set,clear}_inode_flags() functions to
    change the i_flags automatically but fails to remove the error setting
    of i_flags.  So we still have the problem of trashing state flags.
    Fix this by removing the assignment.
    
    Signed-off-by: Tao Ma <boyu.mt@taobao.com>
    Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
    Cc: stable@kernel.org
  2. ext4: fix the free blocks calculation for ext3 file systems w/ uninit_bg

    tytso committed Jun 7, 2012
    Ext3 filesystems that are converted to use as many ext4 file system
    features as possible will enable uninit_bg to speed up e2fsck times.
    These file systems will have a native ext3 layout of inode tables and
    block allocation bitmaps (as opposed to ext4's flex_bg layout).
    Unfortunately, in these cases, when first allocating a block in an
    uninitialized block group, ext4 would incorrectly calculate the number
    of free blocks in that block group, and then errorneously report that
    the file system was corrupt:
    
    EXT4-fs error (device vdd): ext4_mb_generate_buddy:741: group 30, 32254 clusters in bitmap, 32258 in gd
    
    This problem can be reproduced via:
    
        mke2fs -q -t ext4 -O ^flex_bg /dev/vdd 5g
        mount -t ext4 /dev/vdd /mnt
        fallocate -l 4600m /mnt/test
    
    The problem was caused by a bone headed mistake in the check to see if a
    particular metadata block was part of the block group.
    
    Many thanks to Kees Cook for finding and bisecting the buggy commit
    which introduced this bug (commit fd034a8, present since v3.2).
    
    Reported-by: Sander Eikelenboom <linux@eikelenboom.it>
    Reported-by: Kees Cook <keescook@chromium.org>
    Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
    Tested-by: Kees Cook <keescook@chromium.org>
    Cc: stable@kernel.org
  3. Merge branch 'akpm' (Andrew's fixups)

    torvalds committed Jun 7, 2012
    Merge random fixes from Andrew Morton.
    
    * emailed from Andrew Morton <akpm@linux-foundation.org>: (11 patches)
      mm: correctly synchronize rss-counters at exit/exec
      btree: catch NULL value before it does harm
      btree: fix tree corruption in btree_get_prev()
      ipc: shm: restore MADV_REMOVE functionality on shared memory segments
      drivers/platform/x86/acerhdf.c: correct Boris' mail address
      c/r: prctl: drop VMA flags test on PR_SET_MM_ stack data assignment
      c/r: prctl: add ability to get clear_tid_address
      c/r: prctl: add minimal address test to PR_SET_MM
      c/r: prctl: update prctl_set_mm_exe_file() after mm->num_exe_file_vmas removal
      MAINTAINERS: whitespace fixes
      shmem: replace_page must flush_dcache and others
  4. mm: correctly synchronize rss-counters at exit/exec

    koct9i committed with torvalds Jun 7, 2012
    mm->rss_stat counters have per-task delta: task->rss_stat.  Before
    changing task->mm pointer the kernel must flush this delta with
    sync_mm_rss().
    
    do_exit() already calls sync_mm_rss() to flush the rss-counters before
    committing the rss statistics into task->signal->maxrss, taskstats,
    audit and other stuff.  Unfortunately the kernel does this before
    calling mm_release(), which can call put_user() for processing
    task->clear_child_tid.  So at this point we can trigger page-faults and
    task->rss_stat becomes non-zero again.  As a result mm->rss_stat becomes
    inconsistent and check_mm() will print something like this:
    
    | BUG: Bad rss-counter state mm:ffff88020813c380 idx:1 val:-1
    | BUG: Bad rss-counter state mm:ffff88020813c380 idx:2 val:1
    
    This patch moves sync_mm_rss() into mm_release(), and moves mm_release()
    out of do_exit() and calls it earlier.  After mm_release() there should
    be no pagefaults.
    
    [akpm@linux-foundation.org: tweak comment]
    Signed-off-by: Konstantin Khlebnikov <khlebnikov@openvz.org>
    Reported-by: Markus Trippelsdorf <markus@trippelsdorf.de>
    Cc: Hugh Dickins <hughd@google.com>
    Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    Cc: Oleg Nesterov <oleg@redhat.com>
    Cc: <stable@vger.kernel.org>		[3.4.x]
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  5. btree: catch NULL value before it does harm

    Joern Engel committed with torvalds Jun 7, 2012
    Storing NULL values in the btree is illegal and can lead to memory
    corruption and possible other fun as well.  Catch it on insert, instead
    of waiting for the inevitable.
    
    Signed-off-by: Joern Engel <joern@logfs.org>
    Signed-off-by: Roland Dreier <roland@purestorage.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  6. btree: fix tree corruption in btree_get_prev()

    rolandd committed with torvalds Jun 7, 2012
    The memory the parameter __key points to is used as an iterator in
    btree_get_prev(), so if we save off a bkey() pointer in retry_key and
    then assign that to __key, we'll end up corrupting the btree internals
    when we do eg
    
    	longcpy(__key, bkey(geo, node, i), geo->keylen);
    
    to return the key value.  What we should do instead is use longcpy() to
    copy the key value that retry_key points to __key.
    
    This can cause a btree to get corrupted by seemingly read-only
    operations such as btree_for_each_safe.
    
    [akpm@linux-foundation.org: avoid the double longcpy()]
    Signed-off-by: Roland Dreier <roland@purestorage.com>
    Acked-by: Joern Engel <joern@logfs.org>
    Cc: <stable@vger.kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  7. ipc: shm: restore MADV_REMOVE functionality on shared memory segments

    wildea01 committed with torvalds Jun 7, 2012
    Commit 17cf28a ("mm/fs: remove truncate_range") removed the
    truncate_range inode operation in favour of the fallocate file
    operation.
    
    When using SYSV IPC shared memory segments, calling madvise with the
    MADV_REMOVE advice on an area of shared memory will attempt to invoke
    the .fallocate function for the shm_file_operations, which is NULL and
    therefore returns -EOPNOTSUPP to userspace.  The previous behaviour
    would inherit the inode_operations from the underlying tmpfs file and
    invoke truncate_range there.
    
    This patch restores the previous behaviour by wrapping the underlying
    fallocate function in shm_fallocate, as we do for fsync.
    
    [hughd@google.com: use -ENOTSUPP in shm_fallocate()]
    Signed-off-by: Will Deacon <will.deacon@arm.com>
    Acked-by: Hugh Dickins <hughd@google.com>
    Signed-off-by: Hugh Dickins <hughd@google.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  8. drivers/platform/x86/acerhdf.c: correct Boris' mail address

    Borislav Petkov committed with torvalds Jun 7, 2012
    Correct mail address reference to a mail account which I actually read.
    
    Signed-off-by: Borislav Petkov <bp@alien8.de>
    Cc: Peter Feuerer <peter@piie.net>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  9. c/r: prctl: drop VMA flags test on PR_SET_MM_ stack data assignment

    cyrillos committed with torvalds Jun 7, 2012
    In commit b764375 ("procfs: mark thread stack correctly in
    proc/<pid>/maps") the stack allocated via clone() is marked in
    /proc/<pid>/maps as [stack:%d] thus it might be out of the former
    mm->start_stack/end_stack values (and even has some custom VMA flags
    set).
    
    So to be able to restore mm->start_stack/end_stack drop vma flags test,
    but still require the underlying VMA to exist.
    
    As always note this feature is under CONFIG_CHECKPOINT_RESTORE and
    requires CAP_SYS_RESOURCE to be granted.
    
    Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
    Cc: Oleg Nesterov <oleg@redhat.com>
    Acked-by: Kees Cook <keescook@chromium.org>
    Cc: Pavel Emelyanov <xemul@parallels.com>
    Cc: Serge Hallyn <serge.hallyn@canonical.com>
    Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  10. c/r: prctl: add ability to get clear_tid_address

    cyrillos committed with torvalds Jun 7, 2012
    Zero is written at clear_tid_address when the process exits.  This
    functionality is used by pthread_join().
    
    We already have sys_set_tid_address() to change this address for the
    current task but there is no way to obtain it from user space.
    
    Without the ability to find this address and dump it we can't restore
    pthread'ed apps which call pthread_join() once they have been restored.
    
    This patch introduces the PR_GET_TID_ADDRESS prctl option which allows
    the current process to obtain own clear_tid_address.
    
    This feature is available iif CONFIG_CHECKPOINT_RESTORE is set.
    
    [akpm@linux-foundation.org: fix prctl numbering]
    Signed-off-by: Andrew Vagin <avagin@openvz.org>
    Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
    Cc: Pedro Alves <palves@redhat.com>
    Cc: Oleg Nesterov <oleg@redhat.com>
    Cc: Pavel Emelyanov <xemul@parallels.com>
    Cc: Tejun Heo <tj@kernel.org>
    Acked-by: Kees Cook <keescook@chromium.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  11. c/r: prctl: add minimal address test to PR_SET_MM

    cyrillos committed with torvalds Jun 7, 2012
    Make sure the address being set is greater than mmap_min_addr (as
    suggested by Kees Cook).
    
    Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
    Acked-by: Kees Cook <keescook@chromium.org>
    Cc: Serge Hallyn <serge.hallyn@canonical.com>
    Cc: Tejun Heo <tj@kernel.org>
    Cc: Pavel Emelyanov <xemul@parallels.com>
    Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>