1. 30 Sep, 2006 14 commits
    • Jens Axboe's avatar
      95e8810b
    • Jens Axboe's avatar
      [PATCH] elevator: introduce a way to reuse rq for internal FIFO handling · 1fbfdfcd
      Jens Axboe authored
      
      The io schedulers can use this instead of having to allocate space for
      it themselves.
      Signed-off-by: default avatarJens Axboe <axboe@suse.de>
      1fbfdfcd
    • Jens Axboe's avatar
      [PATCH] deadline-iosched: migrate to using the elevator rb functions · b8aca35a
      Jens Axboe authored
      
      This removes the rbtree handling from deadline.
      Signed-off-by: default avatarJens Axboe <axboe@suse.de>
      b8aca35a
    • Jens Axboe's avatar
      [PATCH] cfq-iosched: migrate to using the elevator rb functions · 21183b07
      Jens Axboe authored
      
      This removes the rbtree handling from CFQ.
      Signed-off-by: default avatarJens Axboe <axboe@suse.de>
      21183b07
    • Jens Axboe's avatar
      [PATCH] as-iosched: migrate to using the elevator rb functions · e37f346e
      Jens Axboe authored
      
      This removes the rbtree handling from AS.
      Signed-off-by: default avatarJens Axboe <axboe@suse.de>
      Signed-off-by: default avatarNick Piggin <npiggin@suse.de>
      e37f346e
    • Jens Axboe's avatar
      [PATCH] elevator: abstract out the rbtree sort handling · 2e662b65
      Jens Axboe authored
      
      The rbtree sort/lookup/reposition logic is mostly duplicated in
      cfq/deadline/as, so move it to the elevator core. The io schedulers
      still provide the actual rb root, as we don't want to impose any sort
      of specific handling on the schedulers.
      
      Introduce the helpers and rb_node in struct request to help migrate the
      IO schedulers.
      Signed-off-by: default avatarJens Axboe <axboe@suse.de>
      2e662b65
    • Jens Axboe's avatar
      [PATCH] rbtree: fixed reversed RB_EMPTY_NODE and rb_next/prev · 10fd48f2
      Jens Axboe authored
      
      The conditions got reserved. Also make rb_next() and rb_prev() check
      for the empty condition.
      Signed-off-by: default avatarJens Axboe <axboe@suse.de>
      10fd48f2
    • Jens Axboe's avatar
      [PATCH] elevator: move the backmerging logic into the elevator core · 9817064b
      Jens Axboe authored
      
      Right now, every IO scheduler implements its own backmerging (except for
      noop, which does no merging). That results in duplicated code for
      essentially the same operation, which is never a good thing. This patch
      moves the backmerging out of the io schedulers and into the elevator
      core. We save 1.6kb of text and as a bonus get backmerging for noop as
      well. Win-win!
      Signed-off-by: default avatarJens Axboe <axboe@suse.de>
      9817064b
    • Jens Axboe's avatar
      [PATCH] Split struct request ->flags into two parts · 4aff5e23
      Jens Axboe authored
      
      Right now ->flags is a bit of a mess: some are request types, and
      others are just modifiers. Clean this up by splitting it into
      ->cmd_type and ->cmd_flags. This allows introduction of generic
      Linux block message types, useful for sending generic Linux commands
      to block devices.
      Signed-off-by: default avatarJens Axboe <axboe@suse.de>
      4aff5e23
    • Jean Delvare's avatar
      [PATCH] i2c: Prevent deadlock on i2c client registration · 77ed74da
      Jean Delvare authored
      
      Delay the call to adapter->client_register() until after we are
      certain that the client registration is a success. At this point the
      client is fully initialized and we no longer hold the adapter->clist
      mutex, so this should prevent the deadlocks if the client_register()
      callback needs to take that mutex too, as is the case for the bttv
      driver.
      
      This fixes bug #7234.
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      77ed74da
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb · 5ffd1a6a
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (180 commits)
        V4L/DVB (4641): Trivial: use lowercase letters in hex subsystem ids
        V4L/DVB (4639): Cx88: add autodetection for alternate revision of Leadtek PVR
        V4L/DVB (4638): Basic DVB-T and analog TV support for the HVR1300.
        V4L/DVB (4637): Add a default method for VIDIOC_G_PARM
        V4L/DVB (4635): Extend bttv and saa7134 to check for both AGP and PCI PCI failure case
        V4L/DVB (4634): Zr36120: implement pcipci checks
        V4L/DVB (4632): Zoran: Implement pcipci failure check
        V4L/DVB (4631): Av7110: remove V4L2_CAP_VBI_CAPTURE flag
        V4L/DVB (4630): Av7110: FW_LOADER depemdency fixed
        V4L/DVB (4629): Saa7134: add card support for Proteus Pro 2309
        V4L/DVB (4628): Fix VIDIOC_ENUMSTD ioctl in videodev.c
        V4L/DVB (4627): Vivi crashes with mplayer
        V4L/DVB (4626): On saa7111/7113, LUMA_CTRL need a different value
        V4L/DVB (4624): Tvaudio: Replaced kernel_thread() with kthread_run()
        V4L/DVB (4622): Copy-paste bug in videodev.c
        V4L/DVB (4620): Fix AGC configuration for MOD3000P-based boards
        V4L/DVB (4619): Fixes some I2C dependencies on V4L devices
        V4L/DVB (4617): Problem with dibusb-mb.c USB IDs
        V4L/DVB (4616): [PATCH] Nebula DigiTV USB RC support
        V4L/DVB (4614): Export symbol saa7134_tvaudio_setmute from saa7134 for saa7134-alsa
        ...
      5ffd1a6a
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of... · 0cd43f83
      Linus Torvalds authored
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
      
      * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: (48 commits)
        ieee1394: raw1394: arm functions slept in atomic context
        ieee1394: sbp2: enable auto spin-up for all SBP-2 devices
        MAINTAINERS: updates to IEEE 1394 subsystem maintainership
        ieee1394: ohci1394: check for errors in suspend or resume
        set power state of firewire host during suspend
        ieee1394: ohci1394: more obvious endianess handling
        ieee1394: ohci1394: fix endianess bug in debug message
        ieee1394: sbp2: don't prefer MODE SENSE 10
        ieee1394: nodemgr: grab class.subsys.rwsem in nodemgr_resume_ne
        ieee1394: nodemgr: fix rwsem recursion
        ieee1394: sbp2: more help in Kconfig
        ieee1394: sbp2: prevent rare deadlock in shutdown
        ieee1394: sbp2: update includes
        ieee1394: sbp2: better handling of transport errors
        ieee1394: sbp2: recheck node generation in sbp2_update
        ieee1394: sbp2: safer agent reset in error handlers
        ieee1394: sbp2: handle "sbp2util_node_write_no_wait failed"
        CONFIG_PM=n slim: drivers/ieee1394/ohci1394.c
        ieee1394: safer definition of empty macros
        video1394: add poll file operation support
        ...
      0cd43f83
    • Linus Torvalds's avatar
      Merge branch 'intelfb-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/intelfb-2.6 · db1a19b3
      Linus Torvalds authored
      * 'intelfb-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/intelfb-2.6:
        intelfbhw.c: intelfbhw_get_p1p2 defined but not used
        intelfb: fix mtrr_reg signedness
        intelfb: update doc and Kconfig (supported devices)
        intelfb: add preliminary i2c support
        intelfb: add preliminary i2c support
        intelfb: add preliminary i2c support
        intelfb: add preliminary i2c support
        intelfb: add preliminary i2c support
        intelfb: add preliminary i2c support
        intelfb: add preliminary i2c support
        intelfb: add preliminary i2c support
        intelfb: add vsync interrupt support
        intelfb: add vsync interrupt support
        intelfb: add vsync interrupt support
        intelfb: add vsync interrupt support
        intelfb: add vsync interrupt support
      db1a19b3
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6 · 369aa839
      Linus Torvalds authored
      * 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6:
        [PATCH] Use early clobber in semaphores
        [PATCH] Define vsyscall cache as blob to make clearer that user space shouldn't use it
        [PATCH] Re-positioning the bss segment
        [PATCH] Use ARRAY_SIZE in setup.c
        [PATCH] i386: replace intermediate array-size definitions with ARRAY_SIZE()
        [PATCH] x86: Clean up x86 NMI sysctls
        [PATCH] Refactor some duplicated code in mpparse.c
        [PATCH] Document iommu=panic
        [PATCH] Fix broken indentation in iommu_setup
        [PATCH] Allow disabling DAC using command line options
        [PATCH] Add proper sparse __user casts to __copy_to_user_inatomic
        [PATCH] i386: Update defconfig
        [PATCH] Update defconfig
      369aa839
  2. 29 Sep, 2006 26 commits