Skip to content
Commits on Jul 16, 2010
  1. @torvalds

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

    …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: Add alignment to syscall metadata declarations
      perf: Sync callchains with period based hits
      perf: Resurrect flat callchains
      perf: Version String fix, for fallback if not from git
      perf: Version String fix, using kernel version
    torvalds committed Jul 16, 2010
  2. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes

    * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes:
      GFS2: rename causes kernel Oops
      GFS2: BUG in gfs2_adjust_quota
      GFS2: Fix kernel NULL pointer dereference by dlm_astd
      GFS2: recovery stuck on transaction lock
      GFS2: O_TRUNC not working on stuffed files across cluster
    torvalds committed Jul 16, 2010
  3. @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: w90p910_ts - fix call to setup_timer()
      Input: synaptics - fix wrong dimensions check
      Input: i8042 - mark stubs in i8042.h "static inline"
    torvalds committed Jul 16, 2010
  4. @zswan @dtor

    Input: w90p910_ts - fix call to setup_timer()

    No need to take address, w90p910_ts is already a pointer.
    
    Signed-off-by: Wan ZongShun <mcuos.com@gmail.com>
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
    zswan committed with dtor Jul 15, 2010
  5. @torvalds

    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: skcipher - avoid NULL dereference
    torvalds committed Jul 15, 2010
