1. 22 6月, 2006 29 次提交
  2. 21 6月, 2006 11 次提交
    • B
      [PATCH] add __iowrite64_copy · 22ae813b
      Brice Goglin 提交于
      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: NBrice Goglin <brice@myri.com>
      Signed-off-by: NAndrew Morton <akpm@osdl.org>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      22ae813b
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/bcollins/linux1394-2.6 · 34641a58
      Linus Torvalds 提交于
      * 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
    • C
      [PATCH] s390: add __raw_writeq required by __iowrite64_copy · 2eec0e08
      Cedric Le Goater 提交于
      It also adds all the related quad routines.
      Signed-off-by: NCedric Le Goater <clg@fr.ibm.com>
      Acked-by: NHeiko Carstens <heiko.carstens@de.ibm.com>
      Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
      Signed-off-by: NAndrew Morton <akpm@osdl.org>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      2eec0e08
    • L
      Fix up CFQ scheduler for recent rbtree node shrinkage · 6b41fd17
      Linus Torvalds 提交于
      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: NLinus Torvalds <torvalds@osdl.org>
      6b41fd17
    • H
      [FORCEDETH] Fix xmit_lock/netif_tx_lock after merge · 58dfd9c1
      Herbert Xu 提交于
      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: NHerbert Xu <herbert@gondor.apana.org.au>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      58dfd9c1
    • L
      Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm · 050335db
      Linus Torvalds 提交于
      * '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
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · a4cfae13
      Linus Torvalds 提交于
      * 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
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 · be883da7
      Linus Torvalds 提交于
      * 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
    • L
      Merge branch 'rio.b19' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/bird · 077e9894
      Linus Torvalds 提交于
      * 'rio.b19' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/bird:
        [PATCH] missing readb/readw in rio
        [PATCH] copy_to_user() from iomem is a bad thing
        [PATCH] forgotten swap of copyout() arguments
        [PATCH] handling rio MEMDUMP
        [PATCH] fix rio_copy_to_card() for OLDPCI case
        [PATCH] uses of ->Copy() in rioroute are bogus
        [PATCH] bogus order of copy_from_user() arguments
        [PATCH] rio ->Copy() expects the sourse as first argument
        [PATCH] trivial annotations in rio
      077e9894
    • L
      Merge branch 'audit.b21' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current · d9eaec9e
      Linus Torvalds 提交于
      * 'audit.b21' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current: (25 commits)
        [PATCH] make set_loginuid obey audit_enabled
        [PATCH] log more info for directory entry change events
        [PATCH] fix AUDIT_FILTER_PREPEND handling
        [PATCH] validate rule fields' types
        [PATCH] audit: path-based rules
        [PATCH] Audit of POSIX Message Queue Syscalls v.2
        [PATCH] fix se_sen audit filter
        [PATCH] deprecate AUDIT_POSSBILE
        [PATCH] inline more audit helpers
        [PATCH] proc_loginuid_write() uses simple_strtoul() on non-terminated array
        [PATCH] update of IPC audit record cleanup
        [PATCH] minor audit updates
        [PATCH] fix audit_krule_to_{rule,data} return values
        [PATCH] add filtering by ppid
        [PATCH] log ppid
        [PATCH] collect sid of those who send signals to auditd
        [PATCH] execve argument logging
        [PATCH] fix deadlocks in AUDIT_LIST/AUDIT_LIST_RULES
        [PATCH] audit_panic() is audit-internal
        [PATCH] inotify (5/5): update kernel documentation
        ...
      
      Manual fixup of conflict in unclude/linux/inotify.h
      d9eaec9e
    • R
      [ARM] Fix tosa build error · 905f1467
      Russell King 提交于
      tosa.c references mdelay(), but was missing linux/delay.h
      Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
      905f1467