1. 21 Jun, 2006 32 commits
    • Rene Herman's avatar
      [PATCH] Driver model: add ISA bus · a5117ba7
      Rene Herman authored
      During the recent "isa drivers using platform devices" discussion it was
      pointed out that (ALSA) ISA drivers ran into the problem of not having
      the option to fail driver load (device registration rather) upon not
      finding their hardware due to a probe() error not being passed up
      through the driver model. In the course of that, I suggested a seperate
      ISA bus might be best; Russell King agreed and suggested this bus could
      use the .match() method for the actual device discovery.
      
      The attached does this. For this old non (generically) discoverable ISA
      hardware only the driver itself can do discovery so as a difference with
      the platform_bus, this isa_bus also distributes match() up to the driver.
      
      As another difference: these devices only exist in the driver model due
      to the driver creating them because it might want to drive them, meaning
      that all device creation has been made internal as well.
      
      The usage model this provides is nice, and has been acked from the ALSA
      side by Takashi Iwai and Jaroslav Kysela. The ALSA driver module_init's
      now (for oldisa-only drivers) become:
      
      static int __init alsa_card_foo_init(void)
      {
      	return isa_register_driver(&snd_foo_isa_driver, SNDRV_CARDS);
      }
      
      static void __exit alsa_card_foo_exit(void)
      {
      	isa_unregister_driver(&snd_foo_isa_driver);
      }
      
      Quite like the other bus models therefore. This removes a lot of
      duplicated init code from the ALSA ISA drivers.
      
      The passed in isa_driver struct is the regular driver struct embedding a
      struct device_driver, the normal probe/remove/shutdown/suspend/resume
      callbacks, and as indicated that .match callback.
      
      The "SNDRV_CARDS" you see being passed in is a "unsigned int ndev"
      parameter, indicating how many devices to create and call our methods with.
      
      The platform_driver callbacks are called with a platform_device param;
      the isa_driver callbacks are being called with a "struct device *dev,
      unsigned int id" pair directly -- with the device creation completely
      internal to the bus it's much cleaner to not leak isa_dev's by passing
      them in at all. The id is the only thing we ever want other then the
      struct device * anyways, and it makes for nicer code in the callbacks as
      well.
      
      With this additional .match() callback ISA drivers have all options. If
      ALSA would want to keep the old non-load behaviour, it could stick all
      of the old .probe in .match, which would only keep them registered after
      everything was found to be present and accounted for. If it wanted the
      behaviour of always loading as it inadvertently did for a bit after the
      changeover to platform devices, it could just not provide a .match() and
      do everything in .probe() as before.
      
      If it, as Takashi Iwai already suggested earlier as a way of following
      the model from saner buses more closely, wants to load when a later bind
      could conceivably succeed, it could use .match() for the prerequisites
      (such as checking the user wants the card enabled and that port/irq/dma
      values have been passed in) and .probe() for everything else. This is
      the nicest model.
      
      To the code...
      
      This exports only two functions; isa_{,un}register_driver().
      
      isa_register_driver() register's the struct device_driver, and then
      loops over the passed in ndev creating devices and registering them.
      This causes the bus match method to be called for them, which is:
      
      int isa_bus_match(struct device *dev, struct device_driver *driver)
      {
                struct isa_driver *isa_driver = to_isa_driver(driver);
      
                if (dev->platform_data == isa_driver) {
                        if (!isa_driver->match ||
                                isa_driver->match(dev, to_isa_dev(dev)->id))
                                return 1;
                        dev->platform_data = NULL;
                }
                return 0;
      }
      
      The first thing this does is check if this device is in fact one of this
      driver's devices by seeing if the device's platform_data pointer is set
      to this driver. Platform devices compare strings, but we don't need to
      do that with everything being internal, so isa_register_driver() abuses
      dev->platform_data as a isa_driver pointer which we can then check here.
      I believe platform_data is available for this, but if rather not, moving
      the isa_driver pointer to the private struct isa_dev is ofcourse fine as
      well.
      
      Then, if the the driver did not provide a .match, it matches. If it did,
      the driver match() method is called to determine a match.
      
      If it did _not_ match, dev->platform_data is reset to indicate this to
      isa_register_driver which can then unregister the device again.
      
      If during all this, there's any error, or no devices matched at all
      everything is backed out again and the error, or -ENODEV, is returned.
      
      isa_unregister_driver() just unregisters the matched devices and the
      driver itself.
      
      More global points/questions...
      
      - I'm introducing include/linux/isa.h. It was available but is ofcourse
      a somewhat generic name. Moving more isa stuff over to it in time is
      ofcourse fine, so can I have it please? :)
      
      - I'm using device_initcall() and added the isa.o (dependent on
      CONFIG_ISA) after the base driver model things in the Makefile. Will
      this do, or I really need to stick it in drivers/base/init.c, inside
      #ifdef CONFIG_ISA? It's working fine.
      
      Lastly -- I also looked, a bit, into integrating with PnP. "Old ISA"
      could be another pnp_protocol, but this does not seem to be a good
      match, largely due to the same reason platform_devices weren't -- the
      devices do not have a life of their own outside the driver, meaning the
      pnp_protocol {get,set}_resources callbacks would need to callback into
      driver -- which again means you first need to _have_ that driver. Even
      if there's clean way around that, you only end up inventing fake but
      valid-form PnP IDs and generally catering to the PnP layer without any
      practical advantages over this very simple isa_bus. The thing I also
      suggested earlier about the user echoing values into /sys to set up the
      hardware from userspace first is... well, cute, but a horrible idea from
      a user standpoint.
      
      Comments ofcourse appreciated. Hope it's okay. As said, the usage model
      is nice at least.
      Signed-off-by: default avatarRene Herman <rene.herman@keyaccess.nl>
      a5117ba7
    • Alan Stern's avatar
      [PATCH] Driver Core: Make dev_info and friends print the bus name if there is no driver · 3e95637a
      Alan Stern authored
      This patch (as721) makes dev_info and related macros print the device's
      bus name if the device doesn't have a driver, instead of printing just a
      blank.  If the device isn't on a bus either... well, then it does leave
      a blank space.  But it will be easier for someone else to change if they
      want.
      
      Cc: Matthew Wilcox <matthew@wil.cx>
      Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      3e95637a
    • Greg Kroah-Hartman's avatar
      [PATCH] Driver core: add proper symlinks for devices · e9a7d305
      Greg Kroah-Hartman authored
      We need to create the "compatible" symlinks that class_devices used to
      create when they were in the class directories so that userspace does
      not know anything changed at all.
      
      Yeah, we have a lot of symlinks now, but we should be able to get rid of
      them in a year or two... (wishful thinking...)
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      e9a7d305
    • Kay Sievers's avatar
      [PATCH] Driver core: add generic "subsystem" link to all devices · b9d9c82b
      Kay Sievers authored
      Like the SUBSYTEM= key we find in the environment of the uevent, this
      creates a generic "subsystem" link in sysfs for every device. Userspace
      usually doesn't care at all if its a "class" or a "bus" device. This
      provides an unified way to determine the subsytem of a device, regardless
      of the way the driver core has created it.
      Signed-off-by: default avatarKay Sievers <kay.sievers@suse.de>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      b9d9c82b
    • Greg Kroah-Hartman's avatar
      [PATCH] Driver core: allow struct device to have a dev_t · 23681e47
      Greg Kroah-Hartman authored
      This is the first step in moving class_device to being replaced by
      struct device.  It allows struct device to export a dev_t and makes it
      easy to dynamically create and destroy struct device as long as they are
      associated with a specific class.
      
      Cc: Kay Sievers <kay.sievers@vrfy.org>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      23681e47
    • Greg Kroah-Hartman's avatar
      [PATCH] Driver core: change make_class_name() to take kobjects · aa49b913
      Greg Kroah-Hartman authored
      This is needed for a future patch for the device code to create the
      proper symlinks for devices that are "class devices".
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      aa49b913
    • Laura Garcia's avatar
      [PATCH] firmware_class: s/semaphores/mutexes · cad1e55d
      Laura Garcia authored
      Hi, this patch converts semaphores to mutexes for Randy's firmware_class.
      Signed-off-by: default avatarLaura Garcia Liebana <nevola@gmail.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      cad1e55d
    • David Brownell's avatar
      [PATCH] Driver core: PM_DEBUG device suspend() messages become informative · fd869db6
      David Brownell authored
      This makes the driver model PM suspend debug messages more useful, by
      
        (a) explaining what event is being sent, since not all suspend()
            requests mean the same thing;
      
        (b) reporting when a PM_EVENT_SUSPEND call is allowing the device
            to issue wakeup events.
      Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      fd869db6
    • David Brownell's avatar
      [PATCH] remove duplication from Documentation/power/devices.txt · 1e724845
      David Brownell authored
      Remove a chunk of duplicated documentation text.
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      1e724845
    • Michael Holzheu's avatar
      [PATCH] Driver Core: Add /sys/hypervisor when needed · 4039483f
      Michael Holzheu authored
      To have a home for all hypervisors, this patch creates /sys/hypervisor.
      A new config option SYS_HYPERVISOR is introduced, which should to be set
      by architecture dependent hypervisors (e.g. s390 or Xen).
      Acked-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
      Signed-off-by: default avatarMichael Holzheu <holzheu@de.ibm.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      4039483f
    • Russell King's avatar
      [PATCH] Driver Core: Fix platform_device_add to use device_add · e3915532
      Russell King authored
      platform_device_add() should be using device_add() rather
      than device_register() - any platform device passed to
      platform_device_add() should have already been initialised,
      either by platform_device_alloc() or platform_device_register().
      Signed-off-by: default avatarRussell King <rmk@arm.linux.org.uk>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      e3915532
    • Shaohua Li's avatar
      [PATCH] Driver Core: Allow sysdev_class have attributes · 670dd90d
      Shaohua Li authored
      allow sysdev_class adding attribute. Next patch will use the new API to
      add an attribute under /sys/device/system/cpu/.
      Signed-off-by: default avatarShaohua Li <shaohua.li@intel.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      670dd90d
    • Greg Kroah-Hartman's avatar
      [PATCH] Driver Core: remove unused exports · 1740757e
      Greg Kroah-Hartman authored
      Cc: Arjan van de Ven <arjan@linux.intel.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      1740757e
    • David Brownell's avatar
      [PATCH] platform_bus learns about modalias · a0245f7a
      David Brownell authored
      This patch adds modalias support to platform devices, for simpler
      hotplug/coldplug driven driver setup.
      Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      a0245f7a
    • David Brownell's avatar
      [PATCH] Driver Core: CONFIG_DEBUG_PM covers drivers/base/power too · 05967118
      David Brownell authored
      The drivers/base/power PM debug messages should appear when
      either PM or driver model debug are enabled.
      Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      05967118
    • Stephen Hemminger's avatar
      [PATCH] Driver core: class_device_add needs error checks · b7fe4a60
      Stephen Hemminger authored
      class_device_add needs to check the return value of all the setup it
      does. It doesn't handle out of memory well. This is not complete, probably
      more needs to be done.
      Signed-off-by: default avatarStephen Hemminger <shemminger@osdl.org>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      b7fe4a60
    • Hansjoerg Lipp's avatar
      [PATCH] i4l gigaset: move sysfs entry to tty class device · 3dda4e37
      Hansjoerg Lipp authored
      Using the class device pointer returned by tty_register_device() with
      part 1 of the patch, attach the Gigaset drivers' "cidmode" sysfs entry
      to its tty class device, where it can be found more easily by users
      who do not know nor care which USB port the device is attached to.
      Signed-off-by: default avatarHansjoerg Lipp <hjlipp@web.de>
      Signed-off-by: default avatarTilman Schmidt <tilman@imap.cc>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      3dda4e37
    • Hansjoerg Lipp's avatar
      [PATCH] TTY: return class device pointer from tty_register_device() · 1cdcb6b4
      Hansjoerg Lipp authored
      Let tty_register_device() return a pointer to the class device it creates.
      This allows registrants to add their own sysfs files under the class
      device node.
      Signed-off-by: default avatarHansjoerg Lipp <hjlipp@web.de>
      Signed-off-by: default avatarTilman Schmidt <tilman@imap.cc>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      1cdcb6b4
    • Kay Sievers's avatar
      [PATCH] Driver core: bus device event delay · 53877d06
      Kay Sievers authored
      split bus_add_device() and send device uevents after sysfs population
      Signed-off-by: default avatarKay Sievers <kay.sievers@suse.de>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      53877d06
    • Greg Kroah-Hartman's avatar
    • Greg Kroah-Hartman's avatar
    • Greg Kroah-Hartman's avatar
      [PATCH] kobject: make people pay attention to kobject_add errors · 183bd5b3
      Greg Kroah-Hartman authored
      These really need to be fixed, shout it out to the world.
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      183bd5b3
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6 · 789e7dc8
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6: (30 commits)
        [PATCH] PCI Hotplug: Fix recovery path from errors during pcie_init()
        [PATCH] PCI Hotplug: fake NULL pointer dereferences in IBM Hot Plug Controller Driver
        [PATCH] shpchp: Cleanup improper info messages
        [PATCH] shpchp: Remove Unused hpc_evelnt_lock
        [PATCH] shpchp: Cleanup interrupt polling timer
        [PATCH] shpchp: Cleanup SHPC commands
        [PATCH] shpchp: Cleanup interrupt handler
        [PATCH] shpchp: Remove unnecessary hpc_ctlr_handle check
        [PATCH] pciehp: Implement get_address callback
        [PATCH] pciehp: Add missing pci_dev_put
        [PATCH] pciehp: Replace pci_find_slot() with pci_get_slot()
        [PATCH] SGI Hotplug: Incorrect power status
        [PATCH] shpchp: Create shpchpd at controller probe time
        [PATCH] shpchp: Mask Global SERR and Intr at controller release time
        [PATCH] SHPC: Fix SHPC Contoller SERR-INT Register bits access
        [PATCH] SHPC: Fix SHPC Logical Slot Register bits access
        [PATCH] SHPC: Cleanup SHPC Logical Slot Register bits access
        [PATCH] SHPC: Cleanup SHPC Logical Slot Register access
        [PATCH] SHPC: Cleanup SHPC register access
        [PATCH] pciehp: Fix programming hotplug parameters
        ...
      789e7dc8
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 · 28e4b224
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (85 commits)
        [SCSI] 53c700: remove reliance on deprecated cmnd fields
        [SCSI] hptiop: don't use cmnd->bufflen
        [SCSI] hptiop: HighPoint RocketRAID 3xxx controller driver
        [SCSI] aacraid: small misc. cleanups
        [SCSI] aacraid: Update supported product information
        [SCSI] aacraid: Fix return code interpretation
        [SCSI] scsi_transport_sas: fix panic in sas_free_rphy
        [SCSI] remove RQ_SCSI_* flags
        [SCSI] remove scsi_request infrastructure
        [SCSI] mptfusion: change driver revision to 3.03.10
        [SCSI] mptfc: abort of board reset leaves port dead requiring reboot
        [SCSI] mptfc: fix fibre channel infinite request/response loop
        [SCSI] mptfc: set fibre channel fw target missing timers to one second
        [SCSI] mptfusion: move fc event/reset handling to mptfc
        [SCSI] spi transport: don't allow dt to be set on SE or HVD buses
        [SCSI] aic7xxx: expose the bus setting to sysfs
        [SCSI] scsi: remove Documentation/scsi/cpqfc.txt
        [SCSI] drivers/scsi: Use ARRAY_SIZE macro
        [SCSI] Remove last page_address from dc395x.c
        [SCSI] hptiop: HighPoint RocketRAID 3xxx controller driver
        ...
      
      Fixed up conflicts in drivers/message/fusion/mptbase.c manually (due to
      the sparc interrupt cleanups)
      28e4b224
    • 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 8 commits
    • Linus Torvalds's avatar
      Merge branch 'rio.b19' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/bird · 077e9894
      Linus Torvalds authored
      * '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
    • Linus Torvalds's avatar
      Merge branch 'audit.b21' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current · d9eaec9e
      Linus Torvalds authored
      * '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
    • Russell King's avatar
      [ARM] Fix tosa build error · 905f1467
      Russell King authored
      tosa.c references mdelay(), but was missing linux/delay.h
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      905f1467
    • Linus Torvalds's avatar
      Merge git://git.infradead.org/hdrcleanup-2.6 · cee4cca7
      Linus Torvalds authored
      * git://git.infradead.org/hdrcleanup-2.6: (63 commits)
        [S390] __FD_foo definitions.
        Switch to __s32 types in joystick.h instead of C99 types for consistency.
        Add <sys/types.h> to headers included for userspace in <linux/input.h>
        Move inclusion of <linux/compat.h> out of user scope in asm-x86_64/mtrr.h
        Remove struct fddi_statistics from user view in <linux/if_fddi.h>
        Move user-visible parts of drivers/s390/crypto/z90crypt.h to include/asm-s390
        Revert include/media changes: Mauro says those ioctls are only used in-kernel(!)
        Include <linux/types.h> and use __uXX types in <linux/cramfs_fs.h>
        Use __uXX types in <linux/i2o_dev.h>, include <linux/ioctl.h> too
        Remove private struct dx_hash_info from public view in <linux/ext3_fs.h>
        Include <linux/types.h> and use __uXX types in <linux/affs_hardblocks.h>
        Use __uXX types in <linux/divert.h> for struct divert_blk et al.
        Use __u32 for elf_addr_t in <asm-powerpc/elf.h>, not u32. It's user-visible.
        Remove PPP_FCS from user view in <linux/ppp_defs.h>, remove __P mess entirely
        Use __uXX types in user-visible structures in <linux/nbd.h>
        Don't use 'u32' in user-visible struct ip_conntrack_old_tuple.
        Use __uXX types for S390 DASD volume label definitions which are user-visible
        S390 BIODASDREADCMB ioctl should use __u64 not u64 type.
        Remove unneeded inclusion of <linux/time.h> from <linux/ufs_fs.h>
        Fix private integer types used in V4L2 ioctls.
        ...
      
      Manually resolve conflict in include/linux/mtd/physmap.h
      cee4cca7
    • Linus Torvalds's avatar
      Merge git://git.infradead.org/~dwmw2/rbtree-2.6 · 2edc322d
      Linus Torvalds authored
      * git://git.infradead.org/~dwmw2/rbtree-2.6:
        [RBTREE] Switch rb_colour() et al to en_US spelling of 'color' for consistency
        Update UML kernel/physmem.c to use rb_parent() accessor macro
        [RBTREE] Update hrtimers to use rb_parent() accessor macro.
        [RBTREE] Add explicit alignment to sizeof(long) for struct rb_node.
        [RBTREE] Merge colour and parent fields of struct rb_node.
        [RBTREE] Remove dead code in rb_erase()
        [RBTREE] Update JFFS2 to use rb_parent() accessor macro.
        [RBTREE] Update eventpoll.c to use rb_parent() accessor macro.
        [RBTREE] Update key.c to use rb_parent() accessor macro.
        [RBTREE] Update ext3 to use rb_parent() accessor macro.
        [RBTREE] Change rbtree off-tree marking in I/O schedulers.
        [RBTREE] Add accessor macros for colour and parent fields of rb_node
      2edc322d
    • Linus Torvalds's avatar
      Merge git://git.infradead.org/mtd-2.6 · be967b7e
      Linus Torvalds authored
      * git://git.infradead.org/mtd-2.6: (199 commits)
        [MTD] NAND: Fix breakage all over the place
        [PATCH] NAND: fix remaining OOB length calculation
        [MTD] NAND Fixup NDFC merge brokeness
        [MTD NAND] S3C2410 driver cleanup
        [MTD NAND] s3c24x0 board: Fix clock handling, ensure proper initialisation.
        [JFFS2] Check CRC32 on dirent and data nodes each time they're read
        [JFFS2] When retiring nextblock, allocate a node_ref for the wasted space
        [JFFS2] Mark XATTR support as experimental, for now
        [JFFS2] Don't trust node headers before the CRC is checked.
        [MTD] Restore MTD_ROM and MTD_RAM types
        [MTD] assume mtd->writesize is 1 for NOR flashes
        [MTD NAND] Fix s3c2410 NAND driver so it at least _looks_ like it compiles
        [MTD] Prepare physmap for 64-bit-resources
        [JFFS2] Fix more breakage caused by janitorial meddling.
        [JFFS2] Remove stray __exit from jffs2_compressors_exit()
        [MTD] Allow alternate JFFS2 mount variant for root filesystem.
        [MTD] Disconnect struct mtd_info from ABI
        [MTD] replace MTD_RAM with MTD_GENERIC_TYPE
        [MTD] replace MTD_ROM with MTD_GENERIC_TYPE
        [MTD] remove a forgotten MTD_XIP
        ...
      be967b7e
    • Linus Torvalds's avatar
      Merge master.kernel.org:/home/rmk/linux-2.6-serial · eef11427
      Linus Torvalds authored
      * master.kernel.org:/home/rmk/linux-2.6-serial:
        [SERIAL] PARPORT_SERIAL should depend on SERIAL_8250_PCI
      eef11427
    • Linus Torvalds's avatar
      Merge master.kernel.org:/home/rmk/linux-2.6-mmc · c9ab0971
      Linus Torvalds authored
      * master.kernel.org:/home/rmk/linux-2.6-mmc:
        [MMC] Add (MMC) to entry in MAINTAINERS file
        [MMC] sdhci truncated pointer fix
      c9ab0971