Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
tag: v2.6.33-rc8
Commits on Feb 12, 2010
  1. @torvalds

    Linux 2.6.33-rc8

    torvalds authored
  2. @torvalds

    Merge branch 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/g…

    torvalds authored
    …it/tiwai/sound-2.6
    
    * 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
      ALSA: hda - use WARN_ON_ONCE() for zero-division detection
  3. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/anholt/drm-intel
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel:
      drm/i915: hold ref on flip object until it completes
      drm/i915: Fix crash while aborting hibernation
      drm/i915: Correctly return -ENOMEM on allocation failure in cmdbuf ioctls.
      drm/i915: fix pipe source image setting in flip command
      drm/i915: fix flip done interrupt on Ironlake
      drm/i915: untangle page flip completion
      drm/i915: handle FBC and self-refresh better
      drm/i915: Increase fb alignment to 64k
      drm/i915: Update write_domains on active list after flush.
      drm/i915: Rework DPLL calculation parameters for Ironlake
  4. @tiwai

    ALSA: hda - use WARN_ON_ONCE() for zero-division detection

    tiwai authored
    Replace the zero-division warning message with WARN_ON_ONCE() per the
    advice by Linus.  This shouldn't happen, but if it happens, it's
    possible that the bug happens often due to buggy IRQs.
    
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
  5. @jkkm @torvalds

    parisc: fix tracing of signals

    jkkm authored torvalds committed
    Mike Frysinger pointed out that calling tracehook_signal_handler with
    stepping=0 missed testing the thread flags, resulting in not calling
    ptrace_notify. Fix this by testing if we're single stepping or branch
    stepping and setting the flag accordingly.
    
    Tested, seems to work.
    
    Reported-by: Mike Frysinger <vapier@gentoo.org>
    Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  6. @torvalds

    Merge branch 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/g…

    torvalds authored
    …it/tiwai/sound-2.6
    
    * 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
      ALSA: hda-intel: Avoid divide by zero crash
  7. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/lrg/voltage-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6:
      regulator/lp3971: vol_map out of bounds in lp3971_{ldo,dcdc}_set_voltage()
      regulator: Fix display of null constraints for regulators
  8. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes:
      GFS2: Fix bmap allocation corner-case bug
      GFS2: Fix error code
  9. @RoelKluin

    regulator/lp3971: vol_map out of bounds in lp3971_{ldo,dcdc}_set_volt…

    RoelKluin authored Liam Girdwood committed
    …age()
    
    After `for (val = LDO_VOL_MIN_IDX; val <= LDO_VOL_MAX_IDX; val++)', if no break
    occurs, val reaches LDO_VOL_MIN_IDX + 1, which is out of bounds for
    ldo45_voltage_map[] and ldo123_voltage_map[].
    
    Similarly BUCK_TARGET_VOL_MAX_IDX + 1 is out of bounds for buck_voltage_map[].
    
    Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
    Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
  10. @broonie

    regulator: Fix display of null constraints for regulators

    broonie authored Liam Girdwood committed
    If the regulator constraints are empty and there is no voltage
    reported then nothing will be added to the text displayed for the
    constraints, leading to random stack data being printed. This is
    unlikely to happen for practical regulators since most will at
    least report a voltage but should still be fixed.
    
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Cc: stable@kernel.org
    Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
  11. GFS2: Fix bmap allocation corner-case bug

    Steven Whitehouse authored
    This patch solves a corner case during allocation which occurs if both
    metadata (indirect) and data blocks are required but there is an
    obstacle in the filesystem (e.g. a resource group header or another
    allocated block) such that when the allocation is requested only
    enough blocks for the metadata are returned.
    
    By changing the exit condition of this loop, we ensure that a
    minimum of one data block will always be returned.
    
    Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
  12. GFS2: Fix error code

    Abhijith Das authored Steven Whitehouse committed
    We need this one-liner to signal the mount helper of the 'insufficient journals' condition.
    
    Signed-off-by: Abhijith Das <adas@redhat.com>
    Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Commits on Feb 11, 2010
  1. @torvalds

    Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/l…

    torvalds authored
    …inux/kernel/git/tmlind/linux-omap-2.6
    
    * 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
      OMAP: hsmmc: fix memory leak
  2. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/bp/bp
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
      amd64_edac: Do not falsely trigger kerneloops
  3. @torvalds

    Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

    torvalds authored
    * 'for-linus' of git://git.kernel.dk/linux-2.6-block:
      cciss: Make cciss_seq_show handle holes in the h->drv[] array
      cfq-iosched: split seeky coop queues after one slice
  4. @torvalds

    Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/n…

    torvalds authored
    …fs-2.6
    
    * 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
      NFS: Fix the mapping of the NFSERR_SERVERFAULT error
      NFS: Remove a redundant check for PageFsCache in nfs_migrate_page()
      NFS: Fix a bug in nfs_fscache_release_page()
  5. @torvalds

    Merge git://git.infradead.org/users/cbou/battery-2.6.33

    torvalds authored
    * git://git.infradead.org/users/cbou/battery-2.6.33:
      wm97xx_battery: Handle missing platform data gracefully
  6. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixe…

    torvalds authored
    …s-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
      [SCSI] qla2xxx: Obtain proper host structure during response-queue processing.
      [SCSI] compat_ioct: fix bsg SG_IO
      [SCSI] qla2xxx: make msix interrupt handler safe for irq
      [SCSI] zfcp: Report FC BSG errors in correct field
      [SCSI] mptfusion : mptscsih_abort return value should be SUCCESS instead of value 0.
  7. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/dtor/input
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
      Input: psmouse - make sure we don't schedule reconnects after cleanup
  8. @torvalds

    Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/airlied/drm-2.6
    
    * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (30 commits)
      vgaarb: fix incorrect dereference of userspace pointer.
      drm/radeon/kms: retry auxch on 0x20 timeout value.
      drm/radeon: Skip dma copy test in benchmark if card doesn't have dma engine.
      drm/vmwgfx: Fix a circular locking dependency bug.
      drm/vmwgfx: Drop scanout flag compat and add execbuf ioctl parameter members. Bumps major.
      drm/vmwgfx: Report propper framebuffer_{max|min}_{width|height}
      drm/vmwgfx: Update the user-space interface.
      drm/radeon/kms: fix screen clearing before fbcon.
      nouveau: fix state detection with switchable graphics
      drm/nouveau: move dereferences after null checks
      drm/nv50: make the pgraph irq handler loop like the pre-nv50 version
      drm/nv50: delete ramfc object after disabling fifo, not before
      drm/nv50: avoid unloading pgraph context when ctxprog is running
      drm/nv50: align size of buffer object to the right boundaries.
      drm/nv50: disregard dac outputs in nv50_sor_dpms()
      drm/nv50: prevent multiple init tables being parsed at the same time
      drm/nouveau: make dp auxch xfer len check for reads only
      drm/nv40: make INIT_COMPUTE_MEM a NOP, just like nv50
      drm/nouveau: Add proper vgaarb support.
      drm/nouveau: Fix fbcon on mixed pre-NV50 + NV50 multicard.
      ...
  9. @torvalds

    Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git…

    torvalds authored
    …/djbw/async_tx
    
    * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:
      drivers/dma: Correct NULL test
      async-tx: fix buffer submission error handling in ipu_idma.c
      dmaengine: correct onstack wait_queue_head declaration
      ioat: fix infinite timeout checking in ioat2_quiesce
      dmaengine: fix memleak in dma_async_device_unregister
  10. @torvalds

    Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-…

    torvalds authored
    …linus
    
    * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
      MIPS: Don't probe reserved EntryHi bits.
      MIPS: SNI: Correct NULL test
      MIPS: Fix __devinit __cpuinit confusion in cpu_cache_init
      MIPS: IP27: Make defconfig useful again.
      MIPS: Fixup of the r4k timer
  11. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/roland/infiniband
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
      RDMA/cm: Revert association of an RDMA device when binding to loopback
  12. @torvalds

    Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/li…

    torvalds authored
    …nux/kernel/git/tip/linux-2.6-tip
    
    * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      x86, apic: Don't use logical-flat mode when CPU hotplug may exceed 8 CPUs
      x86-32: Make AT_VECTOR_SIZE_ARCH=2
      x86/agp: Fix amd64-agp module initialization regression
      x86, doc: Fix minor spelling error in arch/x86/mm/gup.c
  13. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
      sparc32: Fix thinko in previous change.
      sparc: Align clone and signal stacks to 16 bytes.
  14. @mikey @torvalds

    fs/exec.c: restrict initial stack space expansion to rlimit

    mikey authored torvalds committed
    When reserving stack space for a new process, make sure we're not
    attempting to expand the stack by more than rlimit allows.
    
    This fixes a bug caused by b6a2fea ("mm:
    variable length argument support") and unmasked by
    fc63cf2 ("exec: setup_arg_pages() fails
    to return errors").
    
    This bug means that when limiting the stack to less the 20*PAGE_SIZE (eg.
    80K on 4K pages or 'ulimit -s 79') all processes will be killed before
    they start.  This is particularly bad with 64K pages, where a ulimit below
    1280K will kill every process.
    
    To test, do:
    
      'ulimit -s 15; ls'
    
    before and after the patch is applied.  Before it's applied, 'ls' should
    be killed.  After the patch is applied, 'ls' should no longer be killed.
    
    A stack limit of 15KB since it's small enough to trigger 20*PAGE_SIZE.
    Also 15KB not a multiple of PAGE_SIZE, which is a trickier case to handle
    correctly with this code.
    
    4K pages should be fine to test with.
    
    [kosaki.motohiro@jp.fujitsu.com: cleanup]
    [akpm@linux-foundation.org: cleanup cleanup]
    Signed-off-by: Michael Neuling <mikey@neuling.org>
    Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
    Cc: Americo Wang <xiyou.wangcong@gmail.com>
    Cc: Anton Blanchard <anton@samba.org>
    Cc: Oleg Nesterov <oleg@redhat.com>
    Cc: James Morris <jmorris@namei.org>
    Cc: Ingo Molnar <mingo@elte.hu>
    Cc: Serge Hallyn <serue@us.ibm.com>
    Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Cc: <stable@kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  15. @andreas-schwab @torvalds

    compat_ioctl: add compat handler for TIOCGSID ioctl

    andreas-schwab authored torvalds committed
    This is used by tcgetsid(3).
    
    Signed-off-by: Andreas Schwab <schwab@linux-m68k.org>
    Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Acked-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  16. @torvalds

    MAINTAINERS: changed LTP maintainership responsibilities

    Rishikesh authored torvalds committed
    Change the LTP maintainer responsibities from 2010.
    
    Ref: http://marc.info/?l=ltp-list&m=126502242912536&w=2
    
    Signed-off-by : Rishikesh K Rajak <risrajak@linux.vnet.ibm.com>
    Cc: Subrata Modak <subrata@linux.vnet.ibm.com>
    Cc: Mike Frysinger <vapier@gentoo.org>
    Cc: Garrett Cooper <yanegomi@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  17. @torvalds

    edac: mpc85xx fix build regression by removing unused debug code

    Peter Tyser authored torvalds committed
    Some unused, unsupported debug code existed in the mpc85xx EDAC driver
    that resulted in a build failure when CONFIG_EDAC_DEBUG was defined:
    
      drivers/edac/mpc85xx_edac.c: In function 'mpc85xx_mc_err_probe':
      drivers/edac/mpc85xx_edac.c:1031: error: implicit declaration of function 'edac_mc_register_mcidev_debug'
      drivers/edac/mpc85xx_edac.c:1031: error: 'debug_attr' undeclared (first use in this function)
      drivers/edac/mpc85xx_edac.c:1031: error: (Each undeclared identifier is reported only once
      drivers/edac/mpc85xx_edac.c:1031: error: for each function it appears in.)
    
    Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
    Signed-off-by: Doug Thompson <dougthompson@xmission.com
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  18. @torvalds

    edac: mpc85xx fix bad page calculation

    Peter Tyser authored torvalds committed
    Commit b484625 ("edac: mpc85xx add
    mpc83xx support") accidentally broke how a chip select's first and last
    page addresses are calculated.  The page addresses are being shifted too
    far right by PAGE_SHIFT.  This results in errors such as:
    
      EDAC MPC85xx MC1: Err addr: 0x003075c0
      EDAC MPC85xx MC1: PFN: 0x00000307
      EDAC MPC85xx MC1: PFN out of range!
      EDAC MC1: INTERNAL ERROR: row out of range (4 >= 4)
      EDAC MC1: CE - no information available: INTERNAL ERROR
    
    The vaule of PAGE_SHIFT is already being taken into consideration during
    the calculation of the 'start' and 'end' variables, thus it is not
    necessary to account for it again when setting a chip select's first and
    last page address.
    
    Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
    Signed-off-by: Doug Thompson <dougthompson@xmission.com>
    Cc: Ira W. Snyder <iws@ovro.caltech.edu>
    Cc: Kumar Gala <galak@gate.crashing.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  19. @torvalds

    mmc_test: block addressed cards

    Johan Kristell authored torvalds committed
    This patch fixes a bug in the multiblock write tests where the written
    data is read back for verifying one block at a time.  The tests in
    mmc_test assumes that all cards are byte addressable.
    
    This will cause the multi block write tests to fail, leading the user of
    the mmc_test driver thinking there is something wrong with the sdhci
    driver they are testing.
    
    The start address for the block is calculated as: blocknum * 512. For
    block addressable cards the blocknum alone should be used.
    
    Signed-off-by: Johan Kristell <johan.kristell@axis.com>
    Cc: <linux-mmc@vger.kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  20. @torvalds

    tpm_infineon: fix suspend/resume handler for pnp_driver

    Marcel Selhorst authored torvalds committed
    When suspending, tpm_infineon calls the generic suspend function of the
    TPM framework.  However, the TPM framework does not return and the system
    hangs upon suspend.  When sending the necessary command "TPM_SaveState"
    directly within the driver, suspending and resuming works fine.
    
    Signed-off-by: Marcel Selhorst <m.selhorst@sirrix.com>
    Cc: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
    Cc: Debora Velarde <debora@linux.vnet.ibm.com>
    Cc: Rajiv Andrade <srajiv@linux.vnet.ibm.com>
    Cc: <stable@kernel.org>		[2.6.32.x]
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  21. @davem330

    sparc32: Fix thinko in previous change.

    davem330 authored
    Should mask stack with 0xf not "0x15".
    
    Noticed by Blue Swirl <blauwirbel@gmail.com>
    
    Signed-off-by: David S. Miller <davem@davemloft.net>
  22. amd64_edac: Do not falsely trigger kerneloops

    Borislav Petkov authored
    An unfortunate "WARNING" in the message amd64_edac dumps when the system
    doesn't support DRAM ECC or ECC checking is not enabled in the BIOS
    used to trigger kerneloops which qualified the message as an OOPS thus
    misleading the users. See, e.g.
    
    https://bugs.launchpad.net/ubuntu/+source/linux/+bug/422536
    http://bugzilla.kernel.org/show_bug.cgi?id=15238
    
    Downgrade the message level to KERN_NOTICE and fix the formulation.
    
    Cc: stable@kernel.org # .32.x
    Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
    Acked-by: Doug Thompson <dougthompson@xmission.com>
  23. vgaarb: fix incorrect dereference of userspace pointer.

    Andy Getzendanner authored Dave Airlie committed
    This patch corrects a userspace pointer dereference in the VGA arbiter
    in 2.6.32.1.
    
    copy_from_user() is used at line 822 to copy the contents of buf into
    kbuf, but a call to strncmp() on line 964 uses buf rather than kbuf.  This
    problem led to a GPF in strncmp() when X was started on my x86_32 systems.
     X triggered the behavior with a write of "target PCI:0000:01:00.0" to
    /dev/vga_arbiter.
    
    The patch has been tested against 2.6.32.1 and observed to correct the GPF
    observed when starting X or manually writing the string "target
    PCI:0000:01:00.0" to /dev/vga_arbiter.
    
    Signed-off-by: Andy Getzendanner <james.getzendanner@students.olin.edu>
    Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
    Cc: <stable@kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
Something went wrong with that request. Please try again.