Commits on Oct 20, 2010
  1. @torvalds

    Linux 2.6.36

    torvalds committed Oct 20, 2010
  2. @torvalds

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

    …linus
    
    * 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus:
      MIPS: O32 compat/N32: Fix to use compat syscall wrappers for AIO syscalls.
      MAINTAINERS: Change list for ioc_serial to linux-serial.
      SERIAL: ioc3_serial: Return -ENOMEM on memory allocation failure
      MIPS: jz4740: Fix Kbuild Platform file.
      MIPS: Repair Kbuild make clean breakage.
    torvalds committed Oct 20, 2010
  3. @torvalds

    virtio: console: Don't block entire guest if host doesn't read data

    If the host is slow in reading data or doesn't read data at all,
    blocking write calls not only blocked the program that called write()
    but the entire guest itself.
    
    To overcome this, let's not block till the host signals it has given
    back the virtio ring element we passed it.  Instead, send the buffer to
    the host and return to userspace.  This operation then becomes similar
    to how non-blocking writes work, so let's use the existing code for this
    path as well.
    
    This code change also ensures blocking write calls do get blocked if
    there's not enough room in the virtio ring as well as they don't return
    -EAGAIN to userspace.
    
    Signed-off-by: Amit Shah <amit.shah@redhat.com>
    Acked-by: Hans de Goede <hdegoede@redhat.com>
    CC: stable@kernel.org
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Amit Shah committed with torvalds Oct 20, 2010
  4. @torvalds

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

    …s-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
      [SCSI] bsg: fix incorrect device_status value
      [SCSI] Fix VPD inquiry page wrapper
    torvalds committed Oct 20, 2010
  5. @torvalds

    Merge branch 'kvm-updates/2.6.36' of git://git.kernel.org/pub/scm/vir…

    …t/kvm/kvm
    
    * 'kvm-updates/2.6.36' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
      KVM: Fix fs/gs reload oops with invalid ldt
    torvalds committed Oct 20, 2010
