1. 21 Jun, 2006 9 commits
    • David Mosberger-Tang's avatar
      [IA64] esi-support · 2ab561a1
      David Mosberger-Tang authored
      Add support for making ESI calls [1].  ESI stands for "Extensible SAL
      specification" and is basically a way for invoking firmware
      subroutines which are identified by a GUID.  I don't know whether ESI
      is used by vendors other than HP (if you do, please let me know) but
      as firmware "backdoors" go, this seems one of the cleaner methods, so
      it seems reasonable to support it, even though I'm not aware of any
      publicly documented ESI calls.  I'd have liked to make the ESI module
      completely stand-alone, but unfortunately that is not easily (or not
      at all) possible because in order to make ESI calls in physical mode,
      a small stub similar to the EFI stub is needed in the kernel proper.
      I did try to create a stub that would work in user-level, but it
      quickly got ugly beyond recognition (e.g., the stub had to make
      assumptions about how the module-loader generated call-stubs work) and
      I didn't even get it to work (that's probably fixable, but I didn't
      bother because I concluded it was too ugly anyhow).  While it's not
      terribly elegant to have kernel code which isn't actively used in the
      kernel proper, I think it might be worth making an exception here for
      two reasons: the code is trivially small (all that's really needed is
      esi_stub.S) and by including it in the normal kernel distro, it might
      encourage other OEMs to also use ESI, which I think would be far
      better than each inventing their own firmware "backdoor".
      
      The code was originally written by Alex.  I just massaged and packaged
      it a bit (and perhaps messed up some things along the way...).
      
      Changes since first version of patch that was posted to mailing list:
      * Export ia64_esi_call and ia64_esi_call_phys() as GPL symbols.
      * Disallow building esi.c as a module for now.  Building as a module
        would currently lead to an unresolved reference to "sal_lock" on SMP kernels
        because that symbol doesn't get exported.
      * Export esi_call_phys() only if ESI is enabled.
      * Remove internal stuff from esi.h and add a "proc_type" argument to
        ia64_esi_call() such that serialization-requirements can be expressed (ESI
        follows SAL here, where procedure calls may have to be serialized, are
        MP-safe, or MP-safe andr reentrant).
      
      [1] h21007.www2.hp.com/dspp/tech/tech_TechDocumentDetailPage_IDX/1,1701,919,00.html
      Signed-off-by: default avatarDavid Mosberger <David.Mosberger@acm.org>
      Signed-off-by: default avatarAlex Williamson <alex.williamson@hp.com>
      Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
      2ab561a1
    • Brice Goglin's avatar
      [PATCH] add __iowrite64_copy · 22ae813b
      Brice Goglin authored
      Introduce __iowrite64_copy.  It will be used by the Myri-10G Ethernet
      driver to post requests to the NIC.  This driver will be submitted soon.
      
      __iowrite64_copy copies to I/O memory in units of 64 bits when possible (on
      64 bit architectures).  It reverts to __iowrite32_copy on 32 bit
      architectures.
      Signed-off-by: default avatarBrice Goglin <brice@myri.com>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      22ae813b
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/bcollins/linux1394-2.6 · 34641a58
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/bcollins/linux1394-2.6: (28 commits)
        eth1394: replace __constant_htons by htons
        ieee1394: adjust code formatting in highlevel.c
        ieee1394: hl_irqs_lock is taken in hardware interrupt context
        ieee1394_core: switch to kthread API
        ieee1394: sbp2: Kconfig fix
        ieee1394: add preprocessor constant for invalid csr address
        sbp2: fix deregistration of status fifo address space
        [PATCH] eth1394: endian fixes
        Fix broken suspend/resume in ohci1394
        sbp2: use __attribute__((packed)) for on-the-wire structures
        sbp2: provide helptext for CONFIG_IEEE1394_SBP2_PHYS_DMA and mark it experimental
        Update feature removal of obsolete raw1394 ISO requests.
        sbp2: fix S800 transfers if phys_dma is off
        sbp2: remove ohci1394 specific constant
        ohci1394: make phys_dma parameter read-only
        ohci1394: set address range properties
        ieee1394: extend lowlevel API for address range properties
        sbp2: log number of supported concurrent logins
        sbp2: remove manipulation of inquiry response
        ieee1394: save RAM by using a single tlabel for broadcast transactions
        ...
      34641a58
    • Cedric Le Goater's avatar
      [PATCH] s390: add __raw_writeq required by __iowrite64_copy · 2eec0e08
      Cedric Le Goater authored
      It also adds all the related quad routines.
      Signed-off-by: default avatarCedric Le Goater <clg@fr.ibm.com>
      Acked-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
      Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      2eec0e08
    • Linus Torvalds's avatar
      Fix up CFQ scheduler for recent rbtree node shrinkage · 6b41fd17
      Linus Torvalds authored
      The color is now in the low bits of the parent pointer, and initializing
      it to 0 happens as part of the whole memset above, so just remove the
      unnecessary RB_CLEAR_COLOR.
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      6b41fd17
    • Herbert Xu's avatar
      [FORCEDETH] Fix xmit_lock/netif_tx_lock after merge · 58dfd9c1
      Herbert Xu authored
      There has been an update to the forcedeth driver that added a few new
      uses of xmit_lock which is no longer meant to be used directly.  This
      patch replaces them with netif_tx_lock_bh.
      Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      58dfd9c1
    • Linus Torvalds's avatar
      Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm · 050335db
      Linus Torvalds authored
      * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (42 commits)
        [ARM] Fix tosa build error
        [ARM] 3610/1: Make reboot work on Versatile
        [ARM] 3609/1: S3C24XX: defconfig update for s3c2410_defconfig
        [ARM] 3591/1: Anubis: IDE device definitions
        [ARM] Include asm/hardware.h not asm/arch/hardware.h
        [ARM] 3594/1: Poodle: Add touchscreen support + other updates
        [ARM] 3564/1: sharpsl_pm: Abstract some machine specific parameters
        [ARM] 3561/1: Poodle: Correct the MMC/SD power control
        [ARM] 3593/1: Add reboot and shutdown handlers for Zaurus handhelds
        [ARM] 3599/1: AT91RM9200 remove global variables
        [ARM] 3607/1: AT91RM9200 misc fixes
        [ARM] 3605/1: AT91RM9200 Power Management
        [ARM] 3604/1: AT91RM9200 New boards
        [ARM] 3603/1: AT91RM9200 remove old files
        [ARM] 3592/1: AT91RM9200 Serial driver update
        [ARM] 3590/1: AT91RM9200 Platform devices support
        [ARM] 3589/1: AT91RM9200 DK/EK board update
        [ARM] 3588/1: AT91RM9200 CSB337/637 board update
        [ARM] 3587/1: AT91RM9200 hardware headers
        [ARM] 3586/1: AT91RM9200 header update
        ...
      050335db
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · a4cfae13
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
        [ATM]: fix broken uses of NIPQUAD in net/atm
        [SCTP]: sctp_unpack_cookie() fix
        [SCTP]: Fix unintentional change to SCTP_ASSERT when !SCTP_DEBUG
        [NET]: Prevent multiple qdisc runs
        [CONNECTOR]: Initialize subsystem earlier.
        [NETFILTER]: xt_sctp: fix endless loop caused by 0 chunk length
      a4cfae13
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 · be883da7
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
        [SPARC64]: Update defconfig.
        [SPARC64]: Don't double-export synchronize_irq.
        [SPARC64]: Move over to GENERIC_HARDIRQS.
        [SPARC64]: Virtualize IRQ numbers.
        [SPARC64]: Kill ino_bucket->pil
        [SPARC]: Kill __irq_itoa().
        [SPARC64]: bp->pil can never be zero
        [SPARC64]: Send all device interrupts via one PIL.
        [SPARC]: Fix iommu_flush_iotlb end address
        [SPARC]: Mark smp init functions as cpuinit
        [SPARC]: Add missing rw can_lock macros
        [SPARC]: Setup cpu_possible_map
        [SPARC]: Add topology_init()
      be883da7
  2. 20 Jun, 2006 31 commits