Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Nov 19, 2009
  1. @torvalds

    Linux 2.6.32-rc8

    torvalds authored
  2. @torvalds

    Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/n…

    torvalds authored
    …fs-2.6
    
    * 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
      SUNRPC: Address buffer overrun in rpc_uaddr2sockaddr()
      NFSv4: Fix a cache validation bug which causes getcwd() to return ENOENT
  3. @torvalds

    vt: Fix use of "new" in a struct field

    Alan Cox authored torvalds committed
    As this struct is exposed to user space and the API was added for this
    release it's a bit of a pain for the C++ world and we still have time to
    fix it. Rename the fields before we end up with that pain in an actual
    release.
    
    Signed-off-by: Alan Cox <alan@linux.intel.com>
    Reported-by: Olivier Goffart
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  4. @dwmw2 @torvalds

    Fix handling of the HP/Acer 'DMAR at zero' BIOS error for machines wi…

    dwmw2 authored torvalds committed
    …th <4GiB RAM.
    
    Commit 86cf898 ("intel-iommu: Check for
    'DMAR at zero' BIOS error earlier.") was supposed to work by pretending
    not to detect an IOMMU if it was actually being reported by the BIOS at
    physical address zero.
    
    However, the intel_iommu_init() function is called unconditionally, as
    are the corresponding functions for other IOMMU hardware.
    
    So the patch only worked if you have RAM above the 4GiB boundary. It
    caused swiotlb to be initialised when no IOMMU was detected during early
    boot, and thus the later IOMMU init would refuse to run.
    
    But if you have less RAM than that, swiotlb wouldn't get set up and the
    IOMMU _would_ still end up being initialised, even though we never
    claimed to detect it.
    
    This patch also sets the dmar_disabled flag when the error is detected
    during the initial detection phase -- so that the later call to
    intel_iommu_init() will return without doing anything, regardless of
    whether swiotlb is used or not.
    
    Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  5. @torvalds

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

    torvalds authored
    …/davej/cpufreq
    
    * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
      [CPUFREQ] Fix stale cpufreq_cpu_governor pointer
      [CPUFREQ] Resolve time unit thinko in ondemand/conservative govs
      [CPUFREQ] speedstep-ich: fix error caused by 394122a
      [CPUFREQ] Fix use after free on governor restore
      [CPUFREQ] acpi-cpufreq: blacklist Intel 0f68: Fix HT detection and put in notification message
      [CPUFREQ] powernow-k8: Fix test in get_transition_latency()
      [CPUFREQ] longhaul: select Longhaul version 2 for capable CPUs
  6. @torvalds

    strcmp: fix overflow and possibly signedness error

    torvalds authored
    Doing the strcmp return value as
    
    	signed char __res = *cs - *ct;
    
    is wrong for two reasons.  The subtraction can overflow because __res
    doesn't use a type big enough.  Moreover the compared bytes should be
    interpreted as unsigned char as specified by POSIX.
    
    The same problem is fixed in strncmp.
    
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    Cc: Michael Buesch <mb@bu3sch.de>
    Cc: Andreas Schwab <schwab@linux-m68k.org>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  7. @torvalds

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

    torvalds authored
    …/git/airlied/agp-2.6
    
    * 'agp-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6:
      agp/intel-agp: Set dma_mask for capable chipsets before agp_add_bridge()
  8. @torvalds

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

    torvalds authored
    …/git/jmorris/security-testing-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
      ima: replace GFP_KERNEL with GFP_NOFS
  9. @dwmw2

    agp/intel-agp: Set dma_mask for capable chipsets before agp_add_bridge()

    dwmw2 authored Dave Airlie committed
    We should set this before calling agp_add_bridge() so that it's done
    before we map the scratch page too.
    
    This should probably fix the regression reported as k.o. bug #14627.
    
    Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
Commits on Nov 18, 2009
  1. @torvalds

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

    torvalds authored
    …inux/kernel/git/tmlind/linux-omap-2.6
    
    * 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
      OMAP: cs should be positive in gpmc_cs_free()
      omap: fix unlikely(x) < y
      omap3: clock: Fixed dpll3_m2x2 rate calculation
      omap3: clock: Fix the DPLL freqsel computations
      omap: Fix keymap for zoom2 according to matrix keypad framwork
  2. @torvalds

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

    torvalds authored
    …/git/tiwai/sound-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
      ASoC: tlv320aic23 fix rate selection
      ASoC: OMAP3 Pandora: update for TWL4030 codec changes
      ASoC: Modifying the license string GPLv2 for OMAP3 EVM
      ALSA: hda - Fix quirk for VAIO type G
      ALSA: usb - Quirk to disable master volume control in PCM2702
  3. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (42 commits)
      cxgb3: fix premature page unmap
      ibm_newemac: Fix EMACx_TRTR[TRT] bit shifts
      vlan: Fix register_vlan_dev() error path
      gro: Fix illegal merging of trailer trash
      sungem: Fix Serdes detection.
      net: fix mdio section mismatch warning
      ppp: fix BUG on non-linear SKB (multilink receive)
      ixgbe: Fixing EEH handler to handle more than one error
      net: Fix the rollback test in dev_change_name()
      Revert "isdn: isdn_ppp: Use SKB list facilities instead of home-grown implementation."
      TI Davinci EMAC : Fix Console Hang when bringing the interface down
      smsc911x: Fix Console Hang when bringing the interface down.
      mISDN: fix error return in HFCmulti_init()
      forcedeth: mac address fix
      r6040: fix version printing
      Bluetooth: Fix regression with L2CAP configuration in Basic Mode
      Bluetooth: Select Basic Mode as default for SOCK_SEQPACKET
      Bluetooth: Set general bonding security for ACL by default
      r8169: Fix receive buffer length when MTU is between 1515 and 1536
      can: add the missing netlink get_xstats_size callback
      ...
  4. ima: replace GFP_KERNEL with GFP_NOFS

    Mimi Zohar authored James Morris committed
    While running fsstress tests on the NFSv4 mounted ext3 and ext4
    filesystem, the following call trace was generated on the nfs
    server machine.
    
    Replace GFP_KERNEL with GFP_NOFS in ima_iint_insert() to avoid a
    potential deadlock.
    
         =================================
        [ INFO: inconsistent lock state ]
        2.6.31-31.el6.x86_64 #1
        ---------------------------------
        inconsistent {RECLAIM_FS-ON-W} -> {IN-RECLAIM_FS-W} usage.
        kswapd2/75 [HC0[0]:SC0[0]:HE1:SE1] takes:
         (jbd2_handle){+.+.?.}, at: [<ffffffff811edd5e>] jbd2_journal_start+0xfe/0x13f
        {RECLAIM_FS-ON-W} state was registered at:
          [<ffffffff81091e40>] mark_held_locks+0x65/0x99
          [<ffffffff81091f31>] lockdep_trace_alloc+0xbd/0xf5
          [<ffffffff81126fdd>] kmem_cache_alloc+0x40/0x185
          [<ffffffff812344d7>] ima_iint_insert+0x3d/0xf1
          [<ffffffff812345b0>] ima_inode_alloc+0x25/0x44
          [<ffffffff811484ac>] inode_init_always+0xec/0x271
          [<ffffffff81148682>] alloc_inode+0x51/0xa1
          [<ffffffff81148700>] new_inode+0x2e/0x94
          [<ffffffff811b2f08>] ext4_new_inode+0xb8/0xdc9
          [<ffffffff811be611>] ext4_create+0xcf/0x175
          [<ffffffff8113e2cd>] vfs_create+0x82/0xb8
          [<ffffffff8113f337>] do_filp_open+0x32c/0x9ee
          [<ffffffff811309b9>] do_sys_open+0x6c/0x12c
          [<ffffffff81130adc>] sys_open+0x2e/0x44
          [<ffffffff81011e42>] system_call_fastpath+0x16/0x1b
          [<ffffffffffffffff>] 0xffffffffffffffff
        irq event stamp: 90371
        hardirqs last  enabled at (90371): [<ffffffff8112708d>]
        kmem_cache_alloc+0xf0/0x185
        hardirqs last disabled at (90370): [<ffffffff81127026>]
        kmem_cache_alloc+0x89/0x185
        softirqs last  enabled at (89492): [<ffffffff81068ecf>]
        __do_softirq+0x1bf/0x1eb
        softirqs last disabled at (89477): [<ffffffff8101312c>] call_softirq+0x1c/0x30
    
        other info that might help us debug this:
        2 locks held by kswapd2/75:
         #0:  (shrinker_rwsem){++++..}, at: [<ffffffff810f98ba>] shrink_slab+0x44/0x177
         #1:  (&type->s_umount_key#25){++++..}, at: [<ffffffff811450ba>]
    
    Reported-by: Muni P. Beerakam <mbeeraka@in.ibm.com>
    Reported-by: Amit K. Arora <amitarora@in.ibm.com>
    Cc: stable@kernel.org
    Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
    Signed-off-by: James Morris <jmorris@namei.org>
  5. @RoelKluin @tmlind

    OMAP: cs should be positive in gpmc_cs_free()

    RoelKluin authored tmlind committed
    The index `cs' is signed, test whether it is negative before we release
    gpmc_cs_mem[cs].
    
    Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
    Cc: Russell King <rmk@arm.linux.org.uk>
    Signed-off-by: Tony Lindgren <tony@atomide.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
  6. @RoelKluin @tmlind

    omap: fix unlikely(x) < y

    RoelKluin authored tmlind committed
    The closing parenthesis was not in the right location.
    
    Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
    Cc: Russell King <rmk@arm.linux.org.uk>
    Signed-off-by: Tony Lindgren <tony@atomide.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
  7. @tiwai
  8. @tiwai
  9. @torvalds

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

    torvalds authored
    …rnel/git/lethal/sh-2.6
    
    * 'sh/for-2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
      sh: Fixup last users of irq_chip->typename
      uio: pm_runtime_disable is needed if failed
  10. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:
      USB: option.c: add support for D-Link DWM-162-U5
      USB: usbmon: fix bug in mon_buff_area_shrink
      USB: xhci: Fix scratchpad deallocation.
      USB: xhci: Fix TRB physical to virtual address translation.
      USB: xhci: Fix bug memory free after failed initialization.
      USB: cdc_acm: Fix memory leak after hangup
      USB: cdc_acm: Fix race condition when opening tty
      USB: ohci: quirk AMD prefetch for USB 1.1 ISO transfer
  11. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
      tty: cp210x: Fix carrier handling
      tty_port: If we are opened non blocking we still need to raise the carrier
  12. @tkisky @broonie

    ASoC: tlv320aic23 fix rate selection

    tkisky authored broonie committed
    Fix the ordering of sr_valid_mask array.
    The lower bit of the index represents USB
    not bosr.
    
    Reported-by: Anuj Aggarwal <anuj.aggarwal@ti.com>
    Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
    Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  13. @notaz @broonie

    ASoC: OMAP3 Pandora: update for TWL4030 codec changes

    notaz authored broonie committed
    A while ago TWL4030 had it's playback stream name changed, but
    pandora needs it for it's playback path. Update to correct stream
    name so that playback works again.
    
    Also mark VIBRA output as not connected.
    
    Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
    Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  14. @broonie

    ASoC: Modifying the license string GPLv2 for OMAP3 EVM

    Anuj Aggarwal authored broonie committed
    Correcting the license string from GPLv2 -> GPL v2.
    Found the problem while building OMAP3 ASoC driver as
    module.
    
    Signed-off-by: Anuj Aggarwal <anuj.aggarwal@ti.com>
    Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  15. @davem330

    cxgb3: fix premature page unmap

    Divy Le Ray authored davem330 committed
    unmap Rx page only when guaranteed that this page won't be
    used anymore to allocate rx page chunks.
    
    Signed-off-by: Divy Le Ray <divy@chelsio.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  16. @davem330

    ibm_newemac: Fix EMACx_TRTR[TRT] bit shifts

    Dave Mitchell authored davem330 committed
    The TRT bit shifts were reversed for EMAC4 and non-EMAC4 during the
    port from ibm_emac to ibm_newemac. This patch corrects that error.
    
    Signed-off-by: Dave Mitchell <dmitchell@appliedmicro.com>
    Acked-by: Feng Kan <fkan@appliedmicro.com>
    Acked-by: Prodyut Hazarika <phazarika@appliedmicro.com>
    Acked-by: Stefan Roese <sr@denx.de>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  17. [CPUFREQ] Fix stale cpufreq_cpu_governor pointer

    Prarit Bhargava authored Dave Jones committed
    Dave,
    
    Attached is an update of my patch against the cpufreq fixes branch.
    
    Before applying the patch I compiled and booted the tree to see if the panic
    was still there -- to my surprise it was not.  This is because of the conversion
    of cpufreq_cpu_governor to a char[].
    
    While the panic is kaput, the problem of stale data continues and my patch is
    still valid.  It is possible to end up with the wrong governor after hotplug
    events because CPUFREQ_DEFAULT_GOVERNOR is statically linked to a default,
    while the cpu siblings may have had a different governor assigned by a user.
    
    ie) the patch is still needed in order to keep the governors assigned
    properly when hotplugging devices
    
    Signed-off-by: Prarit Bhargava <prarit@redhat.com>
    Signed-off-by: Dave Jones <davej@redhat.com>
  18. [CPUFREQ] Resolve time unit thinko in ondemand/conservative govs

    Pallipadi, Venkatesh authored Dave Jones committed
    ondemand and conservative governors are messing up time units in the
    code path where NO_HZ is not enabled and ignore_nice is set. The walltime
    idletime stored is in jiffies and nice time calculation is happening in
    microseconds.
    
    The problem was reported and diagnosed by Alexander here.
    http://marc.info/?l=linux-kernel&m=125752550404513&w=2
    
    The patch below fixes this thinko.
    
    Reported-by: Alexander Miller <Miller@fmi.uni-stuttgart.de>
    Tested-by: Alexander Miller <Miller@fmi.uni-stuttgart.de>
    Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
    Signed-off-by: Dave Jones <davej@redhat.com>
  19. @rustyrussell

    [CPUFREQ] speedstep-ich: fix error caused by 394122a

    rustyrussell authored Dave Jones committed
    "[CPUFREQ] cpumask: avoid playing with cpus_allowed in speedstep-ich.c"
    changed the code to mistakenly pass the current cpu as the "processor"
    argument of speedstep_get_frequency(), whereas it should be the type of
    the processor.
    
    Addresses http://bugzilla.kernel.org/show_bug.cgi?id=14340
    
    Based on a patch by Dave Mueller.
    
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
    Acked-by: Dominik Brodowski <linux@brodo.de>
    Reported-by: Dave Mueller <dave.mueller@gmx.ch>
    Cc: <stable@kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Dave Jones <davej@redhat.com>
  20. @dmonakhov

    [CPUFREQ] Fix use after free on governor restore

    dmonakhov authored Dave Jones committed
    Currently on governer backup/restore path we storing governor's pointer.
    This is wrong because one may unload governor's module after cpu goes
    offline. As result use-after-free will take place on restored cpu.
    It is not easy to exploit this bug, but still we have to close this
    issue ASAP. Issue was introduced by following commit
    084f349
    
    ##TESTCASE##
    #!/bin/sh -x
    modprobe acpi_cpufreq
    # Any non default governor, in may case it is "ondemand"
    modprobe cpufreq_ondemand
    echo ondemand > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
    rmmod acpi_cpufreq
    rmmod cpufreq_ondemand
    modprobe acpi_cpufreq  # << use-after-free here.
    
    Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org>
    Signed-off-by: Dave Jones <davej@redhat.com>
  21. [CPUFREQ] acpi-cpufreq: blacklist Intel 0f68: Fix HT detection and pu…

    John Villalovos authored Dave Jones committed
    …t in notification message
    
    Removing the SMT/HT check, since the Errata doesn't mention
    Hyper-Threading.
    
    Adding in a printk, so that the user knows why acpi-cpufreq refuses to
    load.  Also, once system is blacklisted, don't repeat checks to see if
    blacklisted.  This also causes the message to only be printed once,
    rather than for each CPU.
    
    Signed-off-by: John L. Villalovos <john.l.villalovos@intel.com>
    Signed-off-by: Dave Jones <davej@redhat.com>
  22. @RoelKluin

    [CPUFREQ] powernow-k8: Fix test in get_transition_latency()

    RoelKluin authored Dave Jones committed
    Not makes it a bool before the comparison.
    
    Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
    Signed-off-by: Dave Jones <davej@redhat.com>
  23. [CPUFREQ] longhaul: select Longhaul version 2 for capable CPUs

    Krzysztof Helt authored Dave Jones committed
    There is a typo in the longhaul detection code so only Longhaul v1 or Longhaul v3
    is selected. The Longhaul v2 is not selected even for CPUs which are capable of.
    
    Tested on PCChips Giga Pro board. Frequency changes work and the Longhaul v2
    detects that the board is not capable of changing CPU voltage.
    
    Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
    Signed-off-by: Dave Jones <davej@redhat.com>
  24. @pmundt

    sh: Fixup last users of irq_chip->typename

    Thomas Gleixner authored pmundt committed
    The typename member of struct irq_chip was kept for migration purposes
    and is obsolete since more than 2 years. Fix up the leftovers.
    
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Cc: linux-sh@vger.kernel.org
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  25. @torvalds

    fcntl: rename F_OWNER_GID to F_OWNER_PGRP

    Peter Zijlstra authored torvalds committed
    This is for consistency with various ioctl() operations that include the
    suffix "PGRP" in their names, and also for consistency with PRIO_PGRP,
    used with setpriority() and getpriority().  Also, using PGRP instead of
    GID avoids confusion with the common abbreviation of "group ID".
    
    I'm fine with anything that makes it more consistent, and if PGRP is what
    is the predominant abbreviation then I see no need to further confuse
    matters by adding a third one.
    
    Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Acked-by: Michael Kerrisk <mtk.manpages@gmail.com>
    Cc: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  26. @sstefani @torvalds

    procfs: fix /proc/<pid>/stat stack pointer for kernel threads

    sstefani authored torvalds committed
    Fix a small issue for the stack pointer in /proc/<pid>/stat.  In case of a
    kernel thread the value of the printed stack pointer should be 0.
    
    Signed-off-by: Stefani Seibold <stefani@seibold.net>
    Cc: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Something went wrong with that request. Please try again.