Permalink
Switch branches/tags
Commits on Jun 10, 2010
  1. Merge branch 'kvm-updates/2.6.35' of git://git.kernel.org/pub/scm/vir…

    torvalds committed Jun 10, 2010
    …t/kvm/kvm
    
    * 'kvm-updates/2.6.35' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
      KVM: read apic->irr with ioapic lock held
      KVM: ia64: Add missing spin_unlock in kvm_arch_hardware_enable()
      KVM: Fix order passed to iommu_unmap
      KVM: MMU: Remove user access when allowing kernel access to gpte.w=0 page
      KVM: MMU: invalidate and flush on spte small->large page size change
      KVM: SVM: Implement workaround for Erratum 383
      KVM: SVM: Handle MCEs early in the vmexit process
      KVM: powerpc: fix init/exit annotation
  2. KVM: read apic->irr with ioapic lock held

    Marcelo Tosatti Avi Kivity
    Marcelo Tosatti authored and Avi Kivity committed Jun 2, 2010
    Read ioapic->irr inside ioapic->lock protected section.
    
    KVM-Stable-Tag
    Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
  3. Merge branch 'for-linus2' of git://git.kernel.dk/linux-2.6-block

    torvalds committed Jun 10, 2010
    * 'for-linus2' of git://git.kernel.dk/linux-2.6-block:
      pipe: fix check in "set size" fcntl
      pipe: fix pipe buffer resizing
      block: remove duplicate BUG_ON() in bd_finish_claiming()
      block: bd_start_claiming cleanup
      block: bd_start_claiming fix module refcount
  4. pipe: fix check in "set size" fcntl

    Miklos Szeredi Jens Axboe
    Miklos Szeredi authored and Jens Axboe committed Jun 9, 2010
    As it stands this check compares the number of pages to the page size.
    This makes no sense and makes the fcntl fail in almost any sane case.
    
    Fix it by checking if nr_pages is not zero (it can become zero only if
    arg is too big and round_pipe_size() overflows).
    
    Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
    Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
  5. pipe: fix pipe buffer resizing

    Miklos Szeredi Jens Axboe
    Miklos Szeredi authored and Jens Axboe committed Jun 8, 2010
    pipe_set_size() needs to copy pipe bufs from the old circular buffer
    to the new.
    
    The current code gets this wrong in multiple ways, resulting in oops.
    
    Test program is available here:
      http://www.kernel.org/pub/linux/kernel/people/mszeredi/piperesize/
    
    Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
    Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
  6. block: remove duplicate BUG_ON() in bd_finish_claiming()

    Jens Axboe
    Jens Axboe committed Jun 7, 2010
    We do the same BUG_ON() just a line later when calling into
    __bd_abort_claiming().
    
    Reported-by: Tejun Heo <tj@kernel.org>
    Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
  7. block: bd_start_claiming cleanup

    Nick Piggin Jens Axboe
    Nick Piggin authored and Jens Axboe committed May 25, 2010
    I don't like the subtle multi-context code in bd_claim (ie.  detects where it
    has been called based on bd_claiming). It seems clearer to just require a new
    function to finish a 2-part claim.
    
    Also improve commentary in bd_start_claiming as to how it should
    be used.
    
    Signed-off-by: Nick Piggin <npiggin@suse.de>
    Acked-by: Tejun Heo <tj@kernel.org>
    Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
  8. block: bd_start_claiming fix module refcount

    Nick Piggin Jens Axboe
    Nick Piggin authored and Jens Axboe committed May 25, 2010
    bd_start_claiming has an unbalanced module_put introduced in 6b4517a.
    
    Signed-off-by: Nick Piggin <npiggin@suse.de>
    Acked-by: Tejun Heo <tj@kernel.org>
    Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
  9. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds committed Jun 10, 2010
    …/git/tiwai/sound-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
      ALSA: sound/spi: patch for the unuseful variable removal
      ALSA: hda - Add SSID table for iMac7,1.
      ALSA: hda - Add SSID table for MacBookAir1,1
      ALSA: hda - Add SSID table for MacBookAir2,1
      ALSA: atmel: set "channel A event" output to debug
  10. Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/l…

    torvalds committed Jun 10, 2010
    …inux/kernel/git/tip/linux-2.6-tip
    
    * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      tracing: Fix null pointer deref with SEND_SIG_FORCED
      perf: Fix signed comparison in perf_adjust_period()
      powerpc/oprofile: fix potential buffer overrun in op_model_cell.c
      perf symbols: Set the DSO long name when using symbol_conf.vmlinux_name
  11. Merge master.kernel.org:/home/rmk/linux-2.6-arm

    torvalds committed Jun 10, 2010
    * master.kernel.org:/home/rmk/linux-2.6-arm:
      ARM: 6164/1: Add kto and kfrom to input operands list.
      ARM: 6166/1: Proper prefetch abort handling on pre-ARMv6
      ARM: 6165/1: trap overflows on highmem pages from kmap_atomic when debugging
      ARM: 6152/1: ux500 make it possible to disable localtimers
      [ARM] pxa/spitz: Correctly register WM8750
      [ARM] pxa/palmtc: storage class should be before const qualifier
      ARM: 6146/1: sa1111: Prevent deadlock in resume path
      ARM: 6145/1: ux500 MTU clockrate correction
      ARM: 6144/1: TCM memory bug freeing bug
      ARM: VFP: Fix vfp_put_double() for d16-d31