Commits on Oct 19, 2010
  1. @michel-thebeau-WR @ralfbaechle

    MIPS: O32 compat/N32: Fix to use compat syscall wrappers for AIO sysc…

    …alls.
    
    [Ralf: Michel's original patch only fixed N32; I replicated the same fix
    for O32.]
    
    Signed-off-by: Michel Thebeau <michel.thebeau@windriver.com>
    Cc: paul.gortmaker@windriver.com
    Cc: bruce.ashfield@windriver.com
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    michel-thebeau-WR committed with ralfbaechle Sep 28, 2010
  2. @ralfbaechle

    MAINTAINERS: Change list for ioc_serial to linux-serial.

    IOC3 is also being used on SGI MIPS systems but this particular driver is
    only being used on IA64 systems so linux-mips made no sense as a list.  Pat
    also thinks linux-serial@vger.kernel.org is the better list.
    
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    ralfbaechle committed Oct 19, 2010
  3. @JuliaLawall @ralfbaechle

    SERIAL: ioc3_serial: Return -ENOMEM on memory allocation failure

    In this code, 0 is returned on memory allocation failure, even though other
    failures return -ENOMEM or other similar values.
    
    A simplified version of the semantic match that finds this problem is as
    follows: (http://coccinelle.lip6.fr/)
    
    // <smpl>
    @@
    expression ret;
    expression x,e1,e2,e3;
    @@
    
    ret = 0
    ... when != ret = e1
    *x = \(kmalloc\|kcalloc\|kzalloc\)(...)
    ... when != ret = e2
    if (x == NULL) { ... when != ret = e3
      return ret;
    }
    // </smpl>
    
    Signed-off-by: Julia Lawall <julia@diku.dk>
    To: Pat Gefre <pfg@sgi.com>
    Cc: kernel-janitors@vger.kernel.org
    Cc: linux-ia64@vger.kernel.org
    Cc: linux-mips@linux-mips.org
    Cc: linux-kernel@vger.kernel.org
    Patchwork: https://patchwork.linux-mips.org/patch/1704/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    JuliaLawall committed with ralfbaechle Oct 15, 2010
  4. @ralfbaechle

    MIPS: jz4740: Fix Kbuild Platform file.

    The platform specific files should be included via the platform-y
    variable.
    
    Signed-off-by: David Daney <ddaney@caviumnetworks.com>
    Cc: Lars-Peter Clausen <lars@metafoo.de>
    Patchwork: https://patchwork.linux-mips.org/patch/1719/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    David Daney committed with ralfbaechle Oct 18, 2010
  5. @ralfbaechle

    MIPS: Repair Kbuild make clean breakage.

    When running make clean, Kbuild doesn't process the .config file, so nothing
    generates a platform-y variable.  We can get it to descend into the platform
    directories by setting $(obj-).
    
    The dec Platform file was unconditionally setting platform-, obliterating
    its previous contents and preventing some directories from being cleaned.
    This is change to an append operation '+=' to allow cavium-octeon to be
    cleaned.
    
    Signed-off-by: David Daney <ddaney@caviumnetworks.com>
    Cc: Sam Ravnborg <sam@ravnborg.org>
    Patchwork: https://patchwork.linux-mips.org/patch/1718/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    David Daney committed with ralfbaechle Oct 18, 2010
  6. @torvalds

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

    …/git/airlied/drm-2.6
    
    * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
      drm/radeon/kms: avivo cursor workaround applies to evergreen as well
    torvalds committed Oct 19, 2010
  7. KVM: Fix fs/gs reload oops with invalid ldt

    kvm reloads the host's fs and gs blindly, however the underlying segment
    descriptors may be invalid due to the user modifying the ldt after loading
    them.
    
    Fix by using the safe accessors (loadsegment() and load_gs_index()) instead
    of home grown unsafe versions.
    
    This is CVE-2010-3698.
    
    KVM-Stable-Tag.
    Signed-off-by: Avi Kivity <avi@redhat.com>
    Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
    Avi Kivity committed with Marcelo Tosatti Oct 19, 2010
Commits on Oct 18, 2010
  1. @torvalds

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

    …linus
    
    * 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus:
      MIPS: Enable ISA_DMA_API config to fix build failure
      MIPS: 32-bit: Fix build failure in asm/fcntl.h
      MIPS: Remove all generated vmlinuz* files on "make clean"
      MIPS: do_sigaltstack() expects userland pointers
      MIPS: Fix error values in case of bad_stack
      MIPS: Sanitize restart logics
      MIPS: secure_computing, syscall audit: syscall number should in r2, not r0.
      MIPS: Don't block signals if we'd failed to setup a sigframe
    torvalds committed Oct 18, 2010
  2. @torvalds

    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: evdev - fix EVIOCSABS regression
      Input: evdev - fix Ooops in EVIOCGABS/EVIOCSABS
    torvalds committed Oct 18, 2010
  3. @torvalds

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

    …/git/ieee1394/linux1394-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
      firewire: ohci: fix TI TSB82AA2 regression since 2.6.35
    torvalds committed Oct 18, 2010
  4. @saschahauer @torvalds

    mxc_nand: do not depend on disabling the irq in the interrupt handler

    This patch reverts the driver to enabling/disabling the NFC interrupt
    mask rather than enabling/disabling the system interrupt.  This cleans
    up the driver so that it doesn't rely on interrupts being disabled
    within the interrupt handler.
    
    For i.MX21 we keep the current behaviour, that is calling
    enable_irq/disable_irq_nosync to enable/disable interrupts.  This patch
    is based on earlier work by John Ogness.
    
    Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
    Acked-by: John Ogness <john.ogness@linutronix.de>
    Tested-by: John Ogness <john.ogness@linutronix.de>
    Signed-off-by: David Woodhouse <dwmw2@infradead.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    saschahauer committed with torvalds Oct 18, 2010
  5. @torvalds

    Merge branch 'for-linus/i2c/2636-rc8' of git://git.fluff.org/bjdooks/…

    …linux
    
    * 'for-linus/i2c/2636-rc8' of git://git.fluff.org/bjdooks/linux:
      i2c-imx: do not allow interruptions when waiting for I2C to complete
      i2c-davinci: Fix TX setup for more SoCs
    torvalds committed Oct 18, 2010
  6. @torvalds

    Merge branch 'fixes'

    * fixes:
      v4l1: fix 32-bit compat microcode loading translation
      De-pessimize rds_page_copy_user
    torvalds committed Oct 18, 2010
  7. @namhyung @ralfbaechle

    MIPS: Enable ISA_DMA_API config to fix build failure

    Add ISA_DMA_API config item and select it when GENERIC_ISA_DMA enabled.
    This fixes build failure on allmodconfig like following:
    
      CC      sound/isa/es18xx.o
    sound/isa/es18xx.c: In function 'snd_es18xx_playback1_prepare':
    sound/isa/es18xx.c:501:9: error: implicit declaration of function 'snd_dma_program'
    sound/isa/es18xx.c: In function 'snd_es18xx_playback_pointer':
    sound/isa/es18xx.c:818:3: error: implicit declaration of function 'snd_dma_pointer'
    make[3]: *** [sound/isa/es18xx.o] Error 1
    make[2]: *** [sound/isa/es18xx.o] Error 2
    make[1]: *** [sub-make] Error 2
    make: *** [all] Error 2
    
    Signed-off-by: Namhyung Kim <namhyung@gmail.com>
    Cc: linux-mips@linux-mips.org
    Cc: linux-kernel@vger.kernel.org
    Patchwork: https://patchwork.linux-mips.org/patch/1717/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    namhyung committed with ralfbaechle Oct 18, 2010
  8. @namhyung @ralfbaechle

    MIPS: 32-bit: Fix build failure in asm/fcntl.h

      CC      security/integrity/ima/ima_fs.o
    In file included from linux/include/linux/fcntl.h:4:0,
                     from linux/security/integrity/ima/ima_fs.c:18:
    linux/arch/mips/include/asm/fcntl.h:63:2: error: expected specifier-qualifier-list before 'off_t'
    make[3]: *** [security/integrity/ima/ima_fs.o] Error 1
    make[2]: *** [security/integrity/ima/ima_fs.o] Error 2
    make[1]: *** [sub-make] Error 2
    make: *** [all] Error 2
    
    Signed-off-by: Namhyung Kim <namhyung@gmail.com>
    Cc: linux-kernel@vger.kernel.org
    Patchwork: https://patchwork.linux-mips.org/patch/1715/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    namhyung committed with ralfbaechle Oct 18, 2010
  9. @lzufalcon @ralfbaechle

    MIPS: Remove all generated vmlinuz* files on "make clean"

    [Ralf: I changed the patch to explicitly list all files to be deleted out
    of paranoia.]
    
    Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com>
    Patchwork: http://patchwork.linux-mips.org/patch/1590/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    lzufalcon committed with ralfbaechle Sep 22, 2010
  10. @ralfbaechle

    MIPS: do_sigaltstack() expects userland pointers

    o32 compat does the right thing, native and n32 compat do not...
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Cc: linux-kernel@vger.kernel.org
    Cc: linux-arch@vger.kernel.org
    Cc: linux-mips@linux-mips.org
    Patchwork: http://patchwork.linux-mips.org/patch/1700/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    Al Viro committed with ralfbaechle Sep 28, 2010
  11. @ralfbaechle

    MIPS: Fix error values in case of bad_stack

    We want EFAULT, not -<syscall number>
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Cc: linux-kernel@vger.kernel.org
    Cc: linux-arch@vger.kernel.org
    Cc: linux-mips@linux-mips.org
    Patchwork: https://patchwork.linux-mips.org/patch/1699/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    Al Viro committed with ralfbaechle Sep 28, 2010
  12. @ralfbaechle

    MIPS: Sanitize restart logics

    Put the original syscall number into ->regs[0] when we leave syscall
    with error.  Use it in restart logics.  Everything else will have
    it 0 since we pass through SAVE_SOME on all the ways in.  Note that
    in places like bad_stack and inllegal_syscall we leave it 0 - it's not
    restartable.
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Cc: linux-kernel@vger.kernel.org
    Cc: linux-arch@vger.kernel.org
    Cc: linux-mips@linux-mips.org
    Patchwork: https://patchwork.linux-mips.org/patch/1698/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    Al Viro committed with ralfbaechle Sep 28, 2010
  13. @ralfbaechle

    MIPS: secure_computing, syscall audit: syscall number should in r2, n…

    …ot r0.
    
    As it is, audit_syscall_entry() and secure_computing() get the
    bogus value (0, in fact)
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Cc: linux-kernel@vger.kernel.org
    Cc: linux-arch@vger.kernel.org
    Cc: linux-mips@linux-mips.org
    Patchwork: https://patchwork.linux-mips.org/patch/1697/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    Al Viro committed with ralfbaechle Sep 28, 2010
  14. @ralfbaechle

    MIPS: Don't block signals if we'd failed to setup a sigframe

    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Cc: linux-kernel@vger.kernel.org
    Cc: linux-arch@vger.kernel.org
    Cc: linux-mips@linux-mips.org
    Patchwork: https://patchwork.linux-mips.org/patch/1696/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    Al Viro committed with ralfbaechle Sep 28, 2010
  15. @zonque @dtor

    Input: evdev - fix EVIOCSABS regression

    448cd16 ("Input: evdev - rearrange ioctl handling") broke EVIOCSABS by
    checking for the wrong direction bit.
    
    Signed-off-by: Daniel Mack <zonque@gmail.com>
    Reported-by: Sven Neumann <s.neumann@raumfeld.com>
    Tested-by: Sven Neumann <s.neumann@raumfeld.com>
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
    zonque committed with dtor Oct 18, 2010
  16. @zonque @dtor

    Input: evdev - fix Ooops in EVIOCGABS/EVIOCSABS

    This fixes a regression introduced by the dynamic allocation of absinfo
    for input devices. We need to bail out early for input devices which
    don't have absolute axis.
    
    [  929.664303] Pid: 2989, comm: input Not tainted 2.6.36-rc8+ #14 MS-7260/MS-7260
    [  929.664318] EIP: 0060:[<c12bdc01>] EFLAGS: 00010246 CPU: 0
    [  929.664331] EIP is at evdev_ioctl+0x4f8/0x59f
    [  929.664341] EAX: 00000040 EBX: 00000000 ECX: 00000006 EDX: f45a1efc
    [  929.664355] ESI: 00000000 EDI: f45a1efc EBP: f45a1f24 ESP: f45a1eb8
    [  929.664369]  DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068
    [  929.664402]  f470da74 f6a30e78 f462c240 00000018 bfe4a260 00000000 f45b06fc 00000000
    [  929.664429] <0> 000000c4 b769d000 c3544620 f470da74 f45b06fc f45b06fc f45a1f38 c107dd1f
    [  929.664458] <0> f4710b74 000000c4 00000000 00000000 00000000 0000029d 00000a74 f4710b74
    [  929.664500]  [<c107dd1f>] ? handle_mm_fault+0x2be/0x59a
    [  929.664513]  [<c12bd709>] ? evdev_ioctl+0x0/0x59f
    [  929.664524]  [<c1099d30>] ? do_vfs_ioctl+0x494/0x4d9
    [  929.664538]  [<c10432a1>] ? up_read+0x16/0x29
    [  929.664550]  [<c101c818>] ? do_page_fault+0x2ff/0x32d
    [  929.664564]  [<c108d048>] ? do_sys_open+0xc5/0xcf
    [  929.664575]  [<c1099db6>] ? sys_ioctl+0x41/0x61
    [  929.664587]  [<c1002710>] ? sysenter_do_call+0x12/0x36
    [  929.684570] ---[ end trace 11b83e923bd8f2bb ]---
    
    Signed-off-by: Daniel Mack <zonque@gmail.com>
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
    zonque committed with dtor Oct 18, 2010
  17. @marckleinebudde

    i2c-imx: do not allow interruptions when waiting for I2C to complete

    The i2c_imx_trx_complete() function is using
    wait_event_interruptible_timeout() to wait for the I2C controller to
    signal that it has completed an I2C bus operation. If the process that
    causes the I2C operation receives a signal, the wait will be
    interrupted, returning an error. It is better to let the I2C operation
    finished before handling the signal (i.e. returning into userspace).
    
    It is safe to use wait_event_timeout() instead, because the timeout
    will allow the process to exit if the I2C bus hangs. It's also better
    to allow the I2C operation to finish, because unacknowledged I2C
    operations can cause the I2C bus to hang.
    
    Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
    Reviewed-by: Wolfram Sang <w.sang@pengutronix.de>
    Signed-off-by: Ben Dooks <ben-linux@fluff.org>
    marckleinebudde committed with Ben Dooks Jun 21, 2010
  18. i2c-davinci: Fix TX setup for more SoCs

    This patch is an improvement to 4bba0fd
    which got to mainline a little early.
    
    Sudhakar Rajashekhara explains that at least OMAP-L138 requires MDR mode
    settings before DXR for correct behaviour, so load MDR first with
    STT cleared and later load again with STT set.
    
    Tested on DM355 connected to Techwell TW2836 and Wolfson WM8985
    
    Signed-off-by: Jon Povey <jon.povey@racelogic.co.uk>
    Acked-by: Troy Kisky <troy.kisky@boundarydevices.com>
    Tested-by: Sudhakar Rajashekhara <sudhakar.raj@ti.com>
    Acked-by: Kevin Hilman <khilman@deeprootsystems.com>
    Signed-off-by: Ben Dooks <ben-linux@fluff.org>
    Jon Povey committed with Ben Dooks Oct 12, 2010
Commits on Oct 17, 2010
  1. drm/radeon/kms: avivo cursor workaround applies to evergreen as well

    Fixes cursor corruption in certain cases.
    
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Cc: stable@kernel.org
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Alex Deucher committed with Dave Airlie Oct 14, 2010
  2. @torvalds

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

    …git/tiwai/sound-2.6
    
    * 'fix/misc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
      ALSA: rawmidi: fix oops (use after free) when unloading a driver module
    torvalds committed Oct 17, 2010
  3. firewire: ohci: fix TI TSB82AA2 regression since 2.6.35

    Revert commit 5467238
    "firewire: ohci: fix up configuration of TI chips".
    It caused massive slow-down and data corruption with a TSB82AA2 based
    StarTech EC1394B2 ExpressCard and FireWire 800 harddisks.
    
    https://bugs.launchpad.net/ubuntu/+source/linux/+bug/657081
    http://thread.gmane.org/gmane.linux.kernel.firewire.user/4013
    
    The fact that some card EEPROMs do not program these enhancements may be
    related to TSB81BA3 phy chip errata, if not to bugs of TSB82AA2 itself.
    We could re-add these configuration steps, but only conditional on a
    whitelist of cards on which these enhancements bring a proven positive
    effect.
    
    Reported-and-tested-by: Eric Shattow <lucent@gmail.com>
    Cc: Clemens Ladisch <clemens@ladisch.de>
    Cc: <stable@kernel.org> 2.6.35
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
    Stefan Richter committed Oct 17, 2010
  4. @cladisch @tiwai

    ALSA: rawmidi: fix oops (use after free) when unloading a driver module

    When a driver module is unloaded and the last still open file is a raw
    MIDI device, the card and its devices will be actually freed in the
    snd_card_file_remove() call when that file is closed.  Afterwards, rmidi
    and rmidi->card point into freed memory, so the module pointer is likely
    to be garbage.
    (This was introduced by commit 9a1b64c.)
    
    Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
    Reported-by: Krzysztof Foltman <wdev@foltman.com>
    Cc: 2.6.30-2.6.35 <stable@kernel.org>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    cladisch committed with tiwai Oct 15, 2010
Commits on Oct 16, 2010
  1. @jkkm @torvalds

    m32r: test __LITTLE_ENDIAN__ instead of __LITTLE_ENDIAN

    Fixes build for me... these are what's tested in byteorder.h...
    
    Signed-off-by: Kyle McMartin <kyle@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    jkkm committed with torvalds Oct 15, 2010