1. 10 May, 2007 28 commits
  2. 09 May, 2007 12 commits
    • Alexey Dobriyan's avatar
      atl1: add netconsole support · 497f050c
      Alexey Dobriyan authored
      
      
      Copied from b44 driver, but it works:
      
      netconsole: device eth0 not up yet, forcing it
      atl1: eth0 link is up 100 Mbps full duplex
      netconsole: network logging started
      Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
      Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
      497f050c
    • Paul Walmsley's avatar
      Fix hang on IBM Token Ring PCMCIA card ejection · 5bebf82f
      Paul Walmsley authored
      
      
      Ejecting a PCMCIA IBM Token Ring card that has not had its dev->open()
      called will reliably trigger an uninitialized spinlock oops when
      spinlock debugging is enabled. The system then hangs, occasionally
      softlockup oopsing.  Apparently ibmtr.c:tok_interrupt() doesn't expect
      to be called before tok_open(), but tok_interrupt() gets called anyway
      when the card is ejected.  So, set an already-existing flag which
      causes tok_interrupt() to bail out early upon card ejection. Tested by
      inserting and removing the PCMCIA card several times.
      Signed-off-by: default avatarPaul Walmsley <paul@booyaka.com>
      Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
      5bebf82f
    • Stephen Hemminger's avatar
      skge: default WOL should be magic only (rev2) · 5b982c5b
      Stephen Hemminger authored
      
      
      By default, the skge driver now enables wake on magic and wake on PHY.
      This is a bad default (bug), wake on PHY means machine will never shutdown
      if connected to a switch.
      
      Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>a
      Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
      5b982c5b
    • Jeff Garzik's avatar
      Merge branch 'upstream' of... · 2c4f365a
      Jeff Garzik authored
      Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream
      2c4f365a
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6 · 3cb7396b
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6:
        ide: fix PIO setup on resume for ATAPI devices
        ide: legacy PCI bus order probing fixes
        ide: add ide_proc_register_port()
        ide: add "initializing" argument to ide_register_hw()
        ide: cable detection fixes (take 2)
        ide: move IDE settings handling to ide-proc.c
        ide: split off ioctl handling from IDE settings (v2)
        ide: make /proc/ide/ optional
        ide: add ide_tune_dma() helper
        ide: rework the code for selecting the best DMA transfer mode (v3)
        ide: fix UDMA/MWDMA/SWDMA masks (v3)
      3cb7396b
    • Linus Torvalds's avatar
      Merge git://git.linux-nfs.org/pub/linux/nfs-2.6 · d0b6e0e3
      Linus Torvalds authored
      * git://git.linux-nfs.org/pub/linux/nfs-2.6:
        NFS: Kill the obsolete NFS_PARANOIA
        NFS: use __set_current_state()
        sunrpc: fix crash in rpc_malloc()
        NFS: Clean up NFSv4 XDR error message
        NFS: NFS client underestimates how large an NFSv4 SETATTR reply can be
        SUNRPC: Fix pointer arithmetic bug recently introduced in rpc_malloc/free
        NFS: Remove redundant check in nfs_check_verifier()
        NFS: Fix a jiffie wraparound issue
      d0b6e0e3
    • Bartlomiej Zolnierkiewicz's avatar
      ide: fix PIO setup on resume for ATAPI devices · 317a46a2
      Bartlomiej Zolnierkiewicz authored
      
      
      PIO should be restored also for ATAPI devices during resume, fix it.
      Signed-off-by: Bartlomiej Zolnierkiewicz's avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      317a46a2
    • Bartlomiej Zolnierkiewicz's avatar
      ide: legacy PCI bus order probing fixes · 6d208b39
      Bartlomiej Zolnierkiewicz authored
      
      
      IDE PCI host drivers should register themselves with IDE core only when
      IDE driver is built-in, otherwise (IDE driver is modular and thus IDE PCI
      host drivers are also modular) the code has no effect and just complicates
      the probing.
      
      Fix it by adding new config option CONFIG_IDEPCI_PCIBUS (defined only when
      needed and invisible to the user) and covering by #ifdef/#endif the code
      in question.  It turned out that "ide=reverse" was silently accepted but did
      nothing in case when IDE driver was modular, this is fixed now.
      Signed-off-by: Bartlomiej Zolnierkiewicz's avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      6d208b39
    • Bartlomiej Zolnierkiewicz's avatar
      ide: add ide_proc_register_port() · 5cbf79cd
      Bartlomiej Zolnierkiewicz authored
      
      
      * create_proc_ide_interfaces() tries to add /proc entries for every probed
        and initialized IDE port, replace it by ide_proc_register_port() which does
        it only for the given port (also rename destroy_proc_ide_interface() to
        ide_proc_unregister_port() for consistency)
        
      * convert {create,destroy}_proc_ide_interface[s]() users to use new functions
      
      * pmac driver depended on proc_ide_create() to add /proc port entries, fix it
        
      * au1xxx-ide, swarm and cs5520 drivers depended indirectly on ide-generic
        driver (CONFIG_IDE_GENERIC=y) to add port /proc entries, fix them
      
      * there is now no need to add /proc entries for IDE ports in proc_ide_create()
        so don't do it
      
      * proc_ide_create() needs now to be called before drivers are probed - fix it,
        while at it make proc_ide_create() create /proc "ide" directory
      Signed-off-by: Bartlomiej Zolnierkiewicz's avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      5cbf79cd
    • Bartlomiej Zolnierkiewicz's avatar
      ide: add "initializing" argument to ide_register_hw() · 869c56ee
      Bartlomiej Zolnierkiewicz authored
      
      
      Add "initializing" argument to ide_register_hw() and use it instead of ide.c
      wide variable of the same name.  Update all users of ide_register_hw()
      accordingly.
      Signed-off-by: Bartlomiej Zolnierkiewicz's avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      869c56ee
    • Bartlomiej Zolnierkiewicz's avatar
      ide: cable detection fixes (take 2) · 7f8f48af
      Bartlomiej Zolnierkiewicz authored
      
      
      Tejun's recent eighty_ninty_three() fix has inspired me to do more thorough
      review of the cable detection code...
      
      * print user-friendly warning about limiting the maximum transfer speed
        to UDMA33 (and the reason behind it) when 80-wire cable is not detected,
        also while at it cleanup eighty_ninty_three() a bit
      
      * use eighty_ninty_three() in ide_ata66_check(), this actually fixes 3 bugs:
        - bit 14 (word 93 validity check) == 1 && bit 13 (80-wire cable test) == 1
          were used as 80-wire cable present test for CONFIG_IDEDMA_IVB=n case
          (please see FIXME comment in eighty_ninty_three() for more details)
        - CONFIG_IDEDMA_IVB=y/n cases were interchanged
        - check for SATA devices was missing
      
      * remove private cable warnings from pdc_202xx{old,new} drivers now that core
        code provides this functionality (plus, in pdc202xx_new case the test could
        give false warnings for ATAPI devices because pdc202xx_new driver doesn't
        even support ATAPI DMA)
      
      Cc: Tejun Heo <htejun@gmail.com>
      Signed-off-by: Bartlomiej Zolnierkiewicz's avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      7f8f48af
    • Bartlomiej Zolnierkiewicz's avatar
      ide: move IDE settings handling to ide-proc.c · 7662d046
      Bartlomiej Zolnierkiewicz authored
      
      
      * move
      	__ide_add_setting()
      	ide_add_setting()
      	__ide_remove_setting()
      	auto_remove_settings()
      	ide_find_setting_by_name()
      	ide_read_setting()
      	ide_write_setting()
      	set_xfer_rate()
      	ide_add_generic_settings()
      	ide_register_subdriver()
      	ide_unregister_subdriver()
      
        from ide.c to ide-proc.c
      
      * set_{io_32bit,pio_mode,using_dma}() cannot be marked static now, fix it
      
      * rename ide_[un]register_subdriver() to ide_proc_[un]register_driver(),
        update device drivers to use new names
      
      * add CONFIG_IDE_PROC_FS=n versions of ide_proc_[un]register_driver()
        and ide_add_generic_settings()
      
      * make ide_find_setting_by_name(), ide_{read,write}_setting()
        and ide_{add,remove}_proc_entries() static
      
      * cover IDE settings code in device drivers with CONFIG_IDE_PROC_FS #ifdef,
        also while at it cover with CONFIG_IDE_PROC_FS #ifdef ide_driver_t.proc
      
      * remove bogus comment from ide.h
      
      * cover with CONFIG_IDE_PROC_FS #ifdef .proc and .settings in ide_drive_t
      
      Besides saner code this patch results in the IDE core smaller by ~2 kB
      (on x86-32) and IDE disk driver by ~1 kB (ditto) when CONFIG_IDE_PROC_FS=n.
      Signed-off-by: Bartlomiej Zolnierkiewicz's avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      7662d046