Commits on Jun 9, 2010
  1. Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

    torvalds committed Jun 9, 2010
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (21 commits)
      mac80211: fix deauth before assoc
      iwlwifi: add missing rcu_read_lock
      mac80211: fix function pointer check
      wireless: remove my name from the maintainer list
      ath5k: fix NULL pointer in antenna configuration
      p54usb: Add device ID for Dell WLA3310 USB
      wl1251: fix a memory leak in probe
      ipmr: dont corrupt lists
      8139too: fix buffer overrun in rtl8139_init_board
      asix: check packet size against mtu+ETH_HLEN instead of ETH_FRAME_LEN
      r8169: fix random mdio_write failures
      ip6mr: fix a typo in ip6mr_for_each_table()
      iwlwifi: move sysfs_create_group to post request firmware
      iwlwifi: add name to Maintainers list
      iwl3945: fix internal scan
      iwl3945: enable stuck queue detection on 3945
      ipv6: avoid high order allocations
      ath5k: retain promiscuous setting
      ath5k: depend on CONFIG_PM_SLEEP for suspend/resume functions
      mac80211: process station blockack action frames from work
      ...
  2. Merge branch 'for-2.6.35' of git://linux-nfs.org/~bfields/linux

    torvalds committed Jun 9, 2010
    * 'for-2.6.35' of git://linux-nfs.org/~bfields/linux:
      nfsd4: shut down callback queue outside state lock
      nfsd: nfsd_setattr needs to call commit_metadata
  3. FRV: Reinstate null behaviour for the GDB remote protocol 'p' command

    dhowells authored and torvalds committed Jun 9, 2010
    Reinstate the null behaviour that the in-kernel gdbstub had for the GDB
    remote protocol 'p' command (retrieve a single register value) prior to
    commit 7ca8b9c ("frv: extend gdbstub to support more features of
    gdb").
    
    Before that, the 'p' command just returned an empty reply, which causes
    gdb to then go and use the 'g' command.  However, since that commit, the
    'p' command returns an error string, which causes gdb to abort its
    connection to the target.
    
    Not all gdb versions are affected, some use try 'g' first, and if that
    works, don't bother with 'p', and so don't see the error.
    
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  4. Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/gi…

    davem330 committed Jun 9, 2010
    …t/linville/wireless-2.6
  5. Merge branch 'msm-urgent' of git://codeaurora.org/quic/kernel/dwalker…

    torvalds committed Jun 9, 2010
    …/linux-msm
    
    * 'msm-urgent' of git://codeaurora.org/quic/kernel/dwalker/linux-msm:
      mmc: msm: fix compile error on MSM7x30
      msm: dma: add completion.h header
  6. Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze

    torvalds committed Jun 9, 2010
    * 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze:
      microblaze: Fix sg_dma_len() regression
      microblaze: Define ARCH_SLAB_MINALIGN to fix slab crash
  7. mmc: msm: fix compile error on MSM7x30

    Daniel Walker
    Daniel Walker committed May 24, 2010
    MSM7x30 isn't supported in this driver yet. If ones tried to compile it in
    with MSM7x30 configure you get,
    
    linux-2.6/drivers/mmc/host/msm_sdcc.c: In function 'msmsdcc_fifo_addr':
    linux-2.6/drivers/mmc/host/msm_sdcc.c:165: error: 'MSM_SDC1_PHYS' undeclared (first use in this function)
    linux-2.6/drivers/mmc/host/msm_sdcc.c:165: error: (Each undeclared identifier is reported only once
    linux-2.6/drivers/mmc/host/msm_sdcc.c:165: error: for each function it appears in.)
    linux-2.6/drivers/mmc/host/msm_sdcc.c:167: error: 'MSM_SDC2_PHYS' undeclared (first use in this function)
    linux-2.6/drivers/mmc/host/msm_sdcc.c:169: error: 'MSM_SDC3_PHYS' undeclared (first use in this function)
    linux-2.6/drivers/mmc/host/msm_sdcc.c:171: error: 'MSM_SDC4_PHYS' undeclared (first use in this function)
    
    So we add a Kconfig check to prevent this.
    
    Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
  8. misc: Fix allocation 'borrowed' by vhost_net

    Alan Cox authored and torvalds committed Jun 9, 2010
    10, 233 is allocated officially to /dev/kmview which is shipping in
    Ubuntu and Debian distributions.  vhost_net seem to have borrowed it
    without making a proper request and this causes regressions in the other
    distributions.
    
    vhost_net can use a dynamic minor so use that instead.  Also update the
    file with a comment to try and avoid future misunderstandings.
    
    cc: stable@kernel.org
    Signed-off-by: Alan Cox <device@lanana.org>
    [ We should have caught this before 2.6.34 got released.  - Linus ]
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  9. KVM: ia64: Add missing spin_unlock in kvm_arch_hardware_enable()

    JuliaLawall authored and Avi Kivity committed May 26, 2010
    Add a spin_unlock missing on the error path.
    
    The semantic match that finds this problem is as follows:
    (http://coccinelle.lip6.fr/)
    
    // <smpl>
    @@
    expression E1;
    @@
    
    * spin_lock(E1,...);
      <+... when != E1
      if (...) {
        ... when != E1
    *   return ...;
      }
      ...+>
    * spin_unlock(E1,...);
    // </smpl>
    
    Signed-off-by: Julia Lawall <julia@diku.dk>
    Signed-off-by: Avi Kivity <avi@redhat.com>
  10. KVM: Fix order passed to iommu_unmap

    jan-kiszka authored and Avi Kivity committed May 26, 2010
    This is obviously a left-over from the the old interface taking the
    size. Apparently a mostly harmless issue with the current iommu_unmap
    implementation.
    
    Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
    Acked-by: Joerg Roedel <joerg.roedel@amd.com>
    Signed-off-by: Avi Kivity <avi@redhat.com>
  11. KVM: MMU: Remove user access when allowing kernel access to gpte.w=0 …

    Avi Kivity
    Avi Kivity committed May 27, 2010
    …page
    
    If cr0.wp=0, we have to allow the guest kernel access to a page with pte.w=0.
    We do that by setting spte.w=1, since the host cr0.wp must remain set so the
    host can write protect pages.  Once we allow write access, we must remove
    user access otherwise we mistakenly allow the user to write the page.
    
    Reviewed-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
    Signed-off-by: Avi Kivity <avi@redhat.com>
  12. KVM: MMU: invalidate and flush on spte small->large page size change

    Marcelo Tosatti Avi Kivity
    Marcelo Tosatti authored and Avi Kivity committed May 28, 2010
    Always invalidate spte and flush TLBs when changing page size, to make
    sure different sized translations for the same address are never cached
    in a CPU's TLB.
    
    Currently the only case where this occurs is when a non-leaf spte pointer is
    overwritten by a leaf, large spte entry. This can happen after dirty
    logging is disabled on a memslot, for example.
    
    Noticed by Andrea.
    
    KVM-Stable-Tag
    Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
    Signed-off-by: Avi Kivity <avi@redhat.com>
  13. KVM: SVM: Implement workaround for Erratum 383

    Joerg Roedel Avi Kivity
    Joerg Roedel authored and Avi Kivity committed May 17, 2010
    This patch implements a workaround for AMD erratum 383 into
    KVM. Without this erratum fix it is possible for a guest to
    kill the host machine. This patch implements the suggested
    workaround for hypervisors which will be published by the
    next revision guide update.
    
    [jan: fix overflow warning on i386]
    [xiao: fix unused variable warning]
    
    Cc: stable@kernel.org
    Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
    Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
    Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
    Signed-off-by: Avi Kivity <avi@redhat.com>
  14. KVM: SVM: Handle MCEs early in the vmexit process

    Joerg Roedel Avi Kivity
    Joerg Roedel authored and Avi Kivity committed May 17, 2010
    This patch moves handling of the MC vmexits to an earlier
    point in the vmexit. The handle_exit function is too late
    because the vcpu might alreadry have changed its physical
    cpu.
    
    Cc: stable@kernel.org
    Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
    Signed-off-by: Avi Kivity <avi@redhat.com>
  15. KVM: powerpc: fix init/exit annotation

    Jean Delvare Avi Kivity
    Jean Delvare authored and Avi Kivity committed May 18, 2010
    kvmppc_e500_exit() is a module_exit function, so it should be tagged
    with __exit, not __init. The incorrect annotation was added by commit
    2986b8c.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Cc: stable@kernel.org
    Signed-off-by: Alexander Graf <agraf@suse.de>
    Signed-off-by: Avi Kivity <avi@redhat.com>
  16. microblaze: Fix sg_dma_len() regression

    fujita authored and michalsimek committed Jun 8, 2010
    The commit "asm-generic: add NEED_SG_DMA_LENGTH to define sg_dma_len()"
    18e9830 broke microblaze compilation.
    
    dma_direct_map_sg() sets sg->dma_length, however microblaze doesn't
    set NEED_SG_DMA_LENGTH so scatterlist strcutres doesn't include
    dma_length.
    
    sg->dma_length is always equal to sg->length on microblaze. So we
    don't need to set set dma_length, that is, microblaze can simply use
    sg->length.
    
    Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
    Signed-off-by: Michal Simek <monstr@monstr.eu>
  17. microblaze: Define ARCH_SLAB_MINALIGN to fix slab crash

    michalsimek committed Jun 7, 2010
    The commit "mm: Move ARCH_SLAB_MINALIGN and
    ARCH_KMALLOC_MINALIGN to <linux/slab_def.h>"
    1f0ce8b which moved the ARCH_SLAB_MINALIGN
    default into the global header broke FLAT for Microblaze.
    
    Error message:
    slab error in verify_redzone_free(): cache `idr_layer_cache':
    memory outside object was overwritten
    
    Signed-off-by: Michal Simek <monstr@monstr.eu>
  18. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds committed Jun 9, 2010
    …/git/ieee1394/linux1394-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
      firewire: core: check for 1394a compliant IRM, fix inaccessibility of Sony camcorder
  19. Revert "drm/i915: Don't enable pipe/plane/VCO early (wait for DPMS on)."

    torvalds committed Jun 9, 2010
    This reverts commit cfecde4, since it
    seems to cause some systems to not come up with any video output at all
    (or video that only comes on when X starts up).
    
    Fixes bugzilla:
    
        http://bugzilla.kernel.org/show_bug.cgi?id=16163
    
    Reported-and-tested-by: David John <davidjon@xenontk.org>
    Tested-by: Nick Bowler <nbowler@elliptictech.com>
    Acked-by: Carl Worth <cworth@cworth.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  20. Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds committed Jun 9, 2010
    …/git/airlied/drm-2.6
    
    * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (23 commits)
      drm/radeon: don't poll tv dac if crtc2 is in use.
      drm/radeon: reset i2c valid to avoid incorrect tv-out polling.
      drm/nv50: fix iommu errors caused by device reading from address 0
      drm/nouveau: off by one in init_i2c_device_find()
      nouveau: off by one in nv50_gpio_location()
      drm/nouveau: completely fail init if we fail to map the PRAMIN BAR
      drm/nouveau: match U/DP script against SOR link
      drm/radeon/kms/pm: resurrect printing power states
      drm/radeon/kms: add trivial debugging for voltage
      drm/radeon/kms/r600+: use voltage from requested clock mode (v3)
      drm/radeon/kms/pm: track current voltage (v2)
      drm/radeon/kms/pm: Disable voltage adjust on RS780/RS880
      drm/radeon/kms: fix typo in printing the HPD info
      drm/radeon/kms/pm: add mid profile
      drm/radeon/kms/pm: Misc fixes
      drm/radeon/kms/combios: fix typo in voltage fix
      drm/radeon/kms/evergreen: set accel_enabled
      drm/vmwgfx: return -EFAULT for copy_to_user errors
      drm/drm_crtc: return -EFAULT on copy_to_user errors
      drm/fb: use printk to print out the switching to text mode error.
      ...
  21. Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

    torvalds committed Jun 9, 2010
    * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
      [S390] Update default configuration.
      [S390] arch/s390/kvm: Use GFP_ATOMIC when a lock is held
      [S390] kprobes: add parameter check to module_free()
      [S390] appldata/extmem/kvm: add missing GFP_KERNEL flag
  22. writeback: limit write_cache_pages integrity scanning to current EOF

    Dave Chinner authored and torvalds committed Jun 9, 2010
    sync can currently take a really long time if a concurrent writer is
    extending a file. The problem is that the dirty pages on the address
    space grow in the same direction as write_cache_pages scans, so if
    the writer keeps ahead of writeback, the writeback will not
    terminate until the writer stops adding dirty pages.
    
    For a data integrity sync, we only need to write the pages dirty at
    the time we start the writeback, so we can stop scanning once we get
    to the page that was at the end of the file at the time the scan
    started.
    
    This will prevent operations like copying a large file preventing
    sync from completing as it will not write back pages that were
    dirtied after the sync was started. This does not impact the
    existing integrity guarantees, as any dirty page (old or new)
    within the EOF range at the start of the scan will still be
    captured.
    
    This patch will not prevent sync from blocking on large writes into
    holes. That requires more complex intervention while this patch only
    addresses the common append-case of this sync holdoff.
    
    Signed-off-by: Dave Chinner <dchinner@redhat.com>
    Reviewed-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  23. xfs: remove nr_to_write writeback windup.

    Dave Chinner authored and torvalds committed Jun 9, 2010
    Now that the background flush code has been fixed, we shouldn't need to
    silently multiply the wbc->nr_to_write to get good writeback. Remove
    that code.
    
    Signed-off-by: Dave Chinner <dchinner@redhat.com>
    Reviewed-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>