1. 14 Mar, 2004 13 commits
    • Linus Torvalds's avatar
      Merge http://nfsclient.bkbits.net/linux-2.5 · da5ca9a5
      Linus Torvalds authored
      into ppc970.osdl.org:/home/torvalds/v2.5/linux
      da5ca9a5
    • Trond Myklebust's avatar
      Merge http://nfsclient.bkbits.net/linux-2.5 · aeb08fc0
      Trond Myklebust authored
      into fys.uio.no:/home/linux/bitkeeper/nfsclient-2.5
      aeb08fc0
    • James Bottomley's avatar
      [PATCH] Fix voyager to boot again · 157cc3ee
      James Bottomley authored
      The very early memory detection patch broke voyager.
      
      This fixes it again.
      157cc3ee
    • Andrew Morton's avatar
      [PATCH] __kill_pg_info() return value fix · 46385763
      Andrew Morton authored
      Fix a bug which was spotted by Alex Lyashkov <shadow@psoft.net>
      
      The fairly unobvious coding in __kill_pg_info() will cause a zero value to be
      incorrectly returned if the second or succeeding call to
      group_send_sig_info() returns an error.
      46385763
    • Andrew Morton's avatar
      [PATCH] s390: update for altered page_state structure · 51fb5c51
      Andrew Morton authored
      From: Olaf Hering <olh@suse.de>
      
      This patch is needed on s390.
      51fb5c51
    • Andrew Morton's avatar
      [PATCH] move consistent_dma_mask to the generic device · a0729eb4
      Andrew Morton authored
      From: James Bottomley <James.Bottomley@SteelEye.com>
      
      pci_dev.consistent_dma_mask was introduced to get around problems in the
      IA64 Altix machine.
      
      Now, we have a use for it in x86: the aacraid needs coherent memory in a
      31 bit address range (2GB).  Unfortunately, x86 is converted to the dma
      model, so it can't see the pci_dev by the time coherent memory is
      allocated.
      
      The solution to all of this is to move pci_dev.consistent_dma_mask to
      dev.coherent_dma_mask and make x86 use it in the dma_alloc_coherent()
      calls.
      
      This should allow me to make the aacraid set the coherent mask instead
      of using it's current dma_mask juggling.
      a0729eb4
    • Matthew Wilcox's avatar
      [PATCH] PA-RISC update · fa9fcf5f
      Matthew Wilcox authored
      Updates for 2.6.4 for PARISC:
      
       - defconfigs (Randolph Chung)
       - copyright updates (Grant Grundler)
       - Fix DOS hole in sys_clone (James Bottomley)
       - missing hardware ID (Andy Walker)
       - disable interrupts during cache-flushes (LaMont Jones)
       - Fix crash on machines with <256MB ram (Randolph Chung)
       - Make SuckyIO IDE work better (Randolph Chung)
       - Align data_start so the extable is writable (Randolph Chung)
       - Extensive rewrite of virtual merging code (James Bottomley)
       - Fix EISA, non-PCI module builds (Matthew Wilcox)
       - Fix Elroy PCI config space byte & word writes (Grant Grundler)
       - Eliminate a warning in parport_gsc (Helge Deller)
       - Fix endian problem with ide mmio macros (Randolph Chung)
       - Delete asm/keyboard.h (Matthew Wilcox)
       - Delete asm/md.h (Grant Grundler)
       - Eliminate a warning in ALSA harmony (Matthew Wilcox)
      fa9fcf5f
    • 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 25 commits
  3. 14 Mar, 2004 2 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