Permalink
Switch branches/tags
Commits on May 13, 2010
  1. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/sameo/mfd-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
      mfd: Clean up after WM83xx AUXADC interrupt if it arrives late
    torvalds committed May 13, 2010
  2. Merge branch 'kvm-updates/2.6.34' of git://git.kernel.org/pub/scm/vir…

    …t/kvm/kvm
    
    * 'kvm-updates/2.6.34' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
      KVM: PPC: Keep index within boundaries in kvmppc_44x_emul_tlbwe()
      KVM: VMX: blocked-by-sti must not defer NMI injections
      KVM: x86: Call vcpu_load and vcpu_put in cpuid_update
      KVM: SVM: Fix wrong intercept masks on 32 bit
      KVM: convert ioapic lock to spinlock
    torvalds committed May 13, 2010
  3. Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6

    * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
      serial: imx.c: fix CTS trigger level lower to avoid lost chars
      tty: Fix unbalanced BKL handling in error path
      serial: mpc52xx_uart: fix null pointer dereference
    torvalds committed May 13, 2010
  4. serial: imx.c: fix CTS trigger level lower to avoid lost chars

    The imx CTS trigger level is left at its reset value that is 32
    chars. Since the RX FIFO has 32 entries, when CTS is raised, the
    FIFO already is full. However, some serial port devices first empty
    their TX FIFO before stopping when CTS is raised, resulting in lost
    chars.
    
    This patch sets the trigger level lower so that other chars arrive
    after CTS is raised, there is still room for 16 of them.
    
    Signed-off-by: Valentin Longchamp<valentin.longchamp@epfl.ch>
    Tested-by: Philippe Rétornaz<philippe.retornaz@epfl.ch>
    Acked-by: Wolfram Sang<w.sang@pengutronix.de>
    Cc: stable <stable@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Valentin Longchamp committed with gregkh May 5, 2010
  5. tty: Fix unbalanced BKL handling in error path

    Arnd noted:
    
    After the "retry_open:" label, we first get the tty_mutex
    and then the BKL. However a the end of tty_open, we jump
    back to retry_open with the BKL still held. If we run into
    this case, the tty_open function will be left with the BKL
    still held.
    
    Signed-off-by: Alan Cox <alan@linux.intel.com>
    Acked-by: Arnd Bergmann <arnd@arndb.de>
    Cc: stable <stable@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Alan Cox committed with gregkh May 4, 2010
  6. serial: mpc52xx_uart: fix null pointer dereference

    Commit 6acc683
    introduced NULL pointer dereference and kernel crash
    on ppc32 machines while booting. Fix this bug now.
    
    Reported-by: Leonardo Chiquitto <leonardo.lists@gmail.com>
    Tested-by: Leonardo Chiquitto <leonardo.lists@gmail.com>
    Signed-off-by: Anatolij Gustschin <agust@denx.de>
    Acked-by: Grant Likely <grant.likely@secretlab.ca>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Anatolij Gustschin committed with gregkh May 4, 2010
  7. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/sfrench/cifs-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
      cifs: guard against hardlinking directories
    torvalds committed May 13, 2010
  8. vfs: Fix O_NOFOLLOW behavior for paths with trailing slashes

    According to specification
    
    	mkdir d; ln -s d a; open("a/", O_NOFOLLOW | O_RDONLY)
    
    should return success but currently it returns ELOOP.  This is a
    regression caused by path lookup cleanup patch series.
    
    Fix the code to ignore O_NOFOLLOW in case the provided path has trailing
    slashes.
    
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Cc: Al Viro <viro@zeniv.linux.org.uk>
    Reported-by: Marius Tolzmann <tolzmann@molgen.mpg.de>
    Acked-by: Miklos Szeredi <mszeredi@suse.cz>
    Signed-off-by: Jan Kara <jack@suse.cz>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    jankara committed with torvalds May 13, 2010
  9. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/tiwai/sound-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
      ALSA: ice1724 - Fix ESI Maya44 capture source control
      ALSA: pcm - Use pgprot_noncached() for MIPS non-coherent archs
      ALSA: virtuoso: fix Xonar D1/DX front panel microphone
      ALSA: hda - Add hp-dv4 model for IDT 92HD71bx
      ALSA: hda - Fix mute-LED GPIO pin for HP dv series
      ALSA: hda: Fix 0 dB for Lenovo models using Conexant CX20549 (Venice)
    torvalds committed May 13, 2010
  10. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/dtor/input
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
      Input: ad7877 - keep dma rx buffers in seperate cache lines
      Input: psmouse - reset all types of mice before reconnecting
      Input: elantech - use all 3 bytes when checking version
      Input: iforce - fix Guillemot Jet Leader 3D entry
      Input: iforce - add Guillemot Jet Leader Force Feedback
    torvalds committed May 13, 2010
  11. mfd: Clean up after WM83xx AUXADC interrupt if it arrives late

    In certain circumstances, especially under heavy load, the AUXADC
    completion interrupt may be detected after we've timed out waiting for
    it.  That conversion would still succeed but the next conversion will
    see the completion that was signalled by the interrupt for the previous
    conversion and therefore not wait for the AUXADC conversion to run,
    causing it to report failure.
    
    Provide a simple, non-invasive cleanup by using try_wait_for_completion()
    to ensure that the completion is not signalled before we wait.  Since
    the AUXADC is run within a mutex we know there can only have been at
    most one AUXADC interrupt outstanding.  A more involved change should
    follow for the next merge window.
    
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
    broonie committed with sameo Apr 2, 2010
  12. Input: ad7877 - keep dma rx buffers in seperate cache lines

    With dma based spi transmission, data corruption is observed
    occasionally. With dma buffers located right next to msg and
    xfer fields, cache lines correctly flushed in preparation for
    dma usage may be polluted again when writing to fields in the
    same cache line.
    
    Make sure cache fields used with dma do not share cache lines
    with fields changed during dma handling. As both fields are part
    of a struct that is allocated via kzalloc, thus cache aligned,
    moving the fields to the 1st position and insert padding for
    alignment does the job.
    
    Signed-off-by: Oskar Schirmer <os@emlix.com>
    Signed-off-by: Daniel Glöckner <dg@emlix.com>
    Signed-off-by: Oliver Schneidewind <osw@emlix.com>
    Signed-off-by: Johannes Weiner <jw@emlix.com>
    Acked-by: Mike Frysinger <vapier@gentoo.org>
    [dtor@mail.ru - changed to use ___cacheline_aligned as suggested
     by akpm]
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
    Oskar Schirmer committed with dtor May 13, 2010
  13. Input: psmouse - reset all types of mice before reconnecting

    Synaptics hardware requires resetting device after suspend to ram
    in order for the device to be operational. The reset lives in
    synaptics-specific reconnect handler, but it is not being invoked
    if synaptics support is disabled and the device is handled as a
    standard PS/2 device (bare or IntelliMouse protocol).
    
    Let's add reset into generic reconnect handler as well.
    
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
    dtor committed May 13, 2010
  14. Input: elantech - use all 3 bytes when checking version

    Apparently all 3 bytes returned by ETP_FW_VERSION_QUERY are significant
    and should be taken into account when matching hardware version/features.
    
    Tested-by: Eric Piel <eric.piel@tremplin-utc.net>
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
    dtor committed May 13, 2010
  15. KVM: PPC: Keep index within boundaries in kvmppc_44x_emul_tlbwe()

    An index of KVM44x_GUEST_TLB_SIZE is already one too large.
    
    Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
    Acked-by: Hollis Blanchard <hollis@penguinppc.org>
    Acked-by: Alexander Graf <agraf@suse.de>
    Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
    RoelKluin committed with Marcelo Tosatti May 9, 2010
  16. KVM: VMX: blocked-by-sti must not defer NMI injections

    As the processor may not consider GUEST_INTR_STATE_STI as a reason for
    blocking NMI, it could return immediately with EXIT_REASON_NMI_WINDOW
    when we asked for it. But as we consider this state as NMI-blocking, we
    can run into an endless loop.
    
    Resolve this by allowing NMI injection if just GUEST_INTR_STATE_STI is
    active (originally suggested by Gleb). Intel confirmed that this is
    safe, the processor will never complain about NMI injection in this
    state.
    
    Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
    KVM-Stable-Tag
    Acked-by: Gleb Natapov <gleb@redhat.com>
    Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
    jan-kiszka committed with Marcelo Tosatti May 11, 2010
  17. KVM: x86: Call vcpu_load and vcpu_put in cpuid_update

    cpuid_update may operate VMCS, so vcpu_load() and vcpu_put()
    should be called to ensure correctness.
    
    Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
    Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
    Dongxiao Xu committed with Marcelo Tosatti May 11, 2010
  18. KVM: SVM: Fix wrong intercept masks on 32 bit

    This patch makes KVM on 32 bit SVM working again by
    correcting the masks used for iret interception. With the
    wrong masks the upper 32 bits of the intercepts are masked
    out which leaves vmrun unintercepted. This is not legal on
    svm and the vmrun fails.
    Bug was introduced by commits 95ba827 and 3cfc309.
    
    Cc: Jan Kiszka <jan.kiszka@siemens.com>
    Cc: Gleb Natapov <gleb@redhat.com>
    Cc: stable@kernel.org
    Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
    Signed-off-by: Avi Kivity <avi@redhat.com>
    Joerg Roedel committed with Marcelo Tosatti May 5, 2010
  19. KVM: convert ioapic lock to spinlock

    kvm_set_irq is used from non sleepable contexes, so convert ioapic from
    mutex to spinlock.
    
    KVM-Stable-Tag.
    Tested-by: Ralf Bonenkamp <ralf.bonenkamp@swyx.com>
    Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
    Marcelo Tosatti committed Apr 23, 2010
  20. 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/perf_event: Fix oops due to perf_event_do_pending call
      powerpc/swiotlb: Fix off by one in determining boundary of which ops to use
    torvalds committed May 13, 2010
  21. Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

    * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
      [S390] correct address of _stext with CONFIG_SHARED_KERNEL=y
      [S390] ptrace: fix return value of do_syscall_trace_enter()
      [S390] dasd: fix race between tasklet and dasd_sleep_on
    torvalds committed May 13, 2010
  22. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/sage/ceph-client
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
      ceph: preserve seq # on requeued messages after transient transport errors
      ceph: fix cap removal races
      ceph: zero unused message header, footer fields
      ceph: fix locking for waking session requests after reconnect
      ceph: resubmit requests on pg mapping change (not just primary change)
      ceph: fix open file counting on snapped inodes when mds returns no caps
      ceph: unregister osd request on failure
      ceph: don't use writeback_control in writepages completion
      ceph: unregister bdi before kill_anon_super releases device name
    torvalds committed May 13, 2010
  23. Revert "PCI: update bridge resources to get more big ranges in PCI as…

    …sign unssigned"
    
    This reverts commit 977d17b, because it
    can cause problems with some devices not getting any resources at all
    when the resource tree is re-allocated.
    
    For an example of this, see
    
    	https://bugzilla.kernel.org/show_bug.cgi?id=15960
    	(originally https://bugtrack.alsa-project.org/alsa-bug/view.php?id=4982)
    	(lkml thread: http://lkml.org/lkml/2010/4/19/20)
    
    where Peter Henriksson reported his Xonar DX sound card gone, because
    the IO port region was no longer allocated.
    
    Reported-bisected-and-tested-by: Peter Henriksson <peter.henriksson@gmail.com>
    Requested-by: Andrew Morton <akpm@linux-foundation.org>
    Requested-by: Clemens Ladisch <clemens@ladisch.de>
    Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Cc: Yinghai Lu <yinghai@kernel.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    torvalds committed May 13, 2010
  24. CacheFiles: Fix error handling in cachefiles_determine_cache_security()

    cachefiles_determine_cache_security() is expected to return with a
    security override in place.  However, if set_create_files_as() fails, we
    fail to do this.  In this case, we should just reinstate the security
    override that was set by the caller.
    
    Furthermore, if set_create_files_as() fails, we should dispose of the
    new credentials we were in the process of creating.
    
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    dhowells committed with torvalds May 12, 2010
  25. rwsem: Test for no active locks in __rwsem_do_wake undo code

    If there are no active threasd using a semaphore, it is always correct
    to unqueue blocked threads.  This seems to be what was intended in the
    undo code.
    
    What was done instead, was to look for a sem count of zero - this is an
    impossible situation, given that at least one thread is known to be
    queued on the semaphore.  The code might be correct as written, but it's
    hard to reason about and it's not what was intended (otherwise the goto
    out would have been unconditional).
    
    Go for checking the active count - the alternative is not worth the
    headache.
    
    Signed-off-by: Michel Lespinasse <walken@google.com>
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    walken-google committed with torvalds May 12, 2010
Commits on May 12, 2010
  1. ALSA: ice1724 - Fix ESI Maya44 capture source control

    The capture source control of maya44 was wrongly coded with the bit
    shift instead of the bit mask.  Also, the slot for line-in was
    wrongly assigned (slot 5 instead of 4).
    
    Reported-by: Alex Chernyshoff <alexdsp@gmail.com>
    Cc: <stable@kernel.org>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    tiwai committed May 12, 2010
  2. ALSA: pcm - Use pgprot_noncached() for MIPS non-coherent archs

    MIPS non-coherent archs need the noncached pgprot in mmap of PCM buffers.
    But, since the coherency needs to be checked dynamically via
    plat_device_is_coherent(), we need an ugly check dependent on MIPS
    in ALSA core code.
    
    This should be cleaned up in MIPS arch side (e.g. creating
    dma_mmap_coherent()) in near future.
    
    Tested-by: Wu Zhangjin <wuzhangjin@gmail.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    tiwai committed May 12, 2010
  3. ALSA: virtuoso: fix Xonar D1/DX front panel microphone

    Commit 65c3ac8 in 2.6.33 accidentally
    left out the initialization of the AC97 codec FMIC2MIC bit, which broke
    recording from the front panel microphone.
    
    Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
    Cc: <stable@kernel.org>
    Signed-off-by: Jaroslav Kysela <perex@perex.cz>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    cladisch committed with tiwai May 11, 2010
  4. ALSA: hda - Add hp-dv4 model for IDT 92HD71bx

    It turned out that HP dv series have inconsistent the mute-LED GPIO
    mapping among various models.  dv4/7 seem to use GPIO 0 while dv 5/6
    seem to use GPIO 3.  The previous commit
      26ebe0a
      ALSA: hda - Fix mute-LED GPIO pin for HP dv series
    breaks dv5/6.
    
    This patch adds the new quirk model, hp-dv4, to handle HP dv4/7
    separately from HP dv5/6.
    
    Tested-by: Kunal Gangakhedkar <kunal.gangakhedkar@gmail.com> (for dv6-1110ax)
    Acked-by: Kunal Gangakhedkar <kunal.gangakhedkar@gmail.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    tiwai committed May 12, 2010
  5. [S390] correct address of _stext with CONFIG_SHARED_KERNEL=y

    As of git commit 1844c9b head64.S/head31.S
    are not included in head.S anymore but build as an extra object. This breaks
    shared kernel support because the .org statement in head64.S/head31.S for
    CONFIG_SHARED_KERNEL=y will have a different effect. The end address of the
    head.text section in head.o will be added to the .org value, to compensate
    for this subtract 0x11000 to get the required value of 0x100000 again.
    
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Martin Schwidefsky committed with Martin Schwidefsky May 12, 2010
  6. [S390] ptrace: fix return value of do_syscall_trace_enter()

    strace may change the system call number, so regs->gprs[2] must not
    be read before tracehook_report_syscall_entry(). This fixes a bug
    where "strace -f" will hang after a vfork().
    
    Cc: <stable@kernel.org>
    Signed-off-by: Gerald Schaefer <gerald.schaefer@de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Gerald Schaefer committed with Martin Schwidefsky May 12, 2010
  7. [S390] dasd: fix race between tasklet and dasd_sleep_on

    The various dasd_sleep_on functions use a global wait queue when
    waiting for a cqr. The wait condition checks the status and devlist
    fields of the cqr to determine if it is safe to continue. This
    evaluation may return true, although the tasklet has not finished
    processing of the cqr and the callback function has not been called
    yet. When the callback is finally called, the data in the cqr may
    already be invalid. The sleep_on wait condition needs a safe way to
    determine if the tasklet has finished processing. Use the
    callback_data field of the cqr to store a token, which is set by
    the callback function itself.
    
    Cc: <stable@kernel.org>
    Signed-off-by: Stefan Weinhuber <wein@de.ibm.com>
    Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Stefan Weinhuber committed with Martin Schwidefsky May 12, 2010
  8. powerpc/perf_event: Fix oops due to perf_event_do_pending call

    Anton Blanchard found that large POWER systems would occasionally
    crash in the exception exit path when profiling with perf_events.
    The symptom was that an interrupt would occur late in the exit path
    when the MSR[RI] (recoverable interrupt) bit was clear.  Interrupts
    should be hard-disabled at this point but they were enabled.  Because
    the interrupt was not recoverable the system panicked.
    
    The reason is that the exception exit path was calling
    perf_event_do_pending after hard-disabling interrupts, and
    perf_event_do_pending will re-enable interrupts.
    
    The simplest and cleanest fix for this is to use the same mechanism
    that 32-bit powerpc does, namely to cause a self-IPI by setting the
    decrementer to 1.  This means we can remove the tests in the exception
    exit path and raw_local_irq_restore.
    
    This also makes sure that the call to perf_event_do_pending from
    timer_interrupt() happens within irq_enter/irq_exit.  (Note that
    calling perf_event_do_pending from timer_interrupt does not mean that
    there is a possible 1/HZ latency; setting the decrementer to 1 ensures
    that the timer interrupt will happen immediately, i.e. within one
    timebase tick, which is a few nanoseconds or 10s of nanoseconds.)
    
    Signed-off-by: Paul Mackerras <paulus@samba.org>
    Cc: stable@kernel.org
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    paulusmack committed with ozbenh Apr 13, 2010