1. 31 5月, 2007 4 次提交
    • R
      alpha: cleanup in bitops.h · 74fd1b68
      Richard Henderson 提交于
      Remove 2 functions private to the alpha implemetation,
      in favor of similar functions in <linux/log2.h>.
      
      Provide a more efficient version of the fls64 function
      for pre-ev67 alphas.
      Signed-off-by: NRichard Henderson <rth@twiddle.net>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      74fd1b68
    • L
      Merge master.kernel.org:/home/rmk/linux-2.6-arm · f54496f5
      Linus Torvalds 提交于
      * master.kernel.org:/home/rmk/linux-2.6-arm:
        [ARM] Fix some section mismatch warnings
        [ARM] 4417/1: Serial: Fix AMBA drivers locking
        [ARM] 4394/1: ARMv7: Add the TLB range operations
        [ARM] 4410/1: Remove extern declarations in coyote/ixdpg425-pci.c
        [ARM] 4416/1: NWFPE: fix undeclared symbols
        [ARM] 4415/1: AML5900: fix sparse warnings from map_io
        [ARM] 4414/1: S3C2443: sparse fix for clock.c
        [ARM] 4412/1: S3C2412: reset errata fix
        [ARM] 4411/1: KS8695: Another serial driver fix
        [ARM] oprofile: avoid lockdep warnings on mpcore oprofile init
        [ARM] Fix stacktrace FP range checking
        [ARM] use __used attribute
        [ARM] enable arbitary speed tty ioctls and split input/output speed
        [ARM] remove unused header file: arch/arm/mach-s3c2410/bast.h
        [ARM] 4406/1: Trivial NSLU2 / NAS-100D header & setup code cleanup
        [ARM] 4405/1: NSLU2, DSM-G600 frequency fixup code
        [ARM] 4404/1: Trivial IXP42x Kconfig cleanup
        [ARM] 4403/1: Make the PXA-I2C driver work with lockdep validator
        [ARM] 4402/1: S3C2443: Add physical address of HSMMC controller
        [ARM] 4401/1: S3C2443: Add definitions for port GPIOJ
      f54496f5
    • R
      [ARM] Fix some section mismatch warnings · cdea4606
      Russell King 提交于
      The following patch fixes these section mismatch warnings:
      
      WARNING: arch/arm/mach-at91/built-in.o(.text+0xdf4): Section mismatch: reference to .init.data:dk_nand_partition (between 'nand_partitions' and 'at91_leds_event')
      WARNING: arch/arm/mach-at91/built-in.o(.text+0xbdc): Section mismatch: reference to .init.data:ek_nand_partition (after 'nand_partitions')
      WARNING: arch/arm/mach-at91/built-in.o(.text+0xbdc): Section mismatch: reference to .init.data:ek_nand_partition (between 'nand_partitions' and 'ads7843_pendown_state')
      WARNING: arch/arm/mach-at91/built-in.o(.text+0xbdc): Section mismatch: reference to .init.data:ek_nand_partition (after 'nand_partitions')
      WARNING: arch/arm/mach-at91/built-in.o(.text+0xc28): Section mismatch: reference to .init.data:kb9202_nand_partition (after 'nand_partitions')
      WARNING: arch/arm/mach-footbridge/built-in.o(.text+0xaa4): Section mismatch: reference to .init.data:cats_pci (between 'cats_pci_init' and 'ebsa285_leds_event')WARNING: arch/arm/mach-ixp2000/built-in.o(.text+0xb54): Section mismatch: reference to .init.text:ixp2000_init_irq (between 'ixdp2x00_init_irq' and 'ixdp2x00_irq_handler')
      WARNING: arch/arm/mach-ixp23xx/built-in.o(.text+0x670): Section mismatch: reference to .init.text:ixp23xx_pci_common_init (between 'ixp23xx_pci_slave_init' and 'ixp23xx_pci_scan_bus')
      WARNING: arch/arm/mach-ixp23xx/built-in.o(.text+0x890): Section mismatch: reference to .init.text:ixp23xx_init_irq (between 'ixdp2351_init_irq' and 'roadrunner_pci_preinit')
      WARNING: arch/arm/mach-ixp23xx/built-in.o(.text+0x9a8): Section mismatch: reference to .init.text:ixp23xx_pci_preinit (after 'roadrunner_pci_preinit')
      WARNING: arch/arm/mach-imx/built-in.o(__ksymtab+0x80): Section mismatch: reference to .init.text:imx_set_mmc_info (between '__ksymtab_imx_set_mmc_info' and '__ksymtab_set_imx_fb_info')
      WARNING: arch/arm/mach-imx/built-in.o(__ksymtab+0x88): Section mismatch: reference to .init.text:set_imx_fb_info (after '__ksymtab_set_imx_fb_info')
      WARNING: arch/arm/mach-sa1100/built-in.o(.text+0x1930): Section mismatch: reference to .init.data:neponset_port_fns (between 'neponset_probe' and 'assabet_leds_event')
      WARNING: drivers/built-in.o(.text+0x3f100): Section mismatch: reference to .init.text:ps2_clear_input (between 'ps2_probe' and 'ps2_cmd_aborted')
      WARNING: drivers/built-in.o(.text+0x3f1c8): Section mismatch: reference to .init.text:ps2_clear_input (between 'ps2_probe' and 'ps2_cmd_aborted')
      WARNING: drivers/built-in.o(.text+0x4f988): Section mismatch: reference to .init.text:ps2_clear_input (between 'ps2_probe' and 'ps2_cmd_aborted')
      WARNING: drivers/built-in.o(.text+0x4fa50): Section mismatch: reference to .init.text:ps2_clear_input (between 'ps2_probe' and 'ps2_cmd_aborted')
      Signed-off-by: NSam Ravnborg <sam@ravnborg.org>
      Acked-by: NLennert Buytenhek <buytenh@wantstofly.org>
      Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
      cdea4606
    • L
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 · aa2d3322
      Linus Torvalds 提交于
      * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
        ehea: Fixed multi queue RX bug
        sky2: enable IRQ on duplex renegotiation
        e1000: restore netif_poll_enable call but make sure IRQs are off
        defxx: Fix the handling of ioremap() failures
        sky2: program proper register for fiber PHY
        sky2: checksum offload plus vlan bug
        sky2: dont set bogus bit in PHY register
        [PATCH] hostap: Allocate enough tailroom for TKIP
        [PATCH] softmac: alloc_ieee80211() NULL check
        [PATCH] ieee80211: fix incomplete error message
        [PATCH] prism54: fix monitor mode oops
      aa2d3322
  2. 30 5月, 2007 34 次提交
  3. 29 5月, 2007 2 次提交