Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
tag: v2.6.30-rc6
Commits on May 16, 2009
  1. Linus Torvalds

    Linux 2.6.30-rc6

    torvalds authored
Commits on May 15, 2009
  1. Linus Torvalds

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

    torvalds authored
    …/git/jbarnes/pci-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
      PCI MSI: Fix MSI-X with NIU cards
      PCI: Fix pci-e port driver slot_reset bad default return value
  2. Linus Torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetoot…

    torvalds authored
    …h-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6:
      Bluetooth: Don't trigger disconnect timeout for security mode 3 pairing
      Bluetooth: Don't use hci_acl_connect_cancel() for incoming connections
      Bluetooth: Fix wrong module refcount when connection setup fails
    
    Another case of me handling the fallout from Davem's unfortunate
    addiction to shuffleboard.
    
    Won't anybody think of the children? Join the anti-shuffleboard league
    today!
  3. Linus Torvalds

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

    torvalds authored
    …ernel/git/anholt/drm-intel
    
    * 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel:
      drm/i915: Add new GET_PIPE_FROM_CRTC_ID ioctl.
      drm/i915: Set HDMI hot plug interrupt enable for only the output in question.
      drm/i915: Include 965GME pci ID in IS_I965GM(dev) to match UMS.
      drm/i915: Use the GM45 VGA hotplug workaround on G45 as well.
      drm/i915: ignore LVDS on intel graphics systems that lie about having it
      drm/i915: sanity check IER at wait_request time
      drm/i915: workaround IGD i2c bus issue in kernel side (v2)
      drm/i915: Don't allow binding objects into the last page of the aperture.
      drm/i915: save/restore fence registers across suspend/resume
      drm/i915: x86 always has writeq. Add I915_READ64 for symmetry.
  4. Linus Torvalds

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

    torvalds authored
    …ernel/git/jgarzik/libata-dev
    
    * 'upstream-linus' of ssh://master.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
      libata: Media rotation rate and form factor heuristics
      libata: Report disk alignment and physical block size
      sata_fsl: Fix the command description of FSL SATA controller
      sata_fsl: Fix compile warnings
      [libata] sata_sx4: fixup interrupt handling
      [libata] sata_sx4: convert to new exception handling methods
  5. Linus Torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless…

    torvalds authored
    …-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6:
      iwlwifi: fix device id registration for 6000 series 2x2 devices
      ath5k: update channel in sw state after stopping RX and TX
      rtl8187: use DMA-aware buffers with usb_control_msg
      mac80211: avoid NULL ptr deref when finding max_rates in PID and minstrel
      airo: airo_get_encode{,ext} potential buffer overflow
    
    Pulled directly by Linus because Davem is off playing shuffle-board at
    some Alaskan cruise, and the NULL ptr deref issue hits people and should
    get merged sooner rather than later.
    
    David - make us proud on the shuffle-board tournament!
  6. libata: Media rotation rate and form factor heuristics

    Martin K. Petersen authored Jeff Garzik committed
    This patch provides new heuristics for parsing both the form factor and
    media rotation rate ATA IDENFITY words.
    
    The reported ATA version must be 7 or greater and the device must return
    values defined as valid in the standard.  Only then are the
    characteristics reported to SCSI via the VPD B1 page.
    
    This seems like a reasonable compromise to me considering that we have
    been shipping several kernel releases that key off the rotation rate bit
    without any version checking whatsoever.  With no complaints so far.
    
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
  7. libata: Report disk alignment and physical block size

    Martin K. Petersen authored Jeff Garzik committed
    For disks with 4KB sectors, report the correct block size and alignment
    when filling out the READ CAPACITY(16) response.
    
    This patch is based upon code from Matthew Wilcox' 4KB ATA tree.  I
    fixed the bug I reported a while back caused by ATA and SCSI using
    different approaches to describing the alignment.
    
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
  8. sata_fsl: Fix the command description of FSL SATA controller

    Dave Liu authored Jeff Garzik committed
    The bit 11 of command description is reserved bit in Freescale
    SATA controller and needs to be set to '1'.  This is needed to
    make sure the last write from the controller to the buffer
    descriptor is seen before an interrupt is raised.
    
    Signed-off-by: Dave Liu <daveliu@freescale.com>
    Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
  9. kumargala

    sata_fsl: Fix compile warnings

    kumargala authored Jeff Garzik committed
    We we build with dma_addr_t as a 64-bit quantity we get:
    
    drivers/ata/sata_fsl.c: In function 'sata_fsl_fill_sg':
    drivers/ata/sata_fsl.c:340: warning: format '%x' expects type 'unsigned int', but argument 4 has type 'dma_addr_t'
    
    Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
  10. [libata] sata_sx4: fixup interrupt handling

    David Milburn authored Jeff Garzik committed
    Issuing ATA_CMD_SET_FEATURES (0xef) times out because
    pdc20621_interrupt ignores command completion since
    ATA_TFLAG_POLLING flag is set.
    
    This has already been fixed for sata_promise:
    
    commit 51b94d2
    Author: Tejun Heo <htejun@gmail.com>
    Date:   Fri Jun 8 13:46:55 2007 -0700
    
        sata_promise: use TF interface for polling NODATA commands
    
    Also, this patch includes Mikael's original patches:
    
    http://marc.info/?l=linux-ide&m=121135828227724&w=2
    http://marc.info/?l=linux-ide&m=121144512109826&w=2
    
    Signed-off-by: Mikael Pettersson <mikpe@it.uu.se>
    Signed-off-by: David Milburn <dmilburn@redhat.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
  11. [libata] sata_sx4: convert to new exception handling methods

    Jeff Garzik authored Jeff Garzik committed
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
  12. Linus Torvalds

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

    torvalds authored
    …/git/tytso/ext4
    
    * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
      ext4: Fix race in ext4_inode_info.i_cached_extent
      ext4: Clear the unwritten buffer_head flag after the extent is initialized
      ext4: Use a fake block number for delayed new buffer_head
      ext4: Fix sub-block zeroing for writes into preallocated extents
  13. Linus Torvalds

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

    torvalds authored
    …/git/tiwai/sound-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
      ASoC: DaVinci EVM board support buildfixes
      ASoC: DaVinci I2S updates
      ASoC: davinci-pcm buildfixes
      ALSA: pcsp: fix printk format warning
      ALSA: riptide: postfix increment and off by one
      pxa2xx-ac97: fix reset gpio mode setting
      ASoC: soc-core: fix crash when removing not instantiated card
  14. Linus Torvalds

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

    torvalds authored
    …/git/jwessel/linux-2.6-kgdb
    
    * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb:
      kgdb: gdb documentation fix
      kgdb,i386: use address that SP register points to in the exception frame
      sysrq, intel_fb: fix sysrq g collision
  15. Linus 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:
      Revert "mm: add /proc controls for pdflush threads"
      viocd: needs to depend on BLOCK
      block: fix the bio_vec array index out-of-bounds test
  16. Linus Torvalds

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

    torvalds authored
    …/benh/powerpc
    
    * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
      powerpc: Fix PCI ROM access
      powerpc/pseries: Really fix the oprofile CPU type on pseries
      serial/nwpserial: Fix wrong register read address and add interrupt acknowledge.
      powerpc/cell: Make ptcal more reliable
      powerpc: Allow mem=x cmdline to work with 4G+
      powerpc/mpic: Fix incorrect allocation of interrupt rev-map
      powerpc: Fix oprofile sampling of marked events on POWER7
      powerpc/iseries: Fix pci breakage due to bad dma_data initialization
      powerpc: Fix mktree build error on Mac OS X host
      powerpc/virtex: Fix duplicate level irq events.
      powerpc/virtex: Add uImage to the default images list
      powerpc/boot: add simpleImage.* to clean-files list
      powerpc/8xx: Update defconfigs
      powerpc/embedded6xx: Update defconfigs
      powerpc/86xx: Update defconfigs
      powerpc/85xx: Update defconfigs
      powerpc/83xx: Update defconfigs
      powerpc/fsl_soc: Remove mpc83xx_wdt_init, again
  17. Linus Torvalds

    devpts: correctly set default options

    Sukadev Bhattiprolu authored torvalds committed
    devpts_get_sb() calls memset(0) to clear mount options and calls
    parse_mount_options() if user specified any mount options.
    
    The memset(0) is bogus since the 'mode' and 'ptmxmode' options are
    non-zero by default.  parse_mount_options() restores options to default
    anyway and can properly deal with NULL mount options.
    
    So in devpts_get_sb() remove memset(0) and call parse_mount_options() even
    for NULL mount options.
    
    Bug reported by Eric Paris: http://lkml.org/lkml/2009/5/7/448.
    
    Signed-off-by: Sukadev Bhattiprolu <sukadev@us.ibm.com>
    Tested-by: Marc Dionne <marc.c.dionne@gmail.com>
    Reported-by: Eric Paris <eparis@redhat.com>
    Cc: Christoph Hellwig <hch@lst.de>
    Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Acked-by: Serge Hallyn <serue@us.ibm.com>
    Cc: Al Viro <viro@zeniv.linux.org.uk>
    Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
    Reviewed-by: "H. Peter Anvin" <hpa@zytor.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  18. Takashi Iwai

    Merge branch 'fix/asoc' into for-linus

    tiwai authored
    * fix/asoc:
      ASoC: DaVinci EVM board support buildfixes
      ASoC: DaVinci I2S updates
      ASoC: davinci-pcm buildfixes
      pxa2xx-ac97: fix reset gpio mode setting
      ASoC: soc-core: fix crash when removing not instantiated card
  19. Takashi Iwai

    Merge branch 'fix/misc' into for-linus

    tiwai authored
    * fix/misc:
      ALSA: pcsp: fix printk format warning
      ALSA: riptide: postfix increment and off by one
  20. Theodore Ts'o

    ext4: Fix race in ext4_inode_info.i_cached_extent

    tytso authored
    If two CPU's simultaneously call ext4_ext_get_blocks() at the same
    time, there is nothing protecting the i_cached_extent structure from
    being used and updated at the same time.  This could potentially cause
    the wrong location on disk to be read or written to, including
    potentially causing the corruption of the block group descriptors
    and/or inode table.
    
    This bug has been in the ext4 code since almost the very beginning of
    ext4's development.  Fortunately once the data is stored in the page
    cache cache, ext4_get_blocks() doesn't need to be called, so trying to
    replicate this problem to the point where we could identify its root
    cause was *extremely* difficult.  Many thanks to Kevin Shanahan for
    working over several months to be able to reproduce this easily so we
    could finally nail down the cause of the corruption.
    
    Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
    Reviewed-by: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
  21. jwessel

    kgdb: gdb documentation fix

    Frank Rowand authored jwessel committed
    gdb command "set remote debug 1" is not valid, change to correct command.
    
    Signed-off-by: Frank Rowand <frank.rowand@am.sony.com>
    Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
  22. jwessel

    kgdb,i386: use address that SP register points to in the exception frame

    jwessel authored
    The treatment of the SP register is different on x86_64 and i386.
    This is a regression fix that lived outside the mainline kernel from
    2.6.27 to now.  The regression was a result of the original merge
    consolidation of the i386 and x86_64 archs to x86.
    
    The incorrectly reported SP on i386 prevented stack tracebacks from
    working correctly in gdb.
    
    Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
  23. jwessel

    sysrq, intel_fb: fix sysrq g collision

    jwessel authored
    Commit 79e5394 introduced a
    regression where you cannot use sysrq 'g' to enter kgdb.  The solution
    is to move the intel fb sysrq over to V for video instead of G for
    graphics.  The SMP VOYAGER code to register for the sysrq-v is not
    anywhere to be found in the mainline kernel, so the comments in the
    code were cleaned up as well.
    
    This patch also cleans up the sysrq definitions for kgdb to make it
    generic for the kernel debugger, such that the sysrq 'g' can be used
    in the future to enter a gdbstub or another kernel debugger.
    
    Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
    Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
  24. Revert "mm: add /proc controls for pdflush threads"

    Jens Axboe authored
    This reverts commit fafd688.
    
    Work is progressing to switch away from pdflush as the process backing
    for flushing out dirty data. So it seems pointless to add more knobs
    to control pdflush threads. The original author of the patch did not
    have any specific use cases for adding the knobs, so we can easily
    revert this before 2.6.30 to avoid having to maintain this API
    forever.
    
    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
  25. Mark Brown

    ASoC: DaVinci EVM board support buildfixes

    David Brownell authored broonie committed
    This is a build fix, resyncing the DaVinci EVM ASoC board code
    with the version in the DaVinci tree.  That resync includes
    support for the DM355 EVM, although that board isn't yet in
    mainline.
    
    (NOTE:  also includes a bugfix to the platform_add_resources
    call, recently sent by Chaithrika U S <chaithrika@ti.com> but
    not yet merged into the DaVinci tree.)
    
    Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  26. Mark Brown

    ASoC: DaVinci I2S updates

    David Brownell authored broonie committed
    This resyncs the DaVinci I2S code with the version in the DaVinci
    tree.  The behavioral change uses updated clock interfaces which
    recently merged to mainline.  Two other changes include adding a
    comment on the ASP/McBSP/McASP confusion, and dropping pdev->id in
    order to support more boards than just the DM644x EVM.
    
    Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  27. Mark Brown

    ASoC: davinci-pcm buildfixes

    David Brownell authored broonie committed
    This is a buildfix for the DaVinci PCM code, resyncing it with
    the version in the DaVinci tree.  The notable change is using
    current EDMA interfaces, which recently merged to mainline.
    (The older interfaces never made it into mainline.)
    
    NOTE:  open issue, the DMA should be to/from SRAM; see chip
    errata for more info.  The artifacts are extremely easy to
    hear on DM355 hardware (not yet supported in mainline), but
    don't seem as audible on DM6446 hardwaare (which does have
    mainline support).
    
    Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  28. Benjamin Herrenschmidt

    powerpc: Fix PCI ROM access

    ozbenh authored
    A couple of issues crept in since about 2.6.27 related to accessing PCI
    device ROMs on various powerpc machines.
    
    First, historically, we don't allocate the ROM resource in the resource
    tree. I'm not entirely certain of why, I susepct they often contained
    garbage on x86 but it's hard to tell. This causes the current generic
    code to always call pci_assign_resource() when trying to access the said
    ROM from sysfs, which will try to re-assign some new address regardless
    of what the ROM BAR was already set to at boot time. This can be a
    problem on hypervisor platforms like pSeries where we aren't supposed
    to move PCI devices around (and in fact probably can't).
    
    Second, our code that generates the PCI tree from the OF device-tree
    (instead of doing config space probing) which we mostly use on pseries
    at the moment, didn't set the (new) flag IORESOURCE_SIZEALIGN on any
    resource. That means that any attempt at re-assigning such a resource
    with pci_assign_resource() would fail due to resource_alignment()
    returning 0.
    
    This fixes this by doing these two things:
    
     - The code that calculates resource flags based on the OF device-node
    is improved to set IORESOURCE_SIZEALIGN on any valid BAR, and while at
    it also set IORESOURCE_READONLY for ROMs since we were lacking that too
    
     - We now allocate ROM resources as part of the resource tree. However
    to limit the chances of nasty conflicts due to busted firmwares, we
    only do it on the second pass of our two-passes allocation scheme,
    so that all valid and enabled BARs get precedence.
    
    This brings pSeries back the ability to access PCI ROMs via sysfs (and
    thus initialize various video cards from X etc...).
    
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
  29. Benjamin Herrenschmidt

    powerpc/pseries: Really fix the oprofile CPU type on pseries

    ozbenh authored
    My previous pach for fixing the oprofile CPU type got somewhat mismerged
    (by my fault) when it collided with another related patch. This should
    finally (fingers crossed) fix the whole thing.
    
    We make sure we keep the -old- oprofile type and CPU type whenever
    one of them was specified in the first pass through the function.
    
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
  30. kben Benjamin Herrenschmidt

    serial/nwpserial: Fix wrong register read address and add interrupt a…

    kben authored ozbenh committed
    …cknowledge.
    
    The receive interrupt routine checks the wrong register if the
    receive fifo is empty. Further an explicit interrupt acknowledge
    write is introduced. In some circumstances another interrupt was
    issued.
    
    Signed-off-by: Benjamin Krill <ben@codiert.org>
    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
  31. Benjamin Herrenschmidt

    powerpc/cell: Make ptcal more reliable

    Gerhard Stenzel authored ozbenh committed
    There have been a series of checkstops on QS21 related to
    ptcal being set up incorrectly. On systems that only
    have memory on a single node, ptcal fails when it gets
    a pointer to memory on the remote node.
    
    Moreover, agressive prefetching in memcpy and other
    functions may accidentally touch the first cache line
    of the page that we reserve for ptcal, which causes
    an ECC checkstop.
    
    We now allocate pages only from the specified node, moves the
    ptcal area into the middle of the allocated page to avoid
    potential prefetch problems and prints the address of the
    ptcal area to facilitate diagnostics.
    
    Signed-off-by: Gerhard Stenzel <gerhard.stenzel@de.ibm.com>
    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
  32. Benjamin Herrenschmidt

    powerpc: Allow mem=x cmdline to work with 4G+

    Becky Bruce authored ozbenh committed
    We're currently choking on mem=4g (and above) due to memory_limit
    being specified as an unsigned long. Make memory_limit
    phys_addr_t to fix this.
    
    Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
  33. kumargala Benjamin Herrenschmidt

    powerpc/mpic: Fix incorrect allocation of interrupt rev-map

    kumargala authored ozbenh committed
    Before when we were setting up the irq host map for mpic we passed in
    just isu_size for the size of the linear map.  However, for a number of
    mpic implementations we have no isu (thus pass in 0) and will end up
    with a no linear map (size = 0).  This causes us to always call
    irq_find_mapping() from mpic_get_irq().
    
    By moving the allocation of the host map to after we've determined the
    number of sources we can actually benefit from having a linear map for
    the non-isu users that covers all the interrupt sources.
    
    Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
  34. Benjamin Herrenschmidt

    powerpc: Fix oprofile sampling of marked events on POWER7

    Maynard Johnson authored ozbenh committed
    Description
    -----------
    Change ppc64 oprofile kernel driver to use the SLOT bits (MMCRA[37:39]only on
    older processors where those bits are defined.
    
    Background
    ----------
    The performance monitor unit of the 64-bit POWER processor family has the
    ability to collect accurate instruction-level samples when profiling on marked
    events (i.e., "PM_MRK_<event-name>").  In processors prior to POWER6, the MMCRA
    register contained "slot information" that the oprofile kernel driver used to
    adjust the value latched in the SIAR at the time of a PMU interrupt.  But as of
    POWER6, these slot bits in MMCRA are no longer necessary for oprofile to use,
    since the SIAR itself holds the accurate sampled instruction address.  With
    POWER6, these MMCRA slot bits were zero'ed out by hardware so oprofile's use of
    these slot bits was, in effect, a NOP.  But with POWER7, these bits are no
    longer zero'ed out; however, they serve some other purpose rather than slot
    information.  Thus, using these bits on POWER7 to adjust the SIAR value results
    in samples being attributed to the wrong instructions.  The attached patch
    changes the oprofile kernel driver to ignore these slot bits on all newer
    processors starting with POWER6.
    
    Signed-off-by: Maynard Johnson <maynardj@us.ibm.com>
    Signed-off-by: Michael Wolf <mjw@linux.vnet.ibm.com>
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Something went wrong with that request. Please try again.