Skip to content
  1. Apr 22, 2010
  2. Apr 21, 2010
    • David Howells's avatar
      net: Fix an RCU warning in dev_pick_tx() · 05d17608
      David Howells authored
      
      
      Fix the following RCU warning in dev_pick_tx():
      
      ===================================================
      [ INFO: suspicious rcu_dereference_check() usage. ]
      ---------------------------------------------------
      net/core/dev.c:1993 invoked rcu_dereference_check() without protection!
      
      other info that might help us debug this:
      
      rcu_scheduler_active = 1, debug_locks = 0
      2 locks held by swapper/0:
       #0:  (&idev->mc_ifc_timer){+.-...}, at: [<ffffffff81039e65>] run_timer_softirq+0x17b/0x278
       #1:  (rcu_read_lock_bh){.+....}, at: [<ffffffff812ea3eb>] dev_queue_xmit+0x14e/0x4dc
      
      stack backtrace:
      Pid: 0, comm: swapper Not tainted 2.6.34-rc5-cachefs #4
      Call Trace:
       <IRQ>  [<ffffffff810516c4>] lockdep_rcu_dereference+0xaa/0xb2
       [<ffffffff812ea4f6>] dev_queue_xmit+0x259/0x4dc
       [<ffffffff812ea3eb>] ? dev_queue_xmit+0x14e/0x4dc
       [<ffffffff81052324>] ? trace_hardirqs_on+0xd/0xf
       [<ffffffff81035362>] ? local_bh_enable_ip+0xbc/0xc1
       [<ffffffff812f0954>] neigh_resolve_output+0x24b/0x27c
       [<ffffffff8134f673>] ip6_output_finish+0x7c/0xb4
       [<ffffffff81350c34>] ip6_output2+0x256/0x261
       [<ffffffff81052324>] ? trace_hardirqs_on+0xd/0xf
       [<ffffffff813517fb>] ip6_output+0xbbc/0xbcb
       [<ffffffff8135bc5d>] ? fib6_force_start_gc+0x2b/0x2d
       [<ffffffff81368acb>] mld_sendpack+0x273/0x39d
       [<ffffffff81368858>] ? mld_sendpack+0x0/0x39d
       [<ffffffff81052099>] ? mark_held_locks+0x52/0x70
       [<ffffffff813692fc>] mld_ifc_timer_expire+0x24f/0x288
       [<ffffffff81039ed6>] run_timer_softirq+0x1ec/0x278
       [<ffffffff81039e65>] ? run_timer_softirq+0x17b/0x278
       [<ffffffff813690ad>] ? mld_ifc_timer_expire+0x0/0x288
       [<ffffffff81035531>] ? __do_softirq+0x69/0x140
       [<ffffffff8103556a>] __do_softirq+0xa2/0x140
       [<ffffffff81002e0c>] call_softirq+0x1c/0x28
       [<ffffffff81004b54>] do_softirq+0x38/0x80
       [<ffffffff81034f06>] irq_exit+0x45/0x47
       [<ffffffff810177c3>] smp_apic_timer_interrupt+0x88/0x96
       [<ffffffff810028d3>] apic_timer_interrupt+0x13/0x20
       <EOI>  [<ffffffff810488dd>] ? __atomic_notifier_call_chain+0x0/0x86
       [<ffffffff810096bf>] ? mwait_idle+0x6e/0x78
       [<ffffffff810096b6>] ? mwait_idle+0x65/0x78
       [<ffffffff810011cb>] cpu_idle+0x4d/0x83
       [<ffffffff81380b05>] rest_init+0xb9/0xc0
       [<ffffffff81380a4c>] ? rest_init+0x0/0xc0
       [<ffffffff8168dcf0>] start_kernel+0x392/0x39d
       [<ffffffff8168d2a3>] x86_64_start_reservations+0xb3/0xb7
       [<ffffffff8168d38b>] x86_64_start_kernel+0xe4/0xeb
      
      An rcu_dereference() should be an rcu_dereference_bh().
      
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Acked-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      05d17608
    • David S. Miller's avatar
    • Herbert Xu's avatar
      ipv6: Fix tcp_v6_send_response transport header setting. · 6651ffc8
      Herbert Xu authored
      My recent patch to remove the open-coded checksum sequence in
      tcp_v6_send_response broke it as we did not set the transport
      header pointer on the new packet.
      
      Actually, there is code there trying to set the transport
      header properly, but it sets it for the wrong skb ('skb'
      instead of 'buff').
      
      This bug was introduced by commit
      a8fdf2b3
      
       ("ipv6: Fix
      tcp_v6_send_response(): it didn't set skb transport header")
      
      Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      6651ffc8
    • Eric Dumazet's avatar
      bridge: add a missing ntohs() · 8eabf95c
      Eric Dumazet authored
      
      
      grec_nsrcs is in network order, we should convert to host horder in
      br_multicast_igmp3_report()
      
      Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
      Acked-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      8eabf95c
    • David S. Miller's avatar
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6 · 05ce7bfe
      Linus Torvalds authored
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6:
        quota: Convert __DQUOT_PARANOIA symbol to standard config option
      05ce7bfe
    • Jan Kara's avatar
      quota: Convert __DQUOT_PARANOIA symbol to standard config option · 62af9b52
      Jan Kara authored
      
      
      Make __DQUOT_PARANOIA define from the old days a standard config option
      and turn it off by default.
      
      This gets rid of a quota warning about writes before quota is turned on
      for systems with ext4 root filesystem. Currently there's no way to legally
      solve this because /etc/mtab has to be written before quota is turned on
      on most systems.
      
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      62af9b52
    • Linus Torvalds's avatar
      Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 · 27ee8963
      Linus Torvalds authored
      * 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
        pcmcia: fix error handling in cm4000_cs.c
        drivers/pcmcia: Add missing local_irq_restore
        serial_cs: MD55x support (PCMCIA GPRS/EDGE modem) (kernel 2.6.33)
        pcmcia: avoid late calls to pccard_validate_cis
        pcmcia: fix ioport size calculation in rsrc_nonstatic
        pcmcia: re-start on MFC override
        pcmcia: fix io_probe due to parent (PCI) resources
        pcmcia: use previously assigned IRQ for all card functions
      27ee8963
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 · ac8bf564
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
        sparc64: Fix hardirq tracing in trap return path.
        sparc64: Use correct pt_regs in decode_access_size() error paths.
        sparc64: Fix PREEMPT_ACTIVE value.
        sparc64: Run NMIs on the hardirq stack.
        sparc64: Allocate sufficient stack space in ftrace stubs.
        sparc: Fix forgotten kmemleak headers inclusion
      ac8bf564
    • Linus Torvalds's avatar
      Merge branch 'perf-fixes-for-linus' of... · 34388d1c
      Linus Torvalds authored
      Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/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:
        perf: Fix unsafe frame rewinding with hot regs fetching
      34388d1c
    • Linus Torvalds's avatar
      Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 · 186837ca
      Linus Torvalds authored
      * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
        drm: delay vblank cleanup until after driver unload
      186837ca
    • Christoph Hellwig's avatar
      x86: correctly wire up the newuname system call · 4cecd935
      Christoph Hellwig authored
      Before commit e28cbf22
      
       ("improve
      sys_newuname() for compat architectures") 64-bit x86 had a private
      implementation of sys_uname which was just called sys_uname, which other
      architectures used for the old uname.
      
      Due to some merge issues with the uname refactoring patches we ended up
      calling the old uname version for both the old and new system call
      slots, which lead to the domainname filed never be set which caused
      failures with libnss_nis.
      
      Reported-and-tested-by: default avatarAndy Isaacson <adi@hexapodia.org>
      Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      4cecd935
  3. Apr 20, 2010
  4. Apr 19, 2010