Permalink
Commits on Feb 25, 2011
  1. Merge branch 'version-2.6.37' into pf-2.6.37

    Oleksandr Natalenko committed Feb 25, 2011
  2. version-2.6.37: bump to v2.6.37-pf4

    Oleksandr Natalenko committed Feb 25, 2011
  3. fix merge conflict

    Oleksandr Natalenko committed Feb 25, 2011
Commits on Feb 24, 2011
  1. Linux 2.6.37.2

    gregkh committed Feb 24, 2011
  2. Revert: tpm_tis: Use timeouts returned from TPM

    gregkh committed Feb 22, 2011
    This is a revert of commit 9b29050
    upstream which has been found to prevent suspend from working on a
    number of systems.
    
    Thanks to Jiri Slaby <jirislaby@gmail.com> for tracing this down.
    
    Cc: Jiri Slaby <jirislaby@gmail.com>
    Cc: Rafael Wysocki <rjw@sisk.pl>
    Cc: Stefan Berger <stefanb@linux.vnet.ibm.com>
    Cc: Guillaume Chazarain <guichaz@gmail.com>
    Cc: Rajiv Andrade <srajiv@linux.vnet.ibm.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  3. platform: x86: tc1100-wmi: world-writable sysfs wireless and jogdial …

    Vasiliy Kulikov committed with gregkh Feb 4, 2011
    …files
    
    commit 8a6a142 upstream.
    
    Don't allow everybody to change WMI settings.
    
    Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>
    Signed-off-by: Matthew Garrett <mjg@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  4. platform: x86: asus_acpi: world-writable procfs files

    Vasiliy Kulikov committed with gregkh Feb 4, 2011
    commit 8040835 upstream.
    
    Don't allow everybody to change ACPI settings.  The comment says that it
    is done deliberatelly, however, the comment before disp_proc_write()
    says that at least one of these setting is experimental.
    
    Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>
    Signed-off-by: Matthew Garrett <mjg@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  5. platform: x86: acer-wmi: world-writable sysfs threeg file

    Vasiliy Kulikov committed with gregkh Feb 4, 2011
    commit b80b168 upstream.
    
    Don't allow everybody to write to hardware registers.
    
    Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>
    Signed-off-by: Matthew Garrett <mjg@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  6. net: can: janz-ican3: world-writable sysfs termination file

    Vasiliy Kulikov committed with gregkh Feb 4, 2011
    commit 1e6d93e upstream.
    
    Don't allow everybody to set terminator via sysfs.
    
    Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  7. ASoC: WM8903: Fix mic detection enable logic

    swarren committed with gregkh Feb 10, 2011
    commit 3088e3b upstream.
    
    The mic detection HW should be enabled when either mic or short detection
    is required, not when only both are required.
    
    Signed-off-by: Stephen Warren <swarren@nvidia.com>
    Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  8. perf: Fix throttle logic

    Peter Zijlstra committed with gregkh Feb 15, 2011
    commit 4fe757d upstream.
    
    It was possible to call pmu::start() on an already running event. In
    particular this lead so some wreckage as the hrtimer events would
    re-initialize active timers.
    
    This was due to throttled events being activated again by scheduling.
    Scheduling in a context would add and force start events, resulting in
    running events with a possible throttle status. The next tick to hit
    that task will then try to unthrottle the event and call ->start() on
    an already running event.
    
    Reported-by: Jeff Moyer <jmoyer@redhat.com>
    Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
    LKML-Reference: <new-submission>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  9. genirq: Disable the SHIRQ_DEBUG call in request_threaded_irq for now

    Thomas Gleixner committed with gregkh Feb 18, 2011
    commit 6d83f94 upstream.
    
    With CONFIG_SHIRQ_DEBUG=y we call a newly installed interrupt handler
    in request_threaded_irq().
    
    The original implementation (commit a304e1b) called the handler
    _BEFORE_ it was installed, but that caused problems with handlers
    calling disable_irq_nosync(). See commit 377bf1e.
    
    It's braindead in the first place to call disable_irq_nosync in shared
    handlers, but ....
    
    Moving this call after we installed the handler looks innocent, but it
    is very subtle broken on SMP.
    
    Interrupt handlers rely on the fact, that the irq core prevents
    reentrancy.
    
    Now this debug call violates that promise because we run the handler
    w/o the IRQ_INPROGRESS protection - which we cannot apply here because
    that would result in a possibly forever masked interrupt line.
    
    A concurrent real hardware interrupt on a different CPU results in
    handler reentrancy and can lead to complete wreckage, which was
    unfortunately observed in reality and took a fricking long time to
    debug.
    
    Leave the code here for now. We want this debug feature, but that's
    not easy to fix. We really should get rid of those
    disable_irq_nosync() abusers and remove that function completely.
    
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Cc: Anton Vorontsov <avorontsov@ru.mvista.com>
    Cc: David Woodhouse <dwmw2@infradead.org>
    Cc: Arjan van de Ven <arjan@infradead.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  10. genirq: Prevent access beyond allocated_irqs bitmap

    Thomas Gleixner committed with gregkh Feb 17, 2011
    commit c1ee626 upstream.
    
    Lars-Peter Clausen pointed out:
    
       I stumbled upon this while looking through the existing archs using
       SPARSE_IRQ.  Even with SPARSE_IRQ the NR_IRQS is still the upper
       limit for the number of IRQs.
    
       Both PXA and MMP set NR_IRQS to IRQ_BOARD_START, with
       IRQ_BOARD_START being the number of IRQs used by the core.
    
       In various machine files the nr_irqs field of the ARM machine
       defintion struct is then set to "IRQ_BOARD_START + NR_BOARD_IRQS".
    
       As a result "nr_irqs" will greater then NR_IRQS which then again
       causes the "allocated_irqs" bitmap in the core irq code to be
       accessed beyond its size overwriting unrelated data.
    
    The core code really misses a sanity check there.
    
    This went unnoticed so far as by chance the compiler/linker places
    data behind that bitmap which gets initialized later on those affected
    platforms.
    
    So the obvious fix would be to add a sanity check in early_irq_init()
    and break all affected platforms. Though that check wants to be
    backported to stable as well, which will require to fix all known
    problematic platforms and probably some more yet not known ones as
    well. Lots of churn.
    
    A way simpler solution is to allocate a slightly larger bitmap and
    avoid the whole churn w/o breaking anything. Add a few warnings when
    an arch returns utter crap.
    
    Reported-by: Lars-Peter Clausen <lars@metafoo.de>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Cc: Haojian Zhuang <haojian.zhuang@marvell.com>
    Cc: Eric Miao <eric.y.miao@gmail.com>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  11. eCryptfs: Copy up lower inode attrs in getattr

    Tyler Hicks committed with gregkh Jan 11, 2011
    commit 55f9cf6 upstream.
    
    The lower filesystem may do some type of inode revalidation during a
    getattr call. eCryptfs should take advantage of that by copying the
    lower inode attributes to the eCryptfs inode after a call to
    vfs_getattr() on the lower inode.
    
    I originally wrote this fix while working on eCryptfs on nfsv3 support,
    but discovered it also fixed an eCryptfs on ext4 nanosecond timestamp
    bug that was reported.
    
    https://bugs.launchpad.net/bugs/613873
    
    Signed-off-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  12. pcmcia: re-enable Zoomed Video support

    Dominik Brodowski committed with gregkh Feb 19, 2011
    commit 33619f0 upstream.
    
    Allow drivers to enable Zoomed Video support. Currently, this is only
    used by out-of-tree drivers (L64020 DVB driver in particular).
    
    Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  13. acer-wmi: Fix capitalisation of GUID

    Matthew Garrett committed with gregkh Feb 9, 2011
    commit bbb7060 upstream.
    
    6AF4F258-B401-42fd-BE91-3D4AC2D7C0D3 needs to be
    6AF4F258-B401-42FD-BE91-3D4AC2D7C0D3 to match the hardware alias.
    
    Signed-off-by: Matthew Garrett <mjg@redhat.com>
    Acked-by: Carlos Corbacho <carlos@strangeworlds.co.uk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  14. cifs: Fix regression in LANMAN (LM) auth code

    shirishpargaonkar committed with gregkh Feb 17, 2011
    commit 5e64092 upstream.
    
    LANMAN response length was changed to 16 bytes instead of 24 bytes.
    Revert it back to 24 bytes.
    
    Signed-off-by: Shirish Pargaonkar <shirishpargaonkar@gmail.com>
    Signed-off-by: Steve French <sfrench@us.ibm.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  15. cifs: fix handling of scopeid in cifs_convert_address

    jtlayton committed with gregkh Feb 16, 2011
    commit 9616125 upstream.
    
    The code finds, the '%' sign in an ipv6 address and copies that to a
    buffer allocated on the stack. It then ignores that buffer, and passes
    'pct' to simple_strtoul(), which doesn't work right because we're
    comparing 'endp' against a completely different string.
    
    Fix it by passing the correct pointer. While we're at it, this is a
    good candidate for conversion to strict_strtoul as well.
    
    Cc: David Howells <dhowells@redhat.com>
    Reported-by: Björn JACKE <bj@sernet.de>
    Signed-off-by: Jeff Layton <jlayton@redhat.com>
    Signed-off-by: Steve French <sfrench@us.ibm.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  16. ARM: Keep exit text/data around for SMP_ON_UP

    Russell King committed with gregkh Feb 21, 2011
    commit a9ad21f upstream.
    
    When SMP_ON_UP is used and the spinlocks are inlined, we end up with
    inline spinlocks in the exit code, with references from the SMP
    alternatives section to the exit sections.  This causes link time
    errors.  Avoid this by placing the exit sections in the init-discarded
    region.
    
    Tested-by: Dave Martin <dave.martin@linaro.org>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  17. ARM: Ensure predictable endian state on signal handler entry

    Russell King committed with gregkh Feb 20, 2011
    commit 5339905 upstream.
    
    Ensure a predictable endian state when entering signal handlers.  This
    avoids programs which use SETEND to momentarily switch their endian
    state from having their signal handlers entered with an unpredictable
    endian state.
    
    Acked-by: Dave Martin <dave.martin@linaro.org>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  18. radio-aimslab.c needs #include <linux/delay.h>

    geertu committed with gregkh Jan 16, 2011
    commit 2400982 upstream.
    
    Commit e3c9221 ("[media] radio-aimslab.c: Fix
    gcc 4.5+ bug") removed the include, but introduced new callers of msleep():
    
    | drivers/media/radio/radio-aimslab.c: In function ‘rt_decvol’:
    | drivers/media/radio/radio-aimslab.c:76: error: implicit declaration of function ‘msleep’
    
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
    Cc: dann frazier <dannf@debian.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  19. netfilter: ctnetlink: fix missing refcount increment during dumps

    Pablo Neira Ayuso committed with gregkh Jan 24, 2011
    commit c71caf4 upstream.
    
    In 13ee6ac netfilter: fix race in conntrack between dump_table and
    destroy, we recovered spinlocks to protect the dump of the conntrack
    table according to reports from Stephen and acknowledgments on the
    issue from Eric.
    
    In that patch, the refcount bump that allows to keep a reference
    to the current ct object was removed. However, we still decrement
    the refcount for that object in the output path of
    ctnetlink_dump_table():
    
            if (last)
                    nf_ct_put(last)
    
    Cc: Stephen Hemminger <stephen.hemminger@vyatta.com>
    Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
    Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
    Signed-off-by: Patrick McHardy <kaber@trash.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  20. netfilter: fix race in conntrack between dump_table and destroy

    Stephen Hemminger committed with gregkh Jan 11, 2011
    commit 13ee6ac upstream.
    
    The netlink interface to dump the connection tracking table has a race
    when entries are deleted at the same time. A customer reported a crash
    and the backtrace showed thatctnetlink_dump_table was running while a
    conntrack entry was being destroyed.
    (see https://bugzilla.vyatta.com/show_bug.cgi?id=6402).
    
    According to RCU documentation, when using hlist_nulls the reader
    must handle the case of seeing a deleted entry and not proceed
    further down the linked list.  The old code would continue
    which caused the scan to walk into the free list.
    
    This patch uses locking (rather than RCU) for this operation which
    is guaranteed safe, and no longer requires getting reference while
    doing dump operation.
    
    Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
    Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  21. hwmon: (jc42) do not allow writing to locked registers

    cladisch committed with gregkh Feb 16, 2011
    commit 2c6315d upstream.
    
    On systems where the temperature sensor is actually used, the BIOS is
    likely to have locked the alarm registers.  In that case, all writes
    through the corresponding sysfs files would be silently ignored.
    
    To prevent this, detect the locks and make the affected sysfs files
    read-only.
    
    Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
    Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  22. hwmon: (jc42) more helpful documentation

    cladisch committed with gregkh Feb 16, 2011
    commit d5622f5 upstream.
    
    The documentation lists standard numbers and chip names in excruciating
    detail, but that's all it does.  To help mere mortals in deciding
    whether to enable this driver, mention what this sensor is for and in
    which systems it might be found.
    
    Also add a link to the actual JC 42.4 specification.
    
    Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
    Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  23. hwmon: (jc42) fix type mismatch

    cladisch committed with gregkh Feb 16, 2011
    commit e866729 upstream.
    
    In set_temp_crit_hyst(), make the variable 'val' have the correct
    type for strict_strtoul().
    
    Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
    Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  24. hwmon: (k10temp) add support for AMD Family 12h/14h CPUs

    cladisch committed with gregkh Feb 17, 2011
    commit aa4790a upstream.
    
    Add the PCI ID to support the internal temperature sensor of the
    AMD "Llano" and "Brazos" processor families.
    
    Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
    Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  25. x86, AMD, PCI: Add AMD northbridge PCI device id for CPU families 12h…

    Robert Richter committed with gregkh Jan 6, 2011
    … and 14h
    
    commit ca86828 upstream.
    
    This patch adds the PCI northbridge device id for AMD CPU
    families 12h and 14h. Both families have implemented the same
    PCI northbridge device.
    
    There are some future use cases that use this PCI device and
    we would like to clarify its naming.
    
    Signed-off-by: Robert Richter <robert.richter@amd.com>
    Cc: xen-devel@lists.xensource.com <xen-devel@lists.xensource.com>
    Cc: Keir Fraser <keir@xen.org>
    Cc: Jan Beulich <JBeulich@novell.com>
    LKML-Reference: <20110106165107.GL4739@erda.amd.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  26. hwmon: (lm85) extend to support EMC6D103 chips

    Jan Beulich committed with gregkh Feb 18, 2011
    commit f065a93 upstream.
    
    The interface is identical EMC6D102, so all that needs to be added are
    some definitions and their uses.
    
    Registers apparently missing in EMC6D103S/EMC6D103:A2 compared to EMC6D103:A0,
    EMC6D103:A1, and EMC6D102 (according to the data sheets), but used
    unconditionally in the driver: 62[5:7], 6D[0:7], and 6E[0:7]. For that
    reason, EMC6D103S chips don't get enabled for the time being.
    
    Signed-off-by: Jan Beulich <jbeulich@novell.com>
    (Guenter Roeck: Replaced EMC6D103_A2 with EMC6D103S per EMC6D103S datasheet)
    Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  27. ALSA: HDA: Do not announce false surround in Conexant auto

    David Henningsson committed with gregkh Feb 16, 2011
    commit 8972495 upstream.
    
    Without this patch, one line-out and one speaker and
    Conexant's auto parser would announce (non-working) surround
    capabilities.
    
    BugLink: http://bugs.launchpad.net/bugs/721126
    Signed-off-by: David Henningsson <david.henningsson@canonical.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  28. ALSA: caiaq - Fix possible string-buffer overflow

    tiwai committed with gregkh Feb 14, 2011
    commit eaae55d upstream.
    
    Use strlcpy() to assure not to overflow the string array sizes by
    too long USB device name string.
    
    Reported-by: Rafa <rafa@mwrinfosecurity.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  29. ALSA: HDA: Add position_fix quirk for an Asus device

    David Henningsson committed with gregkh Feb 14, 2011
    commit b540afc upstream.
    
    The bug reporter claims that position_fix=1 is needed for his
    microphone to work. The controller PCI vendor-id is [1002:4383] (rev 40).
    
    Reported-by: Kjell L.
    BugLink: http://bugs.launchpad.net/bugs/718402
    Signed-off-by: David Henningsson <david.henningsson@canonical.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  30. iwl3945: remove plcp check

    sgruszka committed with gregkh Feb 9, 2011
    commit c91d015 upstream.
    
    Patch fixes:
    https://bugzilla.redhat.com/show_bug.cgi?id=654599
    
    Many users report very low speed problem on 3945 devices,
    this patch fixes problem, but only for some of them.
    
    For unknown reason, sometimes after hw scanning, device is not able
    to receive frames at high rate. Since plcp health check may request
    hw scan to "reset radio", performance problem start to be observable
    after update kernel to .35, where plcp check was introduced.
    
    Bug reporter confirmed that removing plcp check fixed problem for him.
    
    Reported-and-tested-by: SilvioTO <silviotoya@yahoo.it>
    Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
    Acked-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  31. net: deinit automatic LIST_HEAD

    Eric Dumazet committed with gregkh Feb 17, 2011
    commit ceaaec9 upstream.
    
    commit 9b5e383 (net: Introduce
    unregister_netdevice_many()) left an active LIST_HEAD() in
    rollback_registered(), with possible memory corruption.
    
    Even if device is freed without touching its unreg_list (and therefore
    touching the previous memory location holding LISTE_HEAD(single), better
    close the bug for good, since its really subtle.
    
    (Same fix for default_device_exit_batch() for completeness)
    
    Reported-by: Michal Hocko <mhocko@suse.cz>
    Tested-by: Michal Hocko <mhocko@suse.cz>
    Reported-by: Eric W. Biderman <ebiderman@xmission.com>
    Tested-by: Eric W. Biderman <ebiderman@xmission.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
    CC: Ingo Molnar <mingo@elte.hu>
    CC: Octavian Purdila <opurdila@ixiacom.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  32. workqueue: make sure MAYDAY_INITIAL_TIMEOUT is at least 2 jiffies long

    htejun committed with gregkh Feb 16, 2011
    commit 3233cdb upstream.
    
    MAYDAY_INITIAL_TIMEOUT is defined as HZ / 100 and depending on
    configuration may end up 0 or 1.  Even when it's 1, depending on when
    the mayday timer is added in the current jiffy interval, it may expire
    way before a jiffy has passed.
    
    Make sure MAYDAY_INITIAL_TIMEOUT is at least two to guarantee that at
    least a full jiffy has passed before calling rescuers.
    
    Signed-off-by: Tejun Heo <tj@kernel.org>
    Reported-by: Ray Jui <rjui@broadcom.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>