1. 14 3月, 2007 2 次提交
  2. 10 3月, 2007 20 次提交
    • L
      Merge branch 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc · a967e127
      Linus Torvalds 提交于
      * 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc:
        [POWERPC] 85xx: Enable CONFIG_SERIAL_8250_SHARE_IRQ
        [POWERPC] Select u-image as default image for Linkstation
        [POWERPC] 83xx: Minor fixes for 834x_mds USB setup code
        [POWERPC] Fix warning in powermac pci.c
        [POWERPC] Fix warning in powermac feature.c
        [POWERPC] Fix warning in prom_parse.c of_irq_map_oldworld()
        [POWERPC] Celleb: bug fix caused by not casting pointer types
        [POWERPC] Add missing newline in xmon help output
        [POWERPC] No DEEPNAP on 970MP 1.0
      a967e127
    • R
      [MIPS] Sibyte: Fix ZBbus profiler · bb9b813b
      Ralf Baechle 提交于
       o Fix build error.
       o Handle error returns.
       o Deal with signals received while sleeping.
       o Don't allow to be selected when we're not building the directory with
         the driver anyway.
       o Coding style cleanups.
      Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      bb9b813b
    • R
    • L
      Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus · 30fbc9f7
      Linus Torvalds 提交于
      * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
        [MIPS] DEC: Remove call to register_prom_console.
      30fbc9f7
    • L
      Merge git://git.infradead.org/mtd-2.6 · 6e96783f
      Linus Torvalds 提交于
      * git://git.infradead.org/mtd-2.6:
        [JFFS2] print a message when marking bad block
        [JFFS2] Check for all-zero node headers
        [MTD] [OneNAND] Classify the page data and oob buffer
        [MTD] [OneNAND] Exit the loop when transferring/filling of the oob is finished
        [MTD] [OneNAND] add Nokia Copyright and a credit
        [MTD] [OneNAND] Fix typo & wrong comments
        [MTD] [OneNAND] Use oob buffer instead of main one in oob functions
        [MTD] Correct partition failed erase address
        [JFFS2] Use yield() between GC passes in background thread.
        [MTD] [NAND] Correct misspelled preprocessor variable.
        [MTD] [MAPS] dilnetpc: Fix printk warning
        [MTD] [NOR] Fix oops in cfi_amdstd_sync
        [MTD] ESB2 check for closed ROM window
        [JFFS2] Fix writebuffer recovery in the first page of a block
        [MTD] [NAND] make oobavail public
      6e96783f
    • L
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 · 8466c833
      Linus Torvalds 提交于
      * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
        ibmtr: Drain rich supply of modpost warnings.
        3c59x: Fix several modpost warnings
        z85230: Fix FIFO handling
        r8169: fix a race between PCI probe and dev_open
        r8169: revert bogus BMCR reset
        sky2: turn off Rx checksum on bad hardware
        mv643xx: Clear pending interrupts before calling request_irq
        myri10ge: add a wc_enabled flag to myri10ge_priv
        myri10ge: prevent 4k rdma on SGI TIOCE chipset
        myri10ge: use pci_map_page to prepare the dmatest buffer
        myri10ge: fix error checking and return value in myri10ge_allocate_rings
        netxen: fix warnings
        via-rhine: set avoid_D3 for broken BIOSes
        [PATCH] bcm43xx: Fix assertion failures in interrupt handler
        [PATCH] bcm43xx: Fix bug in frequency to channel conversion
        [PATCH] bcm43xx: Fix errors in specs to code translation in B6PHY init
      8466c833
    • J
      Merge branch 'upstream-fixes' of... · 0a38f544
      Jeff Garzik 提交于
      Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes
      0a38f544
    • R
      ibmtr: Drain rich supply of modpost warnings. · 82c00b62
      Ralf Baechle 提交于
      Building ibmtr as a module produces a spectacular pile of modpost warnings:
      
      WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.text:ibmtr_probe1 from .text between 'ibmtr_probe_card' (at offset 0x450) and 'ibmtr_reset_timer'
      WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.text:ibmtr_probe1 from .text between 'ibmtr_probe_card' (at offset 0x454) and 'ibmtr_reset_timer'
      WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.text:ibmtr_probe1 from .text between 'ibmtr_probe_card' (at offset 0x458) and 'ibmtr_reset_timer'
      WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.text:ibmtr_probe1 from .text between 'ibmtr_probe_card' (at offset 0x45c) and 'ibmtr_reset_timer'
      WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.data:ibmtr_portlist from .text between 'ibmtr_probe_card' (at offset 0x4e8) and 'ibmtr_reset_timer'
      WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.data:ibmtr_portlist from .text between 'ibmtr_probe_card' (at offset 0x4ec) and 'ibmtr_reset_timer'
      WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.data:ibmtr_portlist from .text between 'ibmtr_probe_card' (at offset 0x4f0) and 'ibmtr_reset_timer'
      WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.data:ibmtr_portlist from .text between 'ibmtr_probe_card' (at offset 0x4f4) and 'ibmtr_reset_timer'
      WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.text:find_turbo_adapters from .text between 'ibmtr_probe_card' (at offset 0x500) and 'ibmtr_reset_timer'
      WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.text:find_turbo_adapters from .text between 'ibmtr_probe_card' (at offset 0x504) and 'ibmtr_reset_timer'
      WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.text:find_turbo_adapters from .text between 'ibmtr_probe_card' (at offset 0x508) and 'ibmtr_reset_timer'
      WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.text:find_turbo_adapters from .text between 'ibmtr_probe_card' (at offset 0x50c) and 'ibmtr_reset_timer'
      WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.data:ibmtr_portlist from .text between 'ibmtr_probe_card' (at offset 0x520) and 'ibmtr_reset_timer'
      WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.data:ibmtr_portlist from .text between 'ibmtr_probe_card' (at offset 0x524) and 'ibmtr_reset_timer'
      WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.data:ibmtr_portlist from .text between 'ibmtr_probe_card' (at offset 0x528) and 'ibmtr_reset_timer'
      WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.data:ibmtr_portlist from .text between 'ibmtr_probe_card' (at offset 0x534) and 'ibmtr_reset_timer'
      WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.data: from .text between 'ibmtr_probe_card' (at offset 0x540) and 'ibmtr_reset_timer'
      WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.data: from .text between 'ibmtr_probe_card' (at offset 0x544) and 'ibmtr_reset_timer'
      WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.data: from .text between 'ibmtr_probe_card' (at offset 0x548) and 'ibmtr_reset_timer'
      WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.data: from .text between 'ibmtr_probe_card' (at offset 0x54c) and 'ibmtr_reset_timer'
      WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.text:ibmtr_probe1 from .text between 'ibmtr_probe_card' (at offset 0x558) and 'ibmtr_reset_timer'
      WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.text:ibmtr_probe1 from .text between 'ibmtr_probe_card' (at offset 0x55c) and 'ibmtr_reset_timer'
      WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.text:ibmtr_probe1 from .text between 'ibmtr_probe_card' (at offset 0x560) and 'ibmtr_reset_timer'
      WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.text:ibmtr_probe1 from .text between 'ibmtr_probe_card' (at offset 0x564) and 'ibmtr_reset_timer'
      
      Fix by making ibmtr_probe an __init function.
      
      While at it, move move ibmtr_probe_card below ibmtr_probe so the protoype
      for ibmtr_probe can be deleted.
      Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      
       drivers/net/tokenring/ibmtr.c |   25 ++++++++++++-------------
       1 file changed, 12 insertions(+), 13 deletions(-)
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      82c00b62
    • R
      3c59x: Fix several modpost warnings · 95c408a9
      Ralf Baechle 提交于
      WARNING: drivers/net/3c59x.o - Section mismatch: reference to .init.text: from .text between 'vortex_eisa_probe' (at offset 0x4580) and 'vortex_eisa_remove'
      WARNING: drivers/net/3c59x.o - Section mismatch: reference to .init.text: from .text between 'vortex_eisa_probe' (at offset 0x4584) and 'vortex_eisa_remove'
      WARNING: drivers/net/3c59x.o - Section mismatch: reference to .init.text: from .text between 'vortex_eisa_probe' (at offset 0x4588) and 'vortex_eisa_remove'
      WARNING: drivers/net/3c59x.o - Section mismatch: reference to .init.text: from .text between 'vortex_eisa_probe' (at offset 0x458c) and 'vortex_eisa_remove'
      
      Fixed by:
      
       o move definition of vortex_eisa_driver below the functions it references.
       o remove now unnecessary prototypes for vortex_eisa_probe and
         vortex_eisa_remove.
       o Make vortex_eisa_probe an __init function.
       o Make vortex_eisa_remove a __devexit function.
       o Wrap vortex_eisa_driver reference to vortex_eisa_remove with
         __devexit_p().
      Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      
       drivers/net/3c59x.c |   28 +++++++++++++---------------
       1 file changed, 13 insertions(+), 15 deletions(-)
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      95c408a9
    • A
      z85230: Fix FIFO handling · fe797455
      Alan Cox 提交于
      We must exit immediately on a FIFO fill not take the end of packet path
      otherwise each underrun in PIO transmit mode causes a runt packet and the
      data is lost.
      Signed-off-by: NAlan Cox <alan@redhat.com>
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      fe797455
    • F
      r8169: fix a race between PCI probe and dev_open · 2efa53f3
      Francois Romieu 提交于
      Initialize the timer with the rest of the private-struct.
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      Signed-off-by: NFrancois Romieu <romieu@fr.zoreil.com>
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      2efa53f3
    • F
      r8169: revert bogus BMCR reset · 9e0db8ef
      Francois Romieu 提交于
      Added during bf793295
      
      The current code requests a reset but prohibits autoneg, 1000 Mb/s,
      100 Mb/s and full duplex. The 8168 does not like it at all.
      Signed-off-by: NFrancois Romieu <romieu@fr.zoreil.com>
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      9e0db8ef
    • S
      sky2: turn off Rx checksum on bad hardware · 87418307
      Stephen Hemminger 提交于
      On Yukon FE, occasional hardware receive checksum errors are seen.
      An early indication of the problem is single bit differences in the two
      checksum engines.  Use this as a detection mechanism to turn off Rx
      checksumming.
      Signed-off-by: NStephen Hemminger <shemminger@linux-foundation.org>
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      87418307
    • D
    • B
      myri10ge: add a wc_enabled flag to myri10ge_priv · 276e26c3
      Brice Goglin 提交于
      Add a wc_enabled flag in the myri10ge_priv instead of relying
      on mtrr >= 0.
      Signed-off-by: NBrice Goglin <brice@myri.com>
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      276e26c3
    • B
      myri10ge: prevent 4k rdma on SGI TIOCE chipset · 4c882dd8
      Brice Goglin 提交于
      Do not use 4k rdma request on SGI TIOCE chipset since this
      bridge does not support it.
      Signed-off-by: NBrice Goglin <brice@myri.com>
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      4c882dd8
    • B
      myri10ge: use pci_map_page to prepare the dmatest buffer · 34fdccea
      Brice Goglin 提交于
      Allocate a specific page and use pci_map_page for dma test instead
      of relying on another existing buffer.
      Signed-off-by: NBrice Goglin <brice@myri.com>
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      34fdccea
    • B
      myri10ge: fix error checking and return value in myri10ge_allocate_rings · 355c7265
      Brice Goglin 提交于
      Fix a missing error check in myri10ge_allocate_rings() and set status
      to -ENOMEM before all actual allocations so that the error path returns
      what it should.
      Signed-off-by: NBrice Goglin <brice@myri.com>
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      355c7265
    • R
      netxen: fix warnings · b8d095d7
      Ralf Baechle 提交于
        CC [M]  drivers/net/netxen/netxen_nic_hw.o
      drivers/net/netxen/netxen_nic_hw.c: In function 'netxen_nic_hw_resources':
      drivers/net/netxen/netxen_nic_hw.c:231: warning: format '%llx' expects type 'long long unsigned int', but argument 2 has type 'dma_addr_t'
      drivers/net/netxen/netxen_nic_hw.c:250: warning: format '%llx' expects type 'long long unsigned int', but argument 2 has type 'dma_addr_t'
      
      u64 is unsigned long so the cast to u64 will result in a warning on the
      printf arguments for 64-bit builds.  So cast to unsigned long long instead.
      Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      b8d095d7
    • R
      via-rhine: set avoid_D3 for broken BIOSes · e84df485
      Roger Luethi 提交于
      This patch sets avoid_D3 for BIOSes known to be broken. Said BIOSes fail
      at PXE boot if the chip is in power state D3.
      Signed-off-by: NRoger Luethi <rl@hellgate.ch>
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      e84df485
  3. 09 3月, 2007 18 次提交