Commits on Jul 15, 2010
  1. @swhiteho

    GFS2: rename causes kernel Oops

    This patch fixes a kernel Oops in the GFS2 rename code.
    
    The problem was in the way the gfs2 directory code was trying
    to re-use sentinel directory entries.
    
    In the failing case, gfs2's rename function was renaming a
    file to another name that had the same non-trivial length.
    The file being renamed happened to be the first directory
    entry on the leaf block.
    
    First, the rename code (gfs2_rename in ops_inode.c) found the
    original directory entry and decided it could do its job by
    simply replacing the directory entry with another.  Therefore
    it determined correctly that no block allocations were needed.
    
    Next, the rename code deleted the old directory entry prior to
    replacing it with the new name.  Therefore, the soon-to-be
    replaced directory entry was temporarily made into a directory
    entry "sentinel" or a place holder at the start of a leaf block.
    
    Lastly, it went to re-add the replacement directory entry in
    that leaf block.  However, when gfs2_dirent_find_space was
    looking for space in the leaf block, it used the wrong value
    for the sentinel.  That threw off its calculations so later
    it decides it can't really re-use the sentinel and therefore
    must allocate a new leaf block.  But because it previously decided
    to re-use the directory entry, it didn't waste the time to
    grab a new block allocation for the inode.  Therefore, the
    inode's i_alloc pointer was still NULL and it crashes trying to
    reference it.
    
    In the case of sentinel directory entries, the entire dirent is
    reused, not just the "free space" portion of it, and therefore
    the function gfs2_dirent_find_space should use the value 0
    rather than GFS2_DIRENT_SIZE(0) for the actual dirent size.
    
    Fixing this calculation enables the reproducer programs to work
    properly.
    
    Signed-off-by: Bob Peterson <rpeterso@redhat.com>
    Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
    Bob Peterson committed with swhiteho Jul 14, 2010
  2. @swhiteho

    GFS2: BUG in gfs2_adjust_quota

    HighMem pages on i686 do not get mapped to the buffer_heads and this was
    causing a NULL pointer dereference when we were trying to memset page buffers
    to zero.
    We now use zero_user() that kmaps the page and directly manipulates page data.
    This patch also fixes a boundary condition that was incorrect.
    
    Signed-off-by: Abhi Das <adas@redhat.com>
    Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
    Abhijith Das committed with swhiteho Jul 4, 2010
  3. @swhiteho

    GFS2: Fix kernel NULL pointer dereference by dlm_astd

    This patch fixes a problem in an error path when looking
    up dinodes.  There are two sister-functions, gfs2_inode_lookup
    and gfs2_process_unlinked_inode.  Both functions acquire and
    hold the i_iopen glock for the dinode being looked up. The last
    thing they try to do is hold the i_gl glock for the dinode.
    If that glock fails for some reason, the error path was
    incorrectly calling gfs2_glock_put for the i_iopen glock twice.
    This resulted in the glock being prematurely freed.  The
    "minimum hold time" usually kept the glock in memory, but the
    lock interface to dlm (aka lock_dlm) freed its memory for the
    glock.  In some circumstances, it would cause dlm's dlm_astd daemon
    to try to call the bast function for the freed lock_dlm memory,
    which resulted in a NULL pointer dereference.
    
    Signed-off-by: Bob Peterson <rpeterso@redhat.com>
    Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
    Bob Peterson committed with swhiteho Jun 17, 2010
  4. @swhiteho

    GFS2: recovery stuck on transaction lock

    This patch fixes bugzilla bug #590878: GFS2: recovery stuck on
    transaction lock.  We set the frozen flag on the glock when we receive
    a completion that cannot be delivered due to blocked locks. At that
    point we check to see whether the first waiting holder has the noexp
    flag set. If the noexp lock is queued later, then we need to unfreeze
    the glock at that point in time, namely, in the glock work function.
    
    This patch was originally written by Steve Whitehouse, but since
    he's on holiday, I'm submitting it.  It's been well tested with a
    complex recovery test called revolver.
    
    Signed-off-by: Steve Whitehouse <swhiteho@redhat.com>
    Signed-off-by: Bob Peterson <rpeterso@redhat.com>
    Bob Peterson committed with swhiteho Jun 23, 2010
  5. @swhiteho

    GFS2: O_TRUNC not working on stuffed files across cluster

    This patch replaces a statement that got dropped out by accident.
    Without the patch, truncates on stuffed (very small) files cause
    those files to have an unpredictable size.
    
    Signed-off-by: Bob Peterson <rpeterso@redhat.com>
    Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
    Bob Peterson committed with swhiteho Jun 24, 2010
  6. @torvalds

    Merge master.kernel.org:/home/rmk/linux-2.6-arm

    * master.kernel.org:/home/rmk/linux-2.6-arm:
      ARM: 6226/1: fix kprobe bug in ldr instruction emulation
      ARM: Update mach-types
      ARM: lockdep: fix unannotated irqs-on
      ARM: 6184/2: ux500: use neutral PRCMU base
      ARM: 6212/1: atomic ops: add memory constraints to inline asm
      ARM: 6211/1: atomic ops: fix register constraints for atomic64_add_unless
      ARM: 6210/1: Do not rely on reset defaults of L2X0_AUX_CTRL
    torvalds committed Jul 14, 2010
  7. @torvalds

    Merge branch 'lmb-to-memblock' of git://git.kernel.org/pub/scm/linux/…

    …kernel/git/benh/powerpc
    
    * 'lmb-to-memblock' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
      lmb: rename to memblock
    torvalds committed Jul 14, 2010
  8. @torvalds

    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/fsl-booke: Fix address issue when using relocatable kernels
      powerpc/cpm1: Mark micropatch code/data static and __init
      powerpc/cpm1: Fix build with various CONFIG_*_UCODE_PATCH combinations
      powerpc/cpm: Reintroduce global spi_pram struct (fixes build issue)
    torvalds committed Jul 14, 2010
