Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Aug 16, 2010
  1. Merge branch 'linuximq-2.6.35'

    Oleksandr Natalenko authored
  2. linuximq-2.6.35: add forgotten files

    Oleksandr Natalenko authored
  3. Merge branch 'configs-2.6.35'

    Oleksandr Natalenko authored
  4. configs-2.6.35: update config for Dell Inspiron 1525 laptop

    Oleksandr Natalenko authored
  5. Merge branch 'version-2.6.35'

    Oleksandr Natalenko authored
  6. version-2.6.35: bump to v2.6.35-pf3

    Oleksandr Natalenko authored
  7. Merge remote branch 'jrmoore/configs-2.6.35'

    Oleksandr Natalenko authored
  8. @jrmoore
Commits on Aug 15, 2010
  1. Merge branch 'linuximq-2.6.35'

    Oleksandr Natalenko authored
  2. linuximq-2.6.35: add linuximq for 2.6.35 kernel

    Oleksandr Natalenko authored
  3. Merge remote branch 'tuxonice-2.6.35/combined'

    Oleksandr Natalenko authored
  4. Merge branch 'version-2.6.35'

    Oleksandr Natalenko authored
  5. version-2.6.35: bump to v2.6.35-pf2

    Oleksandr Natalenko authored
  6. fix merge conflict

    Oleksandr Natalenko authored
  7. Merge remote branch 'jrmoore/configs-2.6.35'

    Oleksandr Natalenko authored
