1. 14 Mar, 2004 6 commits
    • Linus Torvalds's avatar
      Merge http://linux-sound.bkbits.net/linux-sound · 1e04a796
      Linus Torvalds authored
      into ppc970.osdl.org:/home/torvalds/v2.5/linux
      1e04a796
    • Linus Torvalds's avatar
      Merge bk://linux-acpi.bkbits.net/linux-acpi-release-2.6.5 · 47b6ac1d
      Linus Torvalds authored
      into ppc970.osdl.org:/home/torvalds/v2.5/linux
      47b6ac1d
    • Linus Torvalds's avatar
      Merge bk://linux-scsi.bkbits.net/scsi-for-linus-2.6 · 180cc17d
      Linus Torvalds authored
      into ppc970.osdl.org:/home/torvalds/v2.5/linux
      180cc17d
    • Andrew Morton's avatar
      [PATCH] gcc-3.5 libata build fix · 265395f4
      Andrew Morton authored
      drivers/scsi/sata_vsc.c: In function `vsc_sata_interrupt':
      include/linux/libata.h:414: sorry, unimplemented: inlining failed in call to 'ata_host_intr': function body not available
      drivers/scsi/sata_vsc.c:187: sorry, unimplemented: called from here
      265395f4
    • Andrew Morton's avatar
      [PATCH] module unload deadlock fix · 3e4ea6c8
      Andrew Morton authored
      From: Rusty Russell <rusty@rustcorp.com.au>
      
      From: Andrea Arcangeli <andrea@suse.de>
      
      We should drop module sem before calling mod->exit, for practical reasons:
      too many module exit functions oops or hang, resulting in a permenantly held
      module sem, which blocks all module ops including lsmod.
      3e4ea6c8
    • Andrew Morton's avatar
      [PATCH] DMA: Fill gaping hole in DMA API interfaces. · 66b99421
      Andrew Morton authored
      From: "David S. Miller" <davem@redhat.com>
      
      Currently, for an existing DMA mapping, there is a way to transfer buffer
      ownership back to the cpu, yet there is no way to give it back to the device
      again explicitly.  The latter really is needed on platforms where the PCI
      subsystem does not snoop the cpu caches, MIPS is one example.
      
      Many drivers were expecting the existing DMA sync interface to handle both
      directions, which was wrong.
      
      Now, with this change, we have explicit interfaces for DMA syncing to/from
      the device and the cpu.
      66b99421
  2. 13 Mar, 2004 31 commits
  3. 14 Mar, 2004 3 commits
    • Wim Van Sebroeck's avatar
      [WATCHDOG] v2.6.4 notifier_block-patches · 9e533ec6
      Wim Van Sebroeck authored
      Remove unnecessary initialization in notifier_block
      9e533ec6
    • Wim Van Sebroeck's avatar
      WATCHDOG] v2.6.4 wdt977-v0.03-patch · b52ce0ba
      Wim Van Sebroeck authored
      Version 0.03 of wdt977.c - Changes that were made are:
      * Extract the stop code in a seperate function (wdt977_stop)
      * Extract the start code in a seperate function (wdt977_start)
      * Rename kick_wdog to wdt977_keepalive for consistency
      * Extract the watchdog's status code to a seperate function (wdt977_get_status)
      * Change the way we deal with the watchdog timeout:
         Up till now we used timeoutM (in minutes) as the correct value and then
         calculated timeout as being timeoutM*60 or *timeoutM*120 (depending on
         wether or not we have the netwinder hardware bug).
      
         From now on timeout is the correct value and we calculate timeoutM out
         of it. Because of this we start with checking wether or not we have a
         correct timeout value (if not we reset it to the default value) and we
         automatically calculate timeoutM. Each time we change timeout with a
         correct timeout value, we recalculate timeoutM.
      * Extended ioctl code with WDIOC_SETOPTIONS and updated the watchdog_info structure
      * Added notifier support
      
      Code has been tested by Woody
      b52ce0ba
    • Wim Van Sebroeck's avatar
      [WATCHDOG] v2.6.4 pcwd_pci-v1.00_20040313-patch · 591095cb
      Wim Van Sebroeck authored
      Two small fixes:
      * Make cards_found a global variable so that if we remove the
        pci device we can count down.
      * If we can't find a correct I/O address for the card, then we
      should disable the card again.
      591095cb