Commits on Jul 14, 2010
  1. @npitre

    ARM: 6226/1: fix kprobe bug in ldr instruction emulation

    From: Bin Yang <bin.yang@marvell.com>
    
    Cc: stable@kernel.org
    Signed-off-by: Bin Yang <bin.yang@marvell.com>
    Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
    npitre committed with Russell King Jul 14, 2010
  2. @tiwai @dtor

    Input: synaptics - fix wrong dimensions check

    The commit 83ba9ea ommitted the return
    line for the old synaptics model accidentally.  This resulted in a wrong
    check, namely, the dimensions are checked for the old devices that don't
    support the query properly.
    
    This patch adds the return line back.
    
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
    tiwai committed with dtor Jul 14, 2010
  3. @ozbenh

    lmb: rename to memblock

    via following scripts
    
          FILES=$(find * -type f | grep -vE 'oprofile|[^K]config')
    
          sed -i \
            -e 's/lmb/memblock/g' \
            -e 's/LMB/MEMBLOCK/g' \
            $FILES
    
          for N in $(find . -name lmb.[ch]); do
            M=$(echo $N | sed 's/lmb/memblock/g')
            mv $N $M
          done
    
    and remove some wrong change like lmbench and dlmb etc.
    
    also move memblock.c from lib/ to mm/
    
    Suggested-by: Ingo Molnar <mingo@elte.hu>
    Acked-by: "H. Peter Anvin" <hpa@zytor.com>
    Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Yinghai Lu <yinghai@kernel.org>
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Yinghai Lu committed with ozbenh Jul 12, 2010
  4. @torvalds

    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:
      input: i8042 - add runtime check in x86's i8042_platform_init
      Revert "Input: fixup X86_MRST selects"
      Revert "Input: do not force selecting i8042 on Moorestown"
      x86, mrst: Add i8042_detect API for Moorestwon platform
      x86: Add i8042 pre-detection hook to x86_platform_ops
      x86, platform: Export x86_platform to modules
    torvalds committed Jul 13, 2010
  5. @torvalds

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

    …t/kvm/kvm
    
    * 'kvm-updates/2.6.35' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
      KVM: MMU: flush remote tlbs when overwriting spte with different pfn
      KVM: VMX: Fix host MSR_KERNEL_GS_BASE corruption
    torvalds committed Jul 13, 2010