Commits on Aug 13, 2010
  1. @NigelCunningham

    Merge branch 'stable' into combined

    NigelCunningham authored
    Conflicts:
    	include/linux/fs.h
  2. @gregkh

    Linux 2.6.35.2

    gregkh authored
  3. @torvalds @gregkh

    x86: don't send SIGBUS for kernel page faults

    torvalds authored gregkh committed
    commit 9605456 upstream.
    
    It's wrong for several reasons, but the most direct one is that the
    fault may be for the stack accesses to set up a previous SIGBUS.  When
    we have a kernel exception, the kernel exception handler does all the
    fixups, not some user-level signal handler.
    
    Even apart from the nested SIGBUS issue, it's also wrong to give out
    kernel fault addresses in the signal handler info block, or to send a
    SIGBUS when a system call already returns EFAULT.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  4. @torvalds @gregkh

    mm: fix missing page table unmap for stack guard page failure case

    torvalds authored gregkh committed
    commit 5528f91 upstream.
    
    .. which didn't show up in my tests because it's a no-op on x86-64 and
    most other architectures.  But we enter the function with the last-level
    page table mapped, and should unmap it at exit.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  5. @torvalds @gregkh

    mm: keep a guard page below a grow-down stack segment

    torvalds authored gregkh committed
    commit 320b2b8 upstream.
    
    This is a rather minimally invasive patch to solve the problem of the
    user stack growing into a memory mapped area below it.  Whenever we fill
    the first page of the stack segment, expand the segment down by one
    page.
    
    Now, admittedly some odd application might _want_ the stack to grow down
    into the preceding memory mapping, and so we may at some point need to
    make this a process tunable (some people might also want to have more
    than a single page of guarding), but let's try the minimal approach
    first.
    
    Tested with trivial application that maps a single page just below the
    stack, and then starts recursing.  Without this, we will get a SIGSEGV
    _after_ the stack has smashed the mapping.  With this patch, we'll get a
    nice SIGBUS just as the stack touches the page just above the mapping.
    
    Requested-by: Keith Packard <keithp@keithp.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  6. @sandeen @gregkh

    ext4: fix freeze deadlock under IO

    sandeen authored gregkh committed
    commit 437f88c upstream.
    
    Commit 6b0310f caused a regression resulting in deadlocks
    when freezing a filesystem which had active IO; the vfs_check_frozen
    level (SB_FREEZE_WRITE) did not let the freeze-related IO syncing
    through.  Duh.
    
    Changing the test to FREEZE_TRANS should let the normal freeze
    syncing get through the fs, but still block any transactions from
    starting once the fs is completely frozen.
    
    I tested this by running fsstress in the background while periodically
    snapshotting the fs and running fsck on the result.  I ran into
    occasional deadlocks, but different ones.  I think this is a
    fine fix for the problem at hand, and the other deadlocky things
    will need more investigation.
    
    Reported-by: Phillip Susi <psusi@cfl.rr.com>
    Signed-off-by: Eric Sandeen <sandeen@redhat.com>
    Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  7. @virtuoso @gregkh

    crypto: testmgr - add an option to disable cryptoalgos' self-tests

    virtuoso authored gregkh committed
    commit 0b767f9 upstream.
    
    By default, CONFIG_CRYPTO_MANAGER_TESTS will be enabled and thus
    self-tests will still run, but it is now possible to disable them
    to gain some time during bootup.
    
    Signed-off-by: Alexander Shishkin <virtuoso@slind.org>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  8. @gregkh

    xen: Do not suspend IPI IRQs.

    Ian Campbell authored gregkh committed
    commit 4877c73 upstream.
    
    In general the semantics of IPIs are that they are are expected to
    continue functioning after dpm_suspend_noirq().
    
    Specifically I have seen a deadlock between the callfunc IPI and the
    stop machine used by xen's do_suspend() routine. If one CPU has already
    called dpm_suspend_noirq() then there is a window where it can be sent
    a callfunc IPI before all the other CPUs have entered stop_cpu().
    
    If this happens then the first CPU ends up spinning in stop_cpu()
    waiting for the other to rendezvous in state STOPMACHINE_PREPARE while
    the other is spinning in csd_lock_wait().
    
    Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
    Cc: Jeremy Fitzhardinge <jeremy@goop.org>
    Cc: xen-devel@lists.xensource.com
    LKML-Reference: <1280398595-29708-4-git-send-email-ian.campbell@citrix.com>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  9. @gregkh

    irq: Add new IRQ flag IRQF_NO_SUSPEND

    Ian Campbell authored gregkh committed
    commit 685fd0b upstream.
    
    A small number of users of IRQF_TIMER are using it for the implied no
    suspend behaviour on interrupts which are not timer interrupts.
    
    Therefore add a new IRQF_NO_SUSPEND flag, rename IRQF_TIMER to
    __IRQF_TIMER and redefine IRQF_TIMER in terms of these new flags.
    
    Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
    Cc: Jeremy Fitzhardinge <jeremy@goop.org>
    Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
    Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Cc: Paul Mackerras <paulus@samba.org>
    Cc: Grant Likely <grant.likely@secretlab.ca>
    Cc: xen-devel@lists.xensource.com
    Cc: linux-input@vger.kernel.org
    Cc: linuxppc-dev@ozlabs.org
    Cc: devicetree-discuss@lists.ozlabs.org
    LKML-Reference: <1280398595-29708-1-git-send-email-ian.campbell@citrix.com>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  10. @davem330 @gregkh

    net: Fix NETDEV_NOTIFY_PEERS to not conflict with NETDEV_BONDING_DESL…

    davem330 authored gregkh committed
    …AVE.
    
    commit 38117d1 upstream.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  11. @gregkh

    jfs: don't allow os2 xattr namespace overlap with others

    Dave Kleikamp authored gregkh committed
    commit aca0fa3 upstream.
    
    It's currently possible to bypass xattr namespace access rules by
    prefixing valid xattr names with "os2.", since the os2 namespace stores
    extended attributes in a legacy format with no prefix.
    
    This patch adds checking to deny access to any valid namespace prefix
    following "os2.".
    
    Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
    Reported-by: Sergey Vlasov <vsu@altlinux.ru>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  12. @gregkh

    l2tp: fix export of header file for userspace

    James Chapman authored gregkh committed
    commit 4565956 upstream.
    
    The header file l2tp.h should be exported to the installed include/linux/
    tree for userspace programs.
    
    This patch fixes compilation errors in L2TP userspace apps which want to
    use the new L2TP support introduced in 2.6.35.
    
    Signed-off-by: James Chapman <jchapman@katalix.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  13. @marex @gregkh

    mtd: gen_nand: fix support for multiple chips

    marex authored gregkh committed
    commit 81cbb0b upstream.
    
    This patch corrects a problem where gen_nand driver assumed there can be only
    one chip and ignored the pdata->chip.nr_chips value.
    
    Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
    Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
    Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  14. @ebenard @gregkh

    mtd: mxc_nand: fix unbalanced enable for IRQ

    ebenard authored gregkh committed
    commit 6a8cfcf upstream.
    
    * preset should be done before sending the reset command
    
    * without this, I get the following error on an i.MX35 :
    [    0.900000] ------------[ cut here ]------------
    [    0.900000] WARNING: at kernel/irq/manage.c:290 __enable_irq+0x4c/0x88()
    [    0.900000] Unbalanced enable for IRQ 33
    [    0.900000] Modules linked in:
    [    0.900000] [<c002ffb8>] (unwind_backtrace+0x0/0xf0) from [<c02f7d0c>] (dump_stack+0x18/0x1c)
    [    0.900000] [<c02f7d0c>] (dump_stack+0x18/0x1c) from [<c0049a44>] (warn_slowpath_common+0x54/0x6c)
    [    0.900000] [<c0049a44>] (warn_slowpath_common+0x54/0x6c) from [<c0049b00>] (warn_slowpath_fmt+0x38/0x40)
    [    0.900000] [<c0049b00>] (warn_slowpath_fmt+0x38/0x40) from [<c008f65c>] (__enable_irq+0x4c/0x88)
    [    0.900000] [<c008f65c>] (__enable_irq+0x4c/0x88) from [<c008fca0>] (enable_irq+0x54/0x98)
    [    0.900000] [<c008fca0>] (enable_irq+0x54/0x98) from [<c021e618>] (wait_op_done+0x40/0x134)
    [    0.900000] [<c021e618>] (wait_op_done+0x40/0x134) from [<c021e808>] (send_cmd+0x30/0x38)
    [    0.900000] [<c021e808>] (send_cmd+0x30/0x38) from [<c021eb8c>] (mxc_nand_command+0x26c/0x328)
    [    0.900000] [<c021eb8c>] (mxc_nand_command+0x26c/0x328) from [<c021aa60>] (nand_scan_ident+0x188/0x6c0)
    [    0.900000] [<c021aa60>] (nand_scan_ident+0x188/0x6c0) from [<c001a9cc>] (mxcnd_probe+0x2b8/0x3d0)
    [    0.900000] [<c001a9cc>] (mxcnd_probe+0x2b8/0x3d0) from [<c01f9e88>] (platform_drv_probe+0x20/0x24)
    [    0.900000] [<c01f9e88>] (platform_drv_probe+0x20/0x24) from [<c01f8c38>] (driver_probe_device+0xb0/0x164)
    [    0.900000] [<c01f8c38>] (driver_probe_device+0xb0/0x164) from [<c01f8d54>] (__driver_attach+0x68/0x8c)
    [    0.900000] [<c01f8d54>] (__driver_attach+0x68/0x8c) from [<c01f8348>] (bus_for_each_dev+0x50/0x84)
    [    0.900000] [<c01f8348>] (bus_for_each_dev+0x50/0x84) from [<c01f8a9c>] (driver_attach+0x20/0x28)
    [    0.900000] [<c01f8a9c>] (driver_attach+0x20/0x28) from [<c01f7c00>] (bus_add_driver+0x144/0x2dc)
    [    0.900000] [<c01f7c00>] (bus_add_driver+0x144/0x2dc) from [<c01f906c>] (driver_register+0xb0/0x13c)
    [    0.900000] [<c01f906c>] (driver_register+0xb0/0x13c) from [<c01fa13c>] (platform_driver_register+0x4c/0x60)
    [    0.900000] [<c01fa13c>] (platform_driver_register+0x4c/0x60) from [<c01fa170>] (platform_driver_probe+0x20/0xa0)
    [    0.900000] [<c01fa170>] (platform_driver_probe+0x20/0xa0) from [<c001a708>] (mxc_nd_init+0x18/0x24)
    [    0.900000] [<c001a708>] (mxc_nd_init+0x18/0x24) from [<c002938c>] (do_one_initcall+0x64/0x1bc)
    [    0.900000] [<c002938c>] (do_one_initcall+0x64/0x1bc) from [<c00084c4>] (kernel_init+0xe8/0x1ac)
    [    0.900000] [<c00084c4>] (kernel_init+0xe8/0x1ac) from [<c002aee8>] (kernel_thread_exit+0x0/0x8)
    [    0.900000] ---[ end trace 8bf72ac6ba089a19 ]---
    [    1.140000] NAND device: Manufacturer ID: 0x2c, Chip ID: 0xda (Micron NAND 256MiB 3,3V 8-bit)
    
    Signed-off-by: Eric Bénard <eric@eukrea.com>
    Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
    Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  15. @gregkh

    sched: Revert nohz_ratelimit() for now

    Peter Zijlstra authored gregkh committed
    commit 396e894 upstream.
    
    Norbert reported that nohz_ratelimit() causes his laptop to burn about
    4W (40%) extra. For now back out the change and see if we can adjust
    the power management code to make better decisions.
    
    Reported-by: Norbert Preining <preining@logic.at>
    Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Acked-by: Mike Galbraith <efault@gmx.de>
    Cc: Arjan van de Ven <arjan@infradead.org>
    LKML-Reference: <new-submission>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  16. @gregkh

    Bluetooth: Added support for controller shipped with iMac i5

    Cyril Lacoux authored gregkh committed
    commit 0a79f67 upstream.
    
    Device class is ff(vend.) instead of e0(wlcon).
    
    Output from command `usb-devices`:
    T:  Bus=01 Lev=03 Prnt=03 Port=00 Cnt=01 Dev#=  6 Spd=12  MxCh= 0
    D:  Ver= 2.00 Cls=ff(vend.) Sub=01 Prot=01 MxPS=64 #Cfgs=  1
    P:  Vendor=05ac ProdID=8215 Rev=01.82
    S:  Manufacturer=Apple Inc.
    S:  Product=Bluetooth USB Host Controller
    S:  SerialNumber=7C6D62936607
    C:  #Ifs= 4 Cfg#= 1 Atr=e0 MxPwr=0mA
    I:  If#= 0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb
    I:  If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
    I:  If#= 2 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
    I:  If#= 3 Alt= 0 #EPs= 0 Cls=fe(app. ) Sub=01 Prot=00 Driver=(none)
    
    Signed-off-by: Cyril Lacoux <clacoux@ifeelgood.org>
    Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  17. @jhovold @gregkh

    USB: serial: fix stalled writes

    jhovold authored gregkh committed
    commit b58af40 upstream.
    
    As David VomLehn points out, it was possible to receive an interrupt
    before clearing the free-urb flag which could lead to the urb being
    incorrectly marked as busy.
    
    For the same reason, move tx_bytes accounting so that it will never be
    negative.
    
    Note that the free-flags set and clear operations do not need any
    additional locking as they are manipulated while USB_SERIAL_WRITE_BUSY
    is set.
    
    Reported-by: David VomLehn <dvomlehn@cisco.com>
    Tested-by: David VomLehn <dvomlehn@cisco.com>
    Signed-off-by: Johan Hovold <jhovold@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  18. @chunkeey @gregkh

    USB: fix thread-unsafe anchor utiliy routines

    chunkeey authored gregkh committed
    commit b3e6704 upstream.
    
    This patch fixes a race condition in two utility routines
    related to the removal/unlinking of urbs from an anchor.
    
    If two threads are concurrently accessing the same anchor,
    both could end up with the same urb - thinking they are
    the exclusive owner.
    
    Alan Stern pointed out a related issue in
    usb_unlink_anchored_urbs:
    
    "The URB isn't removed from the anchor until it completes
     (as a by-product of completion, in fact), which might not
     be for quite some time after the unlink call returns.
     In the meantime, the subroutine will keep trying to unlink
     it, over and over again."
    
    Cc: Oliver Neukum <oneukum@suse.de>
    Cc: Greg Kroah-Hartman <greg@kroah.com>
    Acked-by: Alan Stern <stern@rowland.harvard.edu>
    Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  19. @ming1 @gregkh

    USB: usbtest: avoid to free coherent buffer in atomic context

    ming1 authored gregkh committed
    commit e10e1be upstream.
    
    This patch fixes the warning below:
    [30753.755998] ------------[ cut here ]------------
    [30753.755998] WARNING: at /home/tom/git/linux-2.6/linux-2.6-next/arch/x86/include/asm/dma-mapping.h:155 hcd_buffer_free+0xb1/0xd4 [usbcore]()
    [30753.755998] Hardware name: 6475EK2
    [30753.755998] Modules linked in: uvcvideo ehci_hcd usbtest cdc_ether usbnet vfat fat usb_storage nfsd lockd nfs_acl auth_rpcgss exportfs mii tun videodev v4l1_compat v4l2_compat_ioctl32 fuse bridge stp llc sunrpc ipv6 cpufreq_ondemand acpi_cpufreq freq_table mperf kvm_intel kvm arc4 ecb ath5k usbhid mac80211 snd_hda_codec_conexant ch341 usbserial ath cfg80211 thinkpad_acpi snd_hda_intel pcspkr wmi hwmon yenta_socket iTCO_wdt iTCO_vendor_support i2c_i801 e1000e snd_hda_codec snd_hwdep snd_pcm snd_timer snd soundcore snd_page_alloc pata_acpi uhci_hcd ohci_hcd usbcore i915 drm_kms_helper drm i2c_algo_bit i2c_core video output [last unloaded: uvcvideo]
    [30753.755998] Pid: 0, comm: swapper Tainted: G        W   2.6.35-rc6-gkh-wl+ #49
    [30753.755998] Call Trace:
    [30753.755998]  <IRQ>  [<ffffffff8104478a>] warn_slowpath_common+0x80/0x98
    [30753.755998]  [<ffffffff810447b7>] warn_slowpath_null+0x15/0x17
    [30753.755998]  [<ffffffffa00ce02d>] hcd_buffer_free+0xb1/0xd4 [usbcore]
    [30753.755998]  [<ffffffffa00c1345>] usb_free_coherent+0x1c/0x1e [usbcore]
    [30753.755998]  [<ffffffffa00b13e4>] simple_free_urb+0x23/0x2f [usbtest]
    [30753.755998]  [<ffffffffa00b210b>] iso_callback+0xbb/0x10f [usbtest]
    [30753.755998]  [<ffffffffa00c7390>] usb_hcd_giveback_urb+0x8c/0xc0 [usbcore]
    [30753.755998]  [<ffffffffa0449b35>] ehci_urb_done+0x84/0x95 [ehci_hcd]
    [30753.755998]  [<ffffffffa044b5a5>] ehci_work+0x41a/0x7dd [ehci_hcd]
    [30753.755998]  [<ffffffffa044e298>] ehci_irq+0x33b/0x370 [ehci_hcd]
    [30753.755998]  [<ffffffff8100fb05>] ? sched_clock+0x9/0xd
    [30753.755998]  [<ffffffff8105e641>] ? sched_clock_local+0x1c/0x82
    [30753.755998]  [<ffffffff8105e76a>] ? sched_clock_cpu+0xc3/0xce
    [30753.755998]  [<ffffffff81067c7e>] ? trace_hardirqs_off+0xd/0xf
    [30753.755998]  [<ffffffff8105e7b8>] ? cpu_clock+0x43/0x5e
    [30753.755998]  [<ffffffffa00c6999>] usb_hcd_irq+0x45/0xa1 [usbcore]
    [30753.755998]  [<ffffffff81092e02>] handle_IRQ_event+0x20/0xa5
    [30753.755998]  [<ffffffff81094cea>] handle_fasteoi_irq+0x92/0xd2
    [30753.755998]  [<ffffffff8100c0ed>] handle_irq+0x1f/0x2a
    [30753.755998]  [<ffffffff8100b75d>] do_IRQ+0x57/0xbe
    [30753.755998]  [<ffffffff8136a693>] ret_from_intr+0x0/0x16
    [30753.755998]  <EOI>  [<ffffffff81223baa>] ? acpi_idle_enter_bm+0x231/0x269
    [30753.755998]  [<ffffffff81223ba3>] ? acpi_idle_enter_bm+0x22a/0x269
    [30753.755998]  [<ffffffff812c4b6b>] cpuidle_idle_call+0x99/0xce
    [30753.755998]  [<ffffffff81008dd5>] cpu_idle+0x61/0xaa
    [30753.755998]  [<ffffffff8136374b>] start_secondary+0x1c2/0x1c6
    [30753.755998] ---[ end trace 904cfaf7ab4cb1a2 ]---
    
    Signed-off-by: Ming Lei <tom.leiming@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  20. @abogani @gregkh

    USB: cp210x: Add four new device IDs

    abogani authored gregkh committed
    commit 356c5a4 upstream.
    
    Signed-off-by: Alessio Igor Bogani <abogani@texware.it>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Something went wrong with that request. Please try again.