1. 29 Nov, 2006 1 commit
  2. 28 Nov, 2006 34 commits
  3. 27 Nov, 2006 1 commit
  4. 26 Nov, 2006 4 commits
    • Linus Torvalds's avatar
      Fix 'ALIGN()' macro, take 2 · 2ea58144
      Linus Torvalds authored
      You wouldn't think that doing an ALIGN() macro that aligns something up
      to a power-of-two boundary would be likely to have bugs, would you?
      
      But hey, in the wonderful world of mixing integer types, you have to be
      careful.  This just makes sure that the alignment is interpreted in the
      same type as the thing to be aligned.
      
      Thanks to Roland Dreier, who noticed that the amso1100 driver got broken
      by the previous fix (that just extended the mask to "unsigned long", but
      was still broken in "unsigned long long" - it just happened to be the
      same on 64-bit architectures).
      
      See commit 4c8bd7ee
      
       for the history of
      bugs here...
      Acked-by: default avatarRoland Dreier <rdreier@cisco.com>
      Cc: Andrew Morton <akpm@osdl.org>
      Cc: David Miller <davem@davemloft.net>
      Cc: Al Viro <viro@zeniv.linux.org.uk>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      2ea58144
    • Kyle McMartin's avatar
      [PATCH] Fix incorrent type of flags in <asm/semaphore.h> · c9c3b86f
      Kyle McMartin authored
      
      
      I still think using BUILD_BUG_ON() is unacceptable, especially given how
      vague the error message was.
      Signed-off-by: default avatarKyle McMartin <kyle@parisc-linux.org>
      [ And I already removed gthe BUILD_BUG_ON() in the previous commit ]
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      c9c3b86f
    • Linus Torvalds's avatar
      Revert "[PATCH] Enforce "unsigned long flags;" when spinlocking" · b8e6ec86
      Linus Torvalds authored
      This reverts commit ee3ce191
      
      , since it
      broke on at least ARM, MIPS and PA-RISC due to complicated header file
      dependencies.
      
      Conflicts in include/linux/spinlock.h (due to the "nested" variety
      fixes) fixed up by hand.
      
      Cc: Alexey Dobriyan <adobriyan@gmail.com>
      Cc: Ralf Baechle <ralf@linux-mips.org>
      Cc: Kyle McMartin <kyle@parisc-linux.org>
      Cc: Russell King <rmk+lkml@arm.linux.org.uk>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      b8e6ec86
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · 137b529e
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
        [XFRM] STATE: Fix to respond error to get operation if no matching entry exists.
        [NET]: Re-fix of doc-comment in sock.h
        [6PACK]: Masking bug in 6pack driver.
        [NET]: Fix kfifo_alloc() error check.
        [UDP]: Make udp_encap_rcv use pskb_may_pull
        [NETFILTER]: H.323 conntrack: fix crash with CONFIG_IP_NF_CT_ACCT
      137b529e