1. 21 Sep, 2006 13 commits
  2. 19 Sep, 2006 16 commits
  3. 18 Sep, 2006 11 commits
    • Linus Torvalds's avatar
      x86: save/restore eflags in context switch · 47a5c6fa
      Linus Torvalds authored
      
      
      (And reset it on new thread creation)
      
      It turns out that eflags is important to save and restore not just
      because of iopl, but due to the magic bits like the NT bit, which we
      don't want leaking between different threads.
      Tested-by: default avatarMike Galbraith <efault@gmx.de>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      47a5c6fa
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · 1d19f176
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
        [ATM] CLIP: Do not refer freed skbuff in clip_mkip().
        [NET]: Drop tx lock in dev_watchdog_up
        [PACKET]: Don't truncate non-linear skbs with mmaped IO
        [NET]: Mark frame diverter for future removal.
        [NETFILTER]: Add secmark headers to header-y
        [ATM]: linux-atm-general mailing list is subscribers only
        [ATM]: [he] when transmit fails, unmap the dma regions
        [TCP] tcp-lp: update information to MAINTAINERS
        [TCP] tcp-lp: bug fix for oops in 2.6.18-rc6
        [BRIDGE]: random extra bytes on STP TCN packet
        [IPV6]: Accept -1 for IPV6_TCLASS
        [IPV6]: Fix tclass setting for raw sockets.
        [IPVS]: remove the debug option go ip_vs_ftp
        [IPVS]: Make sure ip_vs_ftp ports are valid
        [IPVS]: auto-help for ip_vs_ftp
        [IPVS]: Document the ports option to ip_vs_ftp in kernel-parameters.txt
        [TCP]: Turn ABC off.
        [NEIGH]: neigh_table_clear() doesn't free stats
      1d19f176
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 · 20bf94e2
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
        [SPARC]: Fix regression in sys_getdomainname()
        [OPENPROMIO]: Handle current_node being NULL correctly.
      20bf94e2
    • Linus Torvalds's avatar
      Merge master.kernel.org:/home/rmk/linux-2.6-arm · 77e2782f
      Linus Torvalds authored
      * master.kernel.org:/home/rmk/linux-2.6-arm:
        [ARM] 3815/1: headers_install support for ARM
        [ARM] 3794/1: S3C24XX: do not defined set_irq_wake when no CONFIG_PM
        [ARM] 3793/1: S3C2412: fix wrong serial info struct
        [ARM] 3780/1: Fix iop321 cpuid
        [ARM] 3786/1: pnx4008: update defconfig
        [ARM] 3785/1: S3C2412: Fix idle code as default uses wrong clocks
        [ARM] 3784/1: S3C2413: fix config for MACH_S3C2413/MACH_SMDK2413
      77e2782f
    • Ralph Siemsen's avatar
      [ARM] 3815/1: headers_install support for ARM · e40b1074
      Ralph Siemsen authored
      
      
      Move kernel-only #includes into #ifdef __KERNEL__, so that
      headers_install target can be used on ARM.
      Signed-off-by: default avatarRalph Siemsen <ralphs@netwinder.org>
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      e40b1074
    • Andy Walker's avatar
      [SPARC]: Fix regression in sys_getdomainname() · b9c54f91
      Andy Walker authored
      
      
      This patch corrects the buffer length checking in the
      sys_getdomainname() implementation for sparc/sparc64.
      Signed-off-by: default avatarAndy Walker <andy@puszczka.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      b9c54f91
    • YOSHIFUJI Hideaki's avatar
      [ATM] CLIP: Do not refer freed skbuff in clip_mkip(). · fe26109a
      YOSHIFUJI Hideaki authored
      
      
      In clip_mkip(), skb->dev is dereferenced after clip_push(),
      which frees up skb.
      
      Advisory: AD_LAB-06009 (<adlab@venustech.com.cn>).
      Signed-off-by: default avatarYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      fe26109a
    • Ben Dooks's avatar
      [ARM] 3794/1: S3C24XX: do not defined set_irq_wake when no CONFIG_PM · a9c3685b
      Ben Dooks authored
      
      
      Patch from Ben Dooks
      
      Do not define set_irq_wake as a real function if
      the CONFIG_PM option is not set.
      
      Fixes bug reported by Thomas Gleixner.
      Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      a9c3685b
    • Ben Dooks's avatar
      [ARM] 3793/1: S3C2412: fix wrong serial info struct · 71aa7054
      Ben Dooks authored
      
      
      Patch from Ben Dooks
      
      The S3C2440 serial info struct is being passed
      through the S3C2412 serial info struct probe
      routine.
      Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
      Signed-off-by: default avatarThomas Glexiner <tglx@linutronix.de>
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      71aa7054
    • David S. Miller's avatar
      [OPENPROMIO]: Handle current_node being NULL correctly. · b9b64e6e
      David S. Miller authored
      
      
      If the user tries to traverse to the next node of the
      last node, we get NULL in current_node and a zero phandle
      returned.  That's fine, but if the user tries to obtain
      properties in that state, we try to dereference a NULL
      pointer in the downcall to the of_*() routines.
      
      So protect against that.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      b9b64e6e
    • Herbert Xu's avatar
      [NET]: Drop tx lock in dev_watchdog_up · d7811e62
      Herbert Xu authored
      
      
      Fix lockdep warning with GRE, iptables and Speedtouch ADSL, PPP over ATM.
      
      On Sat, Sep 02, 2006 at 08:39:28PM +0000, Krzysztof Halasa wrote:
      > 
      > =======================================================
      > [ INFO: possible circular locking dependency detected ]
      > -------------------------------------------------------
      > swapper/0 is trying to acquire lock:
      >  (&dev->queue_lock){-+..}, at: [<c02c8c46>] dev_queue_xmit+0x56/0x290
      > 
      > but task is already holding lock:
      >  (&dev->_xmit_lock){-+..}, at: [<c02c8e14>] dev_queue_xmit+0x224/0x290
      > 
      > which lock already depends on the new lock.
      
      This turns out to be a genuine bug.  The queue lock and xmit lock are
      intentionally taken out of order.  Two things are supposed to prevent
      dead-locks from occuring:
      
      1) When we hold the queue_lock we're supposed to only do try_lock on the
      tx_lock.
      
      2) We always drop the queue_lock after taking the tx_lock and before doing
      anything else.
      
      > 
      > the existing dependency chain (in reverse order) is:
      > 
      > -> #1 (&dev->_xmit_lock){-+..}:
      >        [<c012e7b6>] lock_acquire+0x76/0xa0
      >        [<c0336241>] _spin_lock_bh+0x31/0x40
      >        [<c02d25a9>] dev_activate+0x69/0x120
      
      This path obviously breaks assumption 1) and therefore can lead to ABBA
      dead-locks.
      
      I've looked at the history and there seems to be no reason for the lock
      to be held at all in dev_watchdog_up.  The lock appeared in day one and
      even there it was unnecessary.  In fact, people added __dev_watchdog_up
      precisely in order to get around the tx lock there.
      
      The function dev_watchdog_up is already serialised by rtnl_lock since
      its only caller dev_activate is always called under it.
      
      So here is a simple patch to remove the tx lock from dev_watchdog_up.
      In 2.6.19 we can eliminate the unnecessary __dev_watchdog_up and
      replace it with dev_watchdog_up.
      Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      d7811e62