1. 11 Dec, 2007 33 commits
  2. 10 Dec, 2007 7 commits
    • Linus Torvalds's avatar
    • Linus Torvalds's avatar
      Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 · 437105f2
      Linus Torvalds authored
      * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
        [IA64] Fix iosapic interrupt delivery mode for CPE
        [IA64] kprobe: make kreturn probe handler stack unwind correct
        [IA64] operator priority fix in acpi_map_lsapic()
        [IA64] Add missing "space" to concatenated strings
        [IA64] make full use of macro efi_md_size
        [IA64] rename _bss to __bss_start
        [IA64] SGI Altix : fix bug in sn_io_late_init()
        [IA64] iosapic cleanup
        [IA64] signal : fix missing error checkings
        [IA64] export copy_page() to modules
        [IA64] don't assume that unwcheck.py is executable
        [IA64] increase .data.patch offset
      437105f2
    • Jarod Wilson's avatar
      firewire: OHCI 1.0 Isochronous Receive support · a186b4a6
      Jarod Wilson authored
      Third rendition of FireWire OHCI 1.0 Isochronous Receive support, using a
      zer-copy method similar to OHCI 1.1 which puts the IR data payload directly
      into the userspace buffer. The zero-copy implementation eliminates the
      video artifacts, audio popping, and buffer underrun problems seen with
      version 1 of this patch, as well as fixing a regression in OHCI 1.1 support
      introduced by version 2 of this patch.
      
      Successfully tested in OHCI 1.1 mode on the following chipsets:
      
      - NEC uPD72847 (rev 01), OHCI 1.1 (PCI)
      - Ti XIO2200(A) (rev 01), OHCI 1.1 (PCIe)
      - Ti TSB41AB2 (rev 01), OHCI 1.1 (PCI on SB Audigy)
      - Apple UniNorth 2 (rev 81), OHCI 1.1 (PowerBook G4 onboard)
      
      Successfully tested in OHCI 1.0 mode on the following chipsets:
      
      - Agere FW323 (rev 06), OHCI 1.0 (Mac Mini onboard)
      - Agere FW323 (rev 06), OHCI 1.0 (PCI)
      - Via VT6306 (rev 46), OHCI 1.0 (PCI)
      - NEC OrangeLink (rev 01), OHCI 1.0 (PCI)
      - NEC uPD72847 (rev 01), OHCI 1.1 (PCI)
      - Ti XIO2200(A) (rev 01), OHCI 1.1 (PCIe)
      
      The bulk of testing was done in an x86_64 system, but was also successfully
      sanity-tested on other systems, including a PPC(32) PowerBook G4 and an i686
      EPIA M10k. Crude benchmarking (watching top during capture) puts the cpu
      utilization during capture on the EPIA's 1GHz Via C3 processor around 13%,
      which is down from 30% with the v1 code.
      
      Some implementation details:
      
      To maintain the same userspace API as dual-buffer mode, we set up two
      descriptors for every incoming packet. The first is an INPUT_MORE descriptor,
      pointing to a buffer large enough to hold just the packet's iso headers,
      immediately followed by an INPUT_LAST descriptor, pointing to a chunk of the
      userspace buffer big enough for the packet's data payload. With this setup,
      each incoming packet fills in these two descriptors in a manner that very
      closely emulates dual-buffer receive, to the point where the bulk of the
      handle_ir_* code is now identical between the two (and probably primed for
      some restructuring to share code between them).
      
      The only caveat I have at the moment is that neither of my OHCI 1.0 Via
      VT6307-based FireWire controllers work particularly well with this code
      for reasons I have yet to figure out.
      Signed-off-by: default avatarJarod Wilson <jwilson@redhat.com>
      Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
      a186b4a6
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6 · 41f81e88
      Linus Torvalds authored
      * 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6:
        [XFS] Fix xfs_ichgtime()s broken usage of I_SYNC
        [XFS] Make xfsbufd threads freezable
        [XFS] revert to double-buffering readdir
        [XFS] Fix broken inode cluster setup.
        [XFS] Clear XBF_READ_AHEAD flag on I/O completion.
        [XFS] Fixed a few bugs in xfs_buf_associate_memory()
        [XFS] 971064 Various fixups for xfs_bulkstat().
        [XFS] Fix dbflush panic in xfs_qm_sync.
      41f81e88
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/fix-kbuild · dc3d532a
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/sam/fix-kbuild:
        kbuild: fix building with O=.. options
        kbuild: fix building with redirected output.
      dc3d532a
    • Linus Torvalds's avatar
      Revert "PCI: fix IDE legacy mode resources" · af1bff4f
      Linus Torvalds authored
      This reverts commit fd6e7321, which
      helped up things on MIPS, but was wrong for everything else.  As Ralf
      Baechle puts it:
      
        "It seems the whole MIPS resource managment is complicated enough (out
         of necessity) that only a few people actually grok it.  Ioports being
         actually memory mapped on MIPS only makes the confusion worse, sigh."
      Requested-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
      Acked-by: default avatarAlan Cox <alan@redhat.com>
      Acked-by: default avatarRalf Baechle <ralf@linux-mips.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      af1bff4f
    • Benjamin Herrenschmidt's avatar
      powerpc: Fix IDE legacy vs. native fixups · 6d98bda7
      Benjamin Herrenschmidt authored
      PowerMac and CHRP/BriQ platforms have quirks to switch some IDE
      controllers from legacy mode to fully native mode. Those quirks
      however will not work properly anymore due to a change to the
      generic code to better handle legacy IDE resources.
      
      This fixes it by moving those quirk to "early" quirks (so they
      run before resources are probed for the devices) and clearing
      all BARs after the conversion to force a reallocation of sane
      values.
      Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
      Acked-by: default avatarAlan Cox <alan@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      6d98bda7