Commits on Jul 12, 2010
  1. @torvalds

    Linux 2.6.35-rc5

    torvalds committed Jul 12, 2010
  2. @torvalds

    Merge branch 'arm/defconfig/reduced-v2.6.35-rc1' of git://git.pengutr…

    …onix.de/git/ukl/linux-2.6
    
    * 'arm/defconfig/reduced-v2.6.35-rc1' of git://git.pengutronix.de/git/ukl/linux-2.6:
      ARM: reduce defconfigs
    
    This is a big change, but results in no loss of information, despite us
    losing almost 200k lines:
    
     177 files changed, 652 insertions(+), 194157 deletions(-)
    
    and Grant Likely thinks powerpc can also use the same reduction
    technique.
    
    The python script that did the reduction looks like this:
    
        #! /usr/bin/env python
        # vim: set fileencoding=utf-8 :
        # Copyright (C) 2010 by Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    
        import re
        import subprocess
        import os
        import sys
    
        # This prevents including a timestamp in the .config which makes comparing a
        # bit easier.
        os.environ['KCONFIG_NOTIMESTAMP'] = 'Yes, please'
    
        # XXX: get these using getopt
        kernel_tree = '' # os.path.join(os.environ['HOME'], 'gsrc', 'linux-2.6')
        arch = 'arm'
        target = sys.argv[1]
        defconfig_src = os.path.join(kernel_tree, 'arch/%s/configs/%s' % (arch, target))
    
        subprocess.check_call(['make', '-s', 'ARCH=%s' % arch, target])
        origconfig = list(open('.config'))
        config = list(origconfig)
        config_size = os.stat('.config').st_size
    
        i = 0
    
        while i < len(config):
            print 'test for %r' % config[i]
            defconfig = open(defconfig_src, 'w')
            defconfig.writelines(config[:i])
            defconfig.writelines(config[i + 1:])
            defconfig.close()
            subprocess.check_call(['make', '-s', 'ARCH=%s' % arch, target])
            if os.stat('.config').st_size == config_size and list(open('.config')) == origconfig:
                del config[i]
            else:
                i += 1
    
        defconfig = open(defconfig_src, 'w')
        defconfig.writelines(config)
        defconfig.close()
    
    which is pretty self-explanatory.
    
    Acked-by: Nicolas Pitre <nico@fluxnic.net>
    Acked-by: Russell King <linux@arm.linux.org.uk>
    Acked-by: Grant Likely <grant.likely@secretlab.ca>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    torvalds committed Jul 12, 2010
  3. @torvalds

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

    …it/tiwai/sound-2.6
    
    * 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
      ALSA: hda - Restore cleared pin controls on resume
    torvalds committed Jul 12, 2010
  4. @torvalds

    Merge branch 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/k…

    …ernel/git/mchehab/linux-2.6
    
    * 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
      V4L/DVB: uvc: Fix multiple symbols definitions with UVC gadget and host drivers
      V4L/DVB: v4l: mem2mem_testdev: fix g_fmt NULL pointer dereference
      V4L/DVB: uvcvideo: Power line frequency control doesn't support GET_MIN/MAX/RES
      V4L/DVB: ivtv: Add delay to ensure the decoder always restarts with a blank screen
      V4L/DVB: Documentation: Add the Philips FQ1236 MK5 to video4linux/CARDLIST.tuner
      V4L/DVB: tveeprom: Add an entry for tuner code 168: a TCL M30WTP-4N-E tuner
      V4L/DVB: tuner: Add a definition for the Philips FQ1236 MK5 NTSC tuner
      V4L/DVB: OMAP_VOUT: fix: Module params were not working through bootargs
      V4L/DVB: OMAP_VOUT: fix: Replaced dma-sg with dma-contig
      V4L/DVB: OMAP_VOUT:Build FIX: Rebased against latest DSS2 changes
    torvalds committed Jul 12, 2010
  5. @torvalds

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

    …/git/jikos/hid
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
      HID: Send Report ID when numbered reports are sent over the control endpoint.
      HID: Enable HID_QUIRK_MULTI_INPUT for Retro Adaptor
      HID: add support for CH Eclipse yoke
      HID: eliminate a double lock in debug code
      HID: ntrig: add support for new firwmare versions
      HID: check for HID_QUIRK_IGNORE during probing
      HID: roccat: fix modules interdependencies
    torvalds committed Jul 12, 2010
  6. @JoePerches @torvalds

    MAINTAINERS: fix EDAC-I7CORE file patterns

    File patterns are one per line.
    Fixed include file location.
    
    Signed-off-by: Joe Perches <joe@perches.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    JoePerches committed with torvalds Jul 12, 2010
  7. ARM: Update mach-types

    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
    Russell King committed Jul 12, 2010
  8. KVM: MMU: flush remote tlbs when overwriting spte with different pfn

    After remove a rmap, we should flush all vcpu's tlb
    
    Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
    Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
    Xiao Guangrong committed with Marcelo Tosatti Jun 30, 2010
Commits on Jul 11, 2010
  1. @signal11

    HID: Send Report ID when numbered reports are sent over the control e…

    …ndpoint.
    
    The Report ID wasn't sent as part of the payload for reports which were sent
    over the control endpoint. This is required by section 8.1 of the HID spec.
    
    Signed-off-by: Alan Ott <alan@signal11.us>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>
    signal11 committed with Jiri Kosina Jun 30, 2010
  2. @pinchartl

    V4L/DVB: uvc: Fix multiple symbols definitions with UVC gadget and ho…

    …st drivers
    
    The UVC gadget driver borrowed code from the UVC host driver without
    changing the symbol names. This results in a namespace clash with
    multiple definitions of several symbols when compiling both drivers in
    the kernel.
    
    Make all generic UVC functions and variables static in the UVC gadget
    driver, as the symbols are not referenced outside of the gadget driver.
    Rename the uvc_trace_param global variable to uvc_gadget_trace_param.
    
    Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
    pinchartl committed with Mauro Carvalho Chehab Jul 10, 2010
  3. @torvalds

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

    …kernel/git/jdelvare/staging
    
    * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
      hwmon: Fix autoloading of fschmd on recent Fujitsu machines
      hwmon: (coretemp) Properly label the sensors
      hwmon: (coretemp) Skip duplicate CPU entries
      hwmon: (it87) Fix in7 on IT8720F
      hwmon: (k8temp) Fix temperature reporting for ASB1 processor revisions
    torvalds committed Jul 11, 2010
  4. @torvalds

    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/mips: Fix error return codes from Sibyte i2c bus driver
      i2c: Fix probability check
    torvalds committed Jul 11, 2010
  5. HID: Enable HID_QUIRK_MULTI_INPUT for Retro Adaptor

    Patch for linux-2.6.35-rc4 mainline kernel to enable Paul Qureshi's
    Retro Adapter [http://keio.dk/retroadapter.html], an open source USB
    device which allows controllers and joysticks from classic computers
    and consoles to work on modern PCs, to appear as two separate devices
    under Linux.
    Signed-off-by: Peter Edwards <samwise@bagshot-row.org>
    Acked-by: Paul Qureshi <retro@world3.net>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>
    Peter Edwards committed with Jiri Kosina Jul 11, 2010
  6. @jrockway

    HID: add support for CH Eclipse yoke

    This USB flight yoke needs the NOGET quirk, like most of CH's other
    products. This patch adds that.
    
    Signed-off-by: Jonathan Rockway <jon@jrock.us>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>
    jrockway committed with Jiri Kosina Jul 3, 2010
  7. @mattsm @kumargala

    powerpc/fsl-booke: Fix address issue when using relocatable kernels

    When booting a relocatable kernel it needs to jump to the correct
    start address, which for BookE parts is usually unchanged
    regardless of the physical memory offset.
    
    Recent changes cause problems with how we calculate the start
    address, it was always adding the RMO into the start address
    which is incorrect. This patch only adds in the RMO offset
    if we are in the kexec code path, as it needs the RMO to work
    correctly.
    
    Instead of adding the RMO offset in in the common code path, we
    can just set r6 to the RMO offset in the kexec code path instead
    of to zero, and finally perform the masking in the common code
    path
    
    Signed-off-by: Matthew McClintock <msm@freescale.com>
    Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
    mattsm committed with kumargala Jun 29, 2010
  8. @kumargala

    powerpc/cpm1: Mark micropatch code/data static and __init

    This saves runtime memory and fixes lots of sparse warnings like this:
    
        CHECK   arch/powerpc/sysdev/micropatch.c
      arch/powerpc/sysdev/micropatch.c:27:6: warning: symbol 'patch_2000'
      was not declared. Should it be static?
      arch/powerpc/sysdev/micropatch.c:146:6: warning: symbol 'patch_2f00'
      was not declared. Should it be static?
      ...
    
    Signed-off-by: Anton Vorontsov <avorontsov@mvista.com>
    Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
    Anton Vorontsov committed with kumargala Jul 8, 2010
  9. @kumargala

    powerpc/cpm1: Fix build with various CONFIG_*_UCODE_PATCH combinations

    Warnings are treated as errors for arch/powerpc code, so build fails
    with CONFIG_I2C_SPI_UCODE_PATCH=y:
    
        CC      arch/powerpc/sysdev/micropatch.o
      cc1: warnings being treated as errors
      arch/powerpc/sysdev/micropatch.c: In function 'cpm_load_patch':
      arch/powerpc/sysdev/micropatch.c:630: warning: unused variable 'smp'
      make[1]: *** [arch/powerpc/sysdev/micropatch.o] Error 1
    
    And with CONFIG_USB_SOF_UCODE_PATCH=y:
    
      CC      arch/powerpc/sysdev/micropatch.o
      cc1: warnings being treated as errors
      arch/powerpc/sysdev/micropatch.c: In function 'cpm_load_patch':
      arch/powerpc/sysdev/micropatch.c:629: warning: unused variable 'spp'
      arch/powerpc/sysdev/micropatch.c:628: warning: unused variable 'iip'
      make[1]: *** [arch/powerpc/sysdev/micropatch.o] Error 1
    
    This patch fixes these issues by introducing proper #ifdefs.
    
    Cc: <stable@kernel.org> [ .33, .34 ]
    Signed-off-by: Anton Vorontsov <avorontsov@mvista.com>
    Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
    Anton Vorontsov committed with kumargala Jul 8, 2010
Something went wrong with that request. Please try again.