1. 14 Mar, 2004 19 commits
    • Keith M. Wesolowski's avatar
      Merge ssh://kernel.bkbits.net/sparc32-2.6 · 3c2dac15
      Keith M. Wesolowski authored
      into foobazco.org:/sources/2.5-sparc-smp
      3c2dac15
    • Keith M. Wesolowski's avatar
      Merge foobazco.org:/sources/2.5-bk · 60ccf05c
      Keith M. Wesolowski authored
      into foobazco.org:/sources/2.5-sparc-smp
      60ccf05c
    • Keith M. Wesolowski's avatar
      Merge kernel.bkbits.net:/home/repos/linux-2.5 · 91211cd2
      Keith M. Wesolowski authored
      into kernel.bkbits.net:/home/wesolows/sparc32-2.6
      91211cd2
    • Keith M. Wesolowski's avatar
    • Keith M. Wesolowski's avatar
      Merge foobazco.org:/sources/2.5-bk · e55b1c86
      Keith M. Wesolowski authored
      into foobazco.org:/sources/2.5-sparc-smp
      e55b1c86
    • Keith M. Wesolowski's avatar
      [SPARC32]: Rework the CPU enumeration and probing code · fb5ba71d
      Keith M. Wesolowski authored
      The low 2 bits of the MID are now used exclusively as the software
      CPU ID on 4m.  This eliminates entirely the need for mid_xlate.  We
      also eliminate linux_num_cpus and linux_cpus; since the hardware-based
      id is now used everywhere we don't need indexed CPU tables.
      
      The device probe is almost identical to sparc64's version.  The one
      exception is that 4m only uses the bottom 2 bits of the MID, so we also
      have a separate function to get the true hardware MID for the rare times
      it's actually needed.
      
      Per-cpu data is now used the same way as in sparc64.  As a side benefit
      we now display the same format Bogo and Clock values in /proc/cpuinfo.
      fb5ba71d
    • 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 21 commits