1. 15 4月, 2008 30 次提交
  2. 12 4月, 2008 7 次提交
  3. 11 4月, 2008 3 次提交
    • H
      Fix "$(AS) -traditional" compile breakage caused by asmlinkage_protect · b0fac023
      Heiko Carstens 提交于
      git commit 54a01510 ("asmlinkage_protect
      replaces prevent_tail_call") causes this build failure on s390:
      
          AS      arch/s390/kernel/entry64.o
        In file included from arch/s390/kernel/entry64.S:14:
        include/linux/linkage.h:34: error: syntax error in macro parameter list
        make[1]: *** [arch/s390/kernel/entry64.o] Error 1
        make: *** [arch/s390/kernel] Error 2
      
      and some other architectures.  The reason is that some architectures add
      the "-traditional" flag to the invocation of $(AS), which disables
      variadic macro argument support.
      
      So just surround the new define with an #ifndef __ASSEMBLY__ to prevent
      any side effects on asm code.
      
      Cc: Roland McGrath <roland@redhat.com>
      Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
      Signed-off-by: NHeiko Carstens <heiko.carstens@de.ibm.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      b0fac023
    • L
      Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 · 099ce8f4
      Linus Torvalds 提交于
      * 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
        i2c-tiny-usb: New VID/PID pair
        i2c-davinci: Fix lost interrupt
        i2c-ibm_iic: Fast mode parm desc fixup
      099ce8f4
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 90768c09
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
        [NETNS][IPV6] tcp - assign the netns for timewait sockets
        [IPV4]: Fix byte value boundary check in do_ip_getsockopt().
        BNX2X: Correct bringing chip out of reset
        [NETFILTER]: nf_nat: autoload IPv4 connection tracking
        [NETFILTER]: xt_hashlimit: fix mask calculation
        [XFRM]: xfrm_user: fix selector family initialization
        rt61pci: rt61pci_beacon_update do not free skb twice
        ssb-mipscore: Fix interrupt vectors
        ssb-pcicore: Fix IRQ TPS flag handling
        mac80211: use short_preamble mode from capability if ERP IE not present
        [NET]: Undo code bloat in hot paths due to print_mac().
        [TCP]: Don't allow FRTO to take place while MTU is being probed
        [TCP]: tcp_simple_retransmit can cause S+L
        [TCP]: Fix NewReno's fast rexmit/recovery problems with GSOed skb
        [TCP]: Restore 2.6.24 mark_head_lost behavior for newreno/fack
        nl80211: fix STA AID bug
        b43legacy: fix bcm4303 crash
        iwlwifi: fix n-band association problem
        ipw2200: set MAC address on radiotap interface
        libertas: fix mode initialization problem
      90768c09