Permalink
Switch branches/tags
Commits on Jun 3, 2010
  1. Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/k…

    …ernel/git/jgarzik/libata-dev
    
    * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
      libata: implement on-demand HPA unlocking
      libata: use the enlarged capacity after late HPA unlock
      SCSI: implement sd_unlock_native_capacity()
      libata-sff: trivial corrections to Kconfig help text
      sata_nv: don't diddle with nIEN on mcp55
      sata_via: magic vt6421 fix for transmission problems w/ WD drives
    torvalds committed Jun 3, 2010
  2. Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/…

    …linux/kernel/git/tip/linux-2.6-tip
    
    * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      sched, trace: Fix sched_switch() prev_state argument
      sched: Fix wake_affine() vs RT tasks
      sched: Make sure timers have migrated before killing the migration_thread
    torvalds committed Jun 3, 2010
  3. Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/li…

    …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, smpboot: Fix cores per node printing on boot
      x86/amd-iommu: Fall back to GART if initialization fails
      x86/amd-iommu: Fix crash when request_mem_region fails
      x86/mm: Remove unused DBG() macro
      arch/x86/kernel: Add missing spin_unlock
    torvalds committed Jun 3, 2010
  4. Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git…

    …/benh/powerpc
    
    * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
      powerpc/macio: Fix probing of macio devices by using the right of match table
      agp/uninorth: Fix oops caused by flushing too much
      powerpc/pasemi: Update MAINTAINERS file
      powerpc/cell: Fix integer constant warning
      powerpc/kprobes: Remove resume_execution() in kprobes
      powerpc/macio: Don't dereference pointer before null check
    torvalds committed Jun 3, 2010
  5. Merge branch 'for-linus/bugfixes' of git://xenbits.xensource.com/peop…

    …le/ianc/linux-2.6
    
    * 'for-linus/bugfixes' of git://xenbits.xensource.com/people/ianc/linux-2.6:
      xen: avoid allocation causing potential swap activity on the resume path
      xen: ensure timer tick is resumed even on CPU driving the resume
    torvalds committed Jun 3, 2010
  6. Merge branch 'perf-fixes-for-linus-2' of git://git.kernel.org/pub/scm…

    …/linux/kernel/git/tip/linux-2.6-tip
    
    * 'perf-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      perf: Fix crash in swevents
      perf buildid-list: Fix --with-hits event processing
      perf scripts python: Give field dict to unhandled callback
      perf hist: fix objdump output parsing
      perf-record: Check correct pid when forking
      perf: Do the comm inheritance per thread in event__process_task
      perf: Use event__process_task from perf sched
      perf: Process comm events by tid
      blktrace: Fix new kernel-doc warnings
      perf_events: Fix unincremented buffer base on partial copy
      perf_events: Fix event scheduling issues introduced by transactional API
      perf_events, trace: Fix perf_trace_destroy(), mutex went missing
      perf_events, trace: Fix probe unregister race
      perf_events: Fix races in group composition
      perf_events: Fix races and clean up perf_event and perf_mmap_data interaction
    torvalds committed Jun 3, 2010
  7. Merge branch 'virtio' of git://git.kernel.org/pub/scm/linux/kernel/gi…

    …t/rusty/linux-2.6-for-linus
    
    * 'virtio' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
      virtio: console: Fix crash when port is unplugged and blocked for write
      virtio: console: Fix crash when hot-unplugging a port and read is blocked
      virtio-blk: fix minimum number of S/G elements
    torvalds committed Jun 3, 2010
  8. Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/ke…

    …rnel/git/jdelvare/staging
    
    * 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
      i2c: Remove all i2c_set_clientdata(client, NULL) in drivers
      i2c/busses: Move two drivers to embedded section
      i2c: Rename i2c_check_addr to i2c_check_addr_busy
      i2c: Document reserved I2C addresses
      i2c: Check for address validity on client registration
      i2c: Share the I2C device presence detection code
      Documentation/i2c: Checkpatch cleanup
    torvalds committed Jun 3, 2010
  9. Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

    * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
      crypto: crypto4xx - Fix build breakage
      n2_crypto: Plumb fallback ahash requests properly.
      n2_crypto: Fix MAU kmem_cache name.
      n2_crypto: Fix build after of_device/of_platform_driver changes.
    torvalds committed Jun 3, 2010
  10. perf: Fix crash in swevents

    Frederic reported that because swevents handling doesn't disable IRQs
    anymore, we can get a recursion of perf_adjust_period(), once from
    overflow handling and once from the tick.
    
    If both call ->disable, we get a double hlist_del_rcu() and trigger
    a LIST_POISON2 dereference.
    
    Since we don't actually need to stop/start a swevent to re-programm
    the hardware (lack of hardware to program), simply nop out these
    callbacks for the swevent pmu.
    
    Reported-by: Frederic Weisbecker <fweisbec@gmail.com>
    Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
    LKML-Reference: <1275557609.27810.35218.camel@twins>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Peter Zijlstra committed with Ingo Molnar Jun 3, 2010
  11. Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

    * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
      cifs: fix page refcount leak
    torvalds committed Jun 3, 2010
  12. Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/airlied/drm-2.6
    
    * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (41 commits)
      drm/radeon/kms: make sure display hw is disabled when suspending
      drm/vmwgfx: Allow userspace to change default layout. Bump minor.
      drm/vmwgfx: Fix framebuffer modesetting
      drm/vmwgfx: Fix vga save / restore with display topology.
      vgaarb: use MIT license
      vgaarb: convert pr_devel() to pr_debug()
      drm: fix typos in Linux DRM Developer's Guide
      drm/radeon/kms/pm: voltage fixes
      drm/radeon/kms/pm: radeon_set_power_state fixes
      drm/radeon/kms/pm: patch default power state with default clocks/voltages on r6xx+
      drm/radeon/kms/pm: enable SetVoltage on r7xx/evergreen
      drm/radeon/kms/pm: add support for SetVoltage cmd table (V2)
      drm/radeon/kms/evergreen: add initial CS parser
      drm/kms: disable/enable poll around switcheroo on/off
      drm/nouveau: fixup confusion over which handle the DSM is hanging off.
      drm/nouveau: attempt to get bios from ACPI v3
      drm/nv50: cast IGP memory location to u64 before shifting
      drm/ttm: Fix ttm_page_alloc.c
      drm/ttm: Fix cached TTM page allocation.
      drm/vmwgfx: Remove some leftover debug messages.
      ...
    torvalds committed Jun 3, 2010
  13. Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6

    * 'merge' of git://git.secretlab.ca/git/linux-2.6:
      of/powerpc: fix fsl_msi device node pointer
      of/watchdog: gef_wdt.c: fix build breakage
      of/edac: fix build breakage in drivers
      of/net: fs_enet/mii-bitbang.c: fix build breakage
      of/usb: fsl_qe_udc.c: fix build breakage
      of/crypto: crypto4xx_core.c: fix build breakage
      of/dma: fix build breakage in ppc4xx adma driver
      of/mtd: nand: fix build breakage in drivers
      of/video: fix build breakage in FB drivers
      of/pcmcia: m8xx_pcmcia.c: Fix build failures
      of/rtc: rtc-mpc5121.c: Fix build failures
      of/dma: mpc512x_dma.c: Fix build failures
      of/mtd/nand: mpc5121_nfc.c: Fix build failures
      of/spi: mpc512x_psc_spi.c: Fix build failures
      watchdog: Fix build failure with OF changes
      of/spi: Fix build failure on spi_ppc4xx.c
      of/usb: fix build error due to of_node pointer move
      of/powerpc: fix 85xx RapidIO device node pointer
    torvalds committed Jun 3, 2010
  14. virtio: console: Fix crash when port is unplugged and blocked for write

    When a program that has a virtio port opened and blocked for a write
    operation, a port hot-unplug event will later led to a crash when
    SIGTERM was sent to the program. Fix that.
    
    Signed-off-by: Amit Shah <amit.shah@redhat.com>
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
    Amit Shah committed with rustyrussell May 27, 2010
  15. virtio: console: Fix crash when hot-unplugging a port and read is blo…

    …cked
    
    When removing a port we don't check if a program was blocked for read.
    This leads to a crash when SIGTERM is sent to the program after
    hot-unplugging the port.
    
    Signed-off-by: Amit Shah <amit.shah@redhat.com>
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
    Amit Shah committed with rustyrussell May 27, 2010
  16. virtio-blk: fix minimum number of S/G elements

    We need at least one S/G element to operate properly, as does the block
    layer which increments it to one anyway.  We hit this due to a qemu
    bug which advertises a sg_elements of 0 under some circumstances.
    
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> (tweaked logic)
    Christoph Hellwig committed with rustyrussell May 25, 2010
  17. i2c: Remove all i2c_set_clientdata(client, NULL) in drivers

    I2C drivers can use the clientdata-pointer to point to private data. As I2C
    devices are not really unregistered, but merely detached from their driver, it
    used to be the drivers obligation to clear this pointer during remove() or a
    failed probe(). As a couple of drivers forgot to do this, it was agreed that it
    was cleaner if the i2c-core does this clearance when appropriate, as there is
    no guarantee for the lifetime of the clientdata-pointer after remove() anyhow.
    This feature was added to the core with commit
    e4a7b9b to fix the faulty drivers.
    
    As there is no need anymore to clear the clientdata-pointer, remove all current
    occurrences in the drivers to simplify the code and prevent confusion.
    
    Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
    Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
    Acked-by: Richard Purdie <rpurdie@linux.intel.com>
    Acked-by: Dmitry Torokhov <dtor@mail.ru>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Wolfram Sang committed with Jean Delvare Jun 3, 2010
  18. i2c/busses: Move two drivers to embedded section

    And fix a typo while we are here
    
    Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Wolfram Sang committed with Jean Delvare Jun 3, 2010
  19. i2c: Rename i2c_check_addr to i2c_check_addr_busy

    Otherwise it's not clear what it is checking.
    
    Also move the function to save a forward declaration.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Jean Delvare committed Jun 3, 2010
  20. i2c: Document reserved I2C addresses

    Move strict I2C address validity check to a single function, and
    document the reserved I2C addresses there.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Cc: Hans Verkuil <hverkuil@xs4all.nl>
    Jean Delvare committed Jun 3, 2010
  21. i2c: Check for address validity on client registration

    Do basic address validity checks when a client is being registered. We
    already had checks in place for devices which are being detected, but
    not for devices which are simply instantiated.
    
    This is a very basic check. We don't want to do strict checking here
    because some devices are known to infringe the I2C address constraints
    (e.g. IR receivers at 7-bit address 0x7a while this value is
    supposedly reserved for 10-bit addresses.) So we assume the caller
    knows what it is doing.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Cc: Matthieu Castet <castet.matthieu@free.fr>
    Jean Delvare committed Jun 3, 2010
  22. i2c: Share the I2C device presence detection code

    Use the same I2C device presence detection code for legacy and new
    device detection functions. This is more consistent and makes the code
    smaller.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Cc: Matthieu Castet <castet.matthieu@free.fr>
    Jean Delvare committed Jun 3, 2010
  23. Documentation/i2c: Checkpatch cleanup

    Remove all trailing whitespace in Documentation/i2c.
    
    Signed-off-by: Andrea Gelmini <andrea.gelmini@gelma.net>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Gelma committed with Jean Delvare Jun 3, 2010
  24. xen: avoid allocation causing potential swap activity on the resume path

    Since the device we are resuming could be the device containing the
    swap device we should ensure that the allocation cannot cause
    IO.
    
    On resume, this path is triggered when the running system tries to
    continue using its devices.  If it cannot then the resume will fail;
    to try to avoid this we let it dip into the emergency pools.
    
    The majority of these changes were made when linux-2.6.18-xen.hg
    changeset e8b49cfbdac0 was ported upstream in
    a144ff0 but somehow this hunk was
    dropped.
    
    Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
    Acked-by: Jeremy Fitzhardinge <jeremy@goop.org>
    Cc: Stable Kernel <stable@kernel.org> # .32.x
    Ian Campbell committed May 25, 2010
  25. xen: ensure timer tick is resumed even on CPU driving the resume

    The core suspend/resume code is run from stop_machine on CPU0 but
    parts of the suspend/resume machinery (including xen_arch_resume) are
    run on whichever CPU happened to schedule the xenwatch kernel thread.
    
    As part of the non-core resume code xen_arch_resume is called in order
    to restart the timer tick on non-boot processors. The boot processor
    itself is taken care of by core timekeeping code.
    
    xen_arch_resume uses smp_call_function which does not call the given
    function on the current processor. This means that we can end up with
    one CPU not receiving timer ticks if the xenwatch thread happened to
    be scheduled on CPU > 0.
    
    Use on_each_cpu instead of smp_call_function to ensure the timer tick
    is resumed everywhere.
    
    Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
    Acked-by: Jeremy Fitzhardinge <jeremy@goop.org>
    Cc: Stable Kernel <stable@kernel.org> # .32.x
    Ian Campbell committed May 19, 2010
  26. crypto: crypto4xx - Fix build breakage

    Fixes build error caused by the OF device_node
    pointer being moved into struct device
    
    Signed-off-by: Anatolij Gustschin <agust@denx.de>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Anatolij Gustschin committed with herbertx Jun 3, 2010
  27. of/powerpc: fix fsl_msi device node pointer

    Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
    Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
    Wolfram Sang committed with glikely Jun 3, 2010
  28. drm/radeon/kms: make sure display hw is disabled when suspending

    Disable the display hw when suspending.
    Should fix bug:
    https://bugzilla.redhat.com/show_bug.cgi?id=522393
    
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Alex Deucher committed with Dave Airlie Jun 2, 2010
  29. drm/vmwgfx: Allow userspace to change default layout. Bump minor.

    The host may change the layout and, since the change is
    communicated to the master, the master needs a way to
    communicate the change to the kernel driver.
    
    The minor version number is bumped to advertize the
    availability of this feature.
    
    Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
    Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Jakob Bornecrantz committed with Dave Airlie Jun 1, 2010
  30. drm/vmwgfx: Fix framebuffer modesetting

    Must set SVGA_NUM_REG_GUEST_DISPLAY before setting up the display information.
    
    Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
    Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Jakob Bornecrantz committed with Dave Airlie Jun 1, 2010
  31. drm/vmwgfx: Fix vga save / restore with display topology.

    vga save / restore previously didn't handle the display topology case.
    
    Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    thomashvmw committed with Dave Airlie Jun 1, 2010
  32. vgaarb: use MIT license

    Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
    Cc: Henry Zhao <Henry.Zhao@Sun.COM>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Tiago Vignatti committed with Dave Airlie May 24, 2010
  33. vgaarb: convert pr_devel() to pr_debug()

    We want to be able to use CONFIG_DYNAMIC_DEBUG in arbiter code, switch
    the few existing pr_devel() calls to pr_debug().
    
    Also, add one more debug information regarding decoding count.
    
    Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Tiago Vignatti committed with Dave Airlie May 24, 2010
  34. drm: fix typos in Linux DRM Developer's Guide

    A few typos in the DRM Developer's Guide.
    
    Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
    Acked-by: Jesse Barnes <jesse.barnes@intel.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    nikai3d committed with Dave Airlie May 28, 2010
  35. drm/radeon/kms/pm: voltage fixes

    - Enable GPIO voltage for non pm modes as well so resetting
    the default voltage works.
    
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Alex Deucher committed with Dave Airlie May 27, 2010