linux 2.5.25

linux 2.5.25

[Linus Torvalds]

More merges all over the map - ppc, scsi, USB, kbuild, input drivers etc.

And both Al and Andrew have been busy again.

This also introduces the support for non-100 Hz internal kernel times on
x86, while still exporting the old interface to user space (ie anybody who
exported raw jiffies before should be exporting "clock_t", which on x86
continues to be a 100 Hz clock, regardless of whatever the internal kernel
frequency is).

Right now the x86 timer frequency is set to 1kHz, but that's just another 
random number. It could be a config option if people really care, but I'd 
rather just have people argue for or against specific internal frequencies 
and we'll find something most people are happy with. It's easy to change 
without user space even noticing now.

The other thing that we should sort out eventually is the unified naming
for disk devices, now that both IDE and SCSI are starting to have some
support for driverfs.  Let's make sure that we _can_ have sane ways of
accessing a disk, without having to care whether it is IDE or SCSI or
anything else.

		Linus

----

Summary of changes from v2.5.24 to v2.5.25
============================================

<bheilbrun@paypal.com>:
  o APM compile fix, "stime" update broke it

<dgibson@samba.org>:
  o PPC32: Fixes and cleanups for PPC40x processors
  o PPC32: Update handling of the interrupt controller on the PPC405
  o PPC32: more PPC40x cleanup (remove CONFIG_PIN_TLB, add comments)

<dledford@aladin.rdu.redhat.com>:
  o Initial initio a100 driver DMA mapping changes + selected cleanups
  o inia100.c
  o i60uscsi.c

<jejb@mulgrave.(none)>:
  o [SCSI 53c700] add specimen block layer tcq
  o make Scsi_Cmnd and Scsi_Request.request be a pointer to the block
    layer request instead of a copy.
  o Initial support (mid-layer) for generic TCQ
  o [SCSI mid-layer]
  o [SCSI mid-layer]  bug fix two missing blk_queue_end_tag()s
  o export open_softirq

<kai@chaos.tp1.ruhr-uni-bochum.de>:
  o kbuild: Fix warnings and other buglets

<kettenis@gnu.org>:
  o Fix note sections in ELF core dumps

<orjan.friberg@axis.com>:
  o USB: bluetty.c allocation bug fix

<petkan@users.sourceforge.net>:
  o pegasus & rtl8150

<sam@mars.ravnborg.org>:
  o kbuild: Add "make help" support

<sullivan@austin.ibm.com>:
  o linux-2.5.22-driverfs.patch

<willy@debian.org>:
  o softscsi patch
  o rewrite find_vma_prev

Alexander Viro <viro@math.psu.edu>:
  o devpts cleanup
  o (md.c) block device size cleanups
  o cdrom.c cleanups
  o kdev_t crapectomy
  o raid kdev_t cleanups (part 1)
  o raid ->diskop() splitup
  o raid kdev_t cleanups - part 2
  o md_import_device() cleanup
  o raid kdev_t cleanups - part 3
  o ex_dev switched to dev_t
  o assorted kdev_t cleanups in filesystems
  o >i_dev switched to dev_t

Andrew Morton <akpm@zip.com.au>:
  o handle BIO allocation failures in swap_writepage()
  o Fix 3c59x driver for some 3c566B's
  o per-cpu buffer_head cache
  o Remove ext2's buffer_head cache
  o Remove ext3's buffer_head cache
  o debug check for leaked blockdev buffers
  o misc cleanups and fixes
  o pdflush cleanup
  o remove swap_get_block()
  o shmem fixes
  o add new list_splice_init()
  o set TASK_RUNNING in cond_resched()
  o set TASK_RUNNING in yield()
  o check for O_DIRECT capability in open(), not write()
  o set_page_dirty() in mark_dirty_kiobuf()
  o resurrect __GFP_HIGH
  o Use __GFP_HIGH in mpage_writepages()
  o always update page->flags atomically
  o suppress more allocation failure warnings
  o fix a writeback race
  o combine generic_writepages() and mpage_writepages()
  o ext3 truncate fix
  o JBD commit callback capability
  o fix invalidate_inode_pages2() race
  o debug: check page refcount in __free_pages_ok()
  o reduce lock contention in try_to_free_buffers()
  o Use names, not numbers for pagefault types

Anton Altaparmakov <aia21@cantab.net>:
  o NTFS: 2.0.11 - Initial preparations for fake inode based attribute
    i/o
  o NTFS: 2.0.12 - Initial cleanup of address space operations
    following 2.0.11 changes
  o NTFS: 2.0.13 - Use iget5_locked() in preparation for fake inodes
    and small cleanups
  o NTFS: 2.0.14 - Run list merging code cleanup, minor locking
    changes, typo fixes

David Brownell <david-b@pacbell.net>:
  o ohci-hcd cardbus unplug
  o Re: [linux-usb-devel] unending timeouts (patch for 2.5.22 oops)

Greg Kroah-Hartman <greg@kroah.com>:
  o USB:  picked a uhci driver to go forward with
  o USB:  removed unused Config.help entries from the host controller
    file
  o USB: removed file ops from usb device structure Moved the file ops
    and minor number stuff out of the usb structure, Now
    usb_register_dev() and usb_deregister_dev() must be called if  you
    want to use the USB major number.
  o USB: added drivers/usb/core/file.c to the kernel-api documentation
  o USB: Fixups due to the changes in struct usb_device for
    file_operations and minor number handling

james.bottomley@steeleye.com <James.Bottomley@steeleye.com>:
  o fix SCSI driverfs for IDE panic on boot

Kai Germaschewski <kai@tp1.ruhr-uni-bochum.de>:
  o kbuild: Assorted cleanups
  o kbuild: Prepare LDFLAGS for general use
  o kbuild: Rename ld flags for vmlinux to LDFLAGS_vmlinux
  o kbuild: Put flags for ld into LDFLAGS
  o kbuild: Put flags for objcopy into OBJCOPYFLAGS
  o kbuild: clean up arch/i386/boot, part 1
  o kbuild: clean up arch/i386/boot, part 2
  o kbuild: clean up arch/i386/boot, part 3
  o kbuild: clean up arch/i386/boot, part 4
  o kbuild: Fix calling of make_times_h and gentbl
  o kbuild: Provide shipped versions of the keymap files

Linus Torvalds <torvalds@home.transmeta.com>:
  o DRI CVS merge: separate out driver-ioctl's into driver headers
  o Make in-kernel HZ be 1000 on x86, retaining user-level 100 HZ
    clock_t
  o Make ramfs/driverfs maintain directory nlink counts
  o Fix more places where we exported our internal time to user space.
    Convert to standard clock_t.
  o Radeon DRI merge
  o x86 "make clean" missed some new targets
  o Disable ReiserFS bh usage count testing for now

Matthew Dharm <mdharm-usb@one-eyed-alien.net>:
  o usb-storage: code cleanup, small fixes
  o usb-storage: Code consolidation of error paths
  o usb-storage: remove timer

Paul Mackerras <paulus@samba.org>:
  o PPC32: add CONFIG_DEBUG_SPINLOCK
  o PPC32: Fixes for bugs in exception handling in copy_to_user and
    clear_user
  o PPC32: Add struct page * argument to copy/clear_user_page
  o PPC32: fixes for I/O mappings on CHRP machines
  o PPC32: update for scheduler changes (switch_to,
    prepare/finish_arch_*)
  o PPC32: translate addresses in the Open Firmware device tree
    correctly
  o PPC32 compile fix: add missing parenthesis
  o PPC32: fix compilation with current binutils
  o PPC32: work around the fact that the PPC601 doesn't implement the
    MSR.RI bit
  o PPC32: fix some minor compile warnings
  o PPC32: fix handling of machine checks
  o PPC32: eliminate some compile warnings on the EP405 board
  o PPC32: define USER_HZ to be 100 (HZ is still 100 for now)
  o PPC32: fix compile error by removing extraneous declarations
    (ppc_ksyms.c)

Paul Menage <pmenage@ensim.com>:
  o Shift BKL into ->statfs()

Pavel Machek <pavel@ucw.cz>:
  o suspend-to-disk documentation updates

Petr Vandrovec <vandrove@vc.cvut.cz>:
  o 2.5.24 matroxfb memory corruption
  o 2.5.24 matroxfb off by one error
  o drivers/ide/probe.c leaks memory

samuel.thibault@ens-lyon.fr <Samuel.Thibault@ens-lyon.fr>:
  o sound/oss/maestro.c

Tom Rini <trini@bill-the-cat.bloom.county>:
  o PPC32: Fix building of most of the zImage targets
  o PPC32: Fix the rule for using config files from arch/ppc/configs/
    To accommodate the change to scripts/Configure which made it look
    in /boot/config-`uname -r` before looking at
    arch/$(ARCH)/defconfig, change the rule for using a config from
    arch/ppc/configs to copy to .config instead of
    arch/$(ARCH)/defconfig
  o PPC32: Minor PReP OpenPIC fixes from Troy Benjegerdes and Leigh
    Brown
  o Allow the data cache to be turned off on MPC8260 systems
  o PPC32: Move per-board MPC8xx ethernet defines to their respective
    board header
  o PPC32: Fix dependancies in arch/ppc/boot
  o PPC32: Minor fixes with respect to the MPC7450 and MPC7455

Tom Rini <trini@kernel.crashing.org>:
  o PPC32: Update the OpenPIC code to only require a 'linux_irq_offset'
    param
  o PPC32: check the binutils version and make sure it is new enough
  o PPC32: use the proper instruction mnemonics for altivec
    instructions

Vojtech Pavlik <vojtech@twilight.ucw.cz>:
  o Update the gameport drivers to Dave Jones's tree
  o Update the iforce driver to the latest revision (it now lives in a
    separate directory), add twiddler and guillemot drivers.
  o Add new serio modules for PS/2 AUX/KBD
  o Add keyboard, mouse and touchscreen drivers
  o Update the input handler modules to latest versions
  o Makefile/config.in changes to reflect the new drivers
  o Fix button assignments for Saturn and PSX pads
  o Handle input-only keyboard interfaces
  o Handle slowly responding PS/2 mice
  o Use time_after() where applicable
  o Minor cleanup in evdev.c
  o Minor fixes to make the whole thing compile on latest 2.5 and
    kbuild2
  o Add vortex anf fm801 gameport drivers, remove obsolete pcigame
    driver
  o Fix psmouse.c - it needs tqueue.h

Re: linux 2.5.25

[Albert D. Cahalan]

Linus Torvalds writes:

> Right now the x86 timer frequency is set to 1kHz, but that's just another 
> random number. It could be a config option if people really care, but I'd 
> rather just have people argue for or against specific internal frequencies 
> and we'll find something most people are happy with. It's easy to change 
> without user space even noticing now.

You could go by the CPU choice that already exists:

386      -->  100
486      -->  200
Pentium  -->  400
PPro     -->  800
P-III,P4 --> 1600

[patch] Typo fixes in input code

[Brad Hards]

[-- Attachment #1: Type: text/plain, Size: 270 bytes --]

On Sat, 6 Jul 2002 09:54, Linus Torvalds wrote:
> More merges all over the map - ppc, scsi, USB, kbuild, input drivers etc.
Found a few typos in the input changes. Fixup patch attached.

Brad

-- 
http://conf.linux.org.au. 22-25Jan2003. Perth, Australia. Birds in Black.

[-- Attachment #2: inputtypos-2.5.25.patch --]
[-- Type: text/x-diff, Size: 2736 bytes --]

diff -Naur -X dontdiff linux-2.5.25-clean/drivers/input/gameport/Config.help linux-2.5.25-twidler/drivers/input/gameport/Config.help
--- linux-2.5.25-clean/drivers/input/gameport/Config.help	Sat Jul  6 09:42:18 2002
+++ linux-2.5.25-twidler/drivers/input/gameport/Config.help	Sat Jul  6 17:54:26 2002
@@ -34,7 +34,7 @@
   The module will be called lightning.o. If you want to compile it as
   a module, say M here and read <file:Documentation/modules.txt>.
 
-CONFIG_GAMEPORT_EMU10K1
+CONFIG_INPUT_EMU10K1
   Say Y here if you have a SoundBlaster Live! or SoundBlaster
   Audigy card and want to use its gameport.
 
@@ -52,7 +52,7 @@
   The module will be called vortex.o. If you want to compile it as a
   module, say M here and read <file:Documentation/modules.txt>.
 
-CONFIG_GAMEPORT_CS461X
+CONFIG_GAMEPORT_CS461x
   Say Y here if you have a Cirrus CS461x aka "Crystal SoundFusion"
   PCI audio accelerator and want to use its gameport.
 
diff -Naur -X dontdiff linux-2.5.25-clean/drivers/input/joystick/Config.help linux-2.5.25-twidler/drivers/input/joystick/Config.help
--- linux-2.5.25-clean/drivers/input/joystick/Config.help	Sat Jul  6 09:42:03 2002
+++ linux-2.5.25-twidler/drivers/input/joystick/Config.help	Sat Jul  6 17:50:53 2002
@@ -1,4 +1,4 @@
-CONFIG_JOYSTICK
+CONFIG_INPUT_JOYSTICK
   If you have a joystick, 6dof controller, gamepad, steering wheel,
   weapon control system or something like that you can say Y here
   and the list of supported devices will be displayed. This option
diff -Naur -X dontdiff linux-2.5.25-clean/drivers/input/joystick/Config.in linux-2.5.25-twidler/drivers/input/joystick/Config.in
--- linux-2.5.25-clean/drivers/input/joystick/Config.in	Sat Jul  6 09:42:33 2002
+++ linux-2.5.25-twidler/drivers/input/joystick/Config.in	Sat Jul  6 17:49:56 2002
@@ -22,7 +22,7 @@
 dep_tristate '  SpaceTec SpaceOrb/Avenger 6dof controllers' CONFIG_JOYSTICK_SPACEORB $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK $CONFIG_SERIO
 dep_tristate '  SpaceTec SpaceBall 6dof controllers' CONFIG_JOYSTICK_SPACEBALL $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK $CONFIG_SERIO
 dep_tristate '  Gravis Stinger gamepad' CONFIG_JOYSTICK_STINGER $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK $CONFIG_SERIO
-dep_tristate '  Twiddler as as joystick' CONFIG_JOYSTICK_TWIDDLER $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK $CONFIG_SERIO
+dep_tristate '  Twiddler as a joystick' CONFIG_JOYSTICK_TWIDDLER $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK $CONFIG_SERIO
 
 dep_tristate '  Multisystem, Sega Genesis, Saturn joysticks and gamepads' CONFIG_JOYSTICK_DB9 $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK $CONFIG_PARPORT
 dep_tristate '  Multisystem, NES, SNES, N64, PSX joysticks and gamepads' CONFIG_JOYSTICK_GAMECON $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK $CONFIG_PARPORT

Re: linux 2.5.25 (and LVM)

[Matthias Andree]

On Fri, 05 Jul 2002, Linus Torvalds wrote:

> More merges all over the map - ppc, scsi, USB, kbuild, input drivers etc.

Did the LVM guys (are you listening?) tell anything if they were about
to go fix the current 2.5 LVM breakage? Or does EVMS work on 2.5 instead?

Re: [patch] Typo fixes in input code

[James Simmons]

You patch is right except for drivers/input/gameport/Config.help. That was
right before your patch.

   . ---
   |o_o |
   |:_/ |   Give Micro$oft the Bird!!!!
  //   \ \  Use Linux!!!!
 (|     | )
 /'\_   _/`\
 \___)=(___/

On Sat, 6 Jul 2002, Brad Hards wrote:

> On Sat, 6 Jul 2002 09:54, Linus Torvalds wrote:
> > More merges all over the map - ppc, scsi, USB, kbuild, input drivers etc.
> Found a few typos in the input changes. Fixup patch attached.
>
> Brad
>
> --
> http://conf.linux.org.au. 22-25Jan2003. Perth, Australia. Birds in Black.

Re: [patch] Typo fixes in input code

[Brad Hards]

[-- Attachment #1: Type: text/plain, Size: 819 bytes --]

On Sun, 7 Jul 2002 03:48, James Simmons wrote:
> You patch is right except for drivers/input/gameport/Config.help. That was
> right before your patch.
OK. I assumed that Config.in was the authoritative source, and Config.help 
should match. Looks like (based on the Makefile) that I probably should have 
changed it to be CONFIG_GAMEPORT_EMU10K1 in the Config.in. In fact, that 
driver won't ever be built with vanilla 2.5.25, with or without the previous 
patch

BK already has the previous change applied, so this in an incremental diff:

<bk text>
EMU10K1 build fix

Revert the CONFIG_INPUT_EMU10K1 change to drivers/input/gameport/Config.help, 
and change drivers/input/gameport/Config.in to use CONFIG_GAMEPORT_EMU10K1
</bk text> 

Brad
-- 
http://conf.linux.org.au. 22-25Jan2003. Perth, Australia. Birds in Black.

[-- Attachment #2: EMU10K1-typo.patch --]
[-- Type: text/x-diff, Size: 1623 bytes --]

diff -Naur -X dontdiff linux-2.5.25-inputtypos1/drivers/input/gameport/Config.help linux-2.5.25-inputtypos2/drivers/input/gameport/Config.help
--- linux-2.5.25-inputtypos1/drivers/input/gameport/Config.help	Sun Jul  7 12:19:47 2002
+++ linux-2.5.25-inputtypos2/drivers/input/gameport/Config.help	Sun Jul  7 12:18:56 2002
@@ -34,7 +34,7 @@
   The module will be called lightning.o. If you want to compile it as
   a module, say M here and read <file:Documentation/modules.txt>.
 
-CONFIG_INPUT_EMU10K1
+CONFIG_GAMEPORT_EMU10K1
   Say Y here if you have a SoundBlaster Live! or SoundBlaster
   Audigy card and want to use its gameport.
 
diff -Naur -X dontdiff linux-2.5.25-inputtypos1/drivers/input/gameport/Config.in linux-2.5.25-inputtypos2/drivers/input/gameport/Config.in
--- linux-2.5.25-inputtypos1/drivers/input/gameport/Config.in	Sat Jul  6 09:42:01 2002
+++ linux-2.5.25-inputtypos2/drivers/input/gameport/Config.in	Sun Jul  7 12:18:56 2002
@@ -13,7 +13,7 @@
 
 dep_tristate '  Classic ISA and PnP gameport support' CONFIG_GAMEPORT_NS558 $CONFIG_GAMEPORT
 dep_tristate '  PDPI Lightning 4 gamecard support' CONFIG_GAMEPORT_L4 $CONFIG_GAMEPORT
-dep_tristate '  SB Live and Audigy gameport support' CONFIG_INPUT_EMU10K1 $CONFIG_GAMEPORT
+dep_tristate '  SB Live and Audigy gameport support' CONFIG_GAMEPORT_EMU10K1 $CONFIG_GAMEPORT
 dep_tristate '  Aureal Vortex, Vortex 2 gameport support' CONFIG_GAMEPORT_VORTEX $CONFIG_GAMEPORT
 dep_tristate '  ForteMedia FM801 gameport support' CONFIG_GAMEPORT_FM801 $CONFIG_GAMEPORT
 dep_tristate '  Crystal SoundFusion gameport support' CONFIG_GAMEPORT_CS461x $CONFIG_GAMEPORT

Re: linux 2.5.25

[Tim Pepper]

On Fri 05 Jul at 16:54:20 -0700 torvalds@transmeta.com done said:
> 
> The other thing that we should sort out eventually is the unified naming
> for disk devices, now that both IDE and SCSI are starting to have some
> support for driverfs.  Let's make sure that we _can_ have sane ways of
> accessing a disk, without having to care whether it is IDE or SCSI or
> anything else.

...and a way that scales better when naming large numbers of disks than
disk_name()'s stuff like:
     sprintf(buf, "sd%c%c", 'a' + unit / 26, 'a' + unit % 26);


t.

Re: linux 2.5.25 (and LVM)

[Alexander Viro]

On Mon, 8 Jul 2002, Joe Thornber wrote:

> On Sat, Jul 06, 2002 at 03:54:12PM +0200, Matthias Andree wrote:
> > On Fri, 05 Jul 2002, Linus Torvalds wrote:
> > 
> > > More merges all over the map - ppc, scsi, USB, kbuild, input drivers etc.
> > 
> > Did the LVM guys (are you listening?) tell anything if they were about
> > to go fix the current 2.5 LVM breakage? Or does EVMS work on 2.5 instead?
> 
> I'll say this yet again:
> 
> Heinz Mauelshagen is maintaining LVM1.0.x on 2.4 kernels.  This is for
> bug fixes only, no new features will be added.
> 
> Alasdair Kergon, Patrick Caulfield and myself are working on the more
> generic device-mapper driver for both 2.4/2.5.  Initially we have
> concentrated on 2.4, this driver is now very stable IMO (I would
> certainly trust my data to it in preference to LVM1).
> 
> I will post a URL to the 2.5 patch at some point this week.
> 
> There is no intention to maintain the broken design that is LVM1 in
> the 2.5 series - we do not have the spare resources to waste.

All right.  So how about removing it from the tree?  It's broken; it
won't be fixed; it's abandoned by maintainers (and $DEITY witness,
there is a lot of very good reasons for that); there's nobody who
would be able and willing to pick it.  What's the point of keeping
the damn thing in the tree?

Could you (or Heinz) submit the patch removing it from 2.5?

Re: linux 2.5.25 (and LVM)

[Joe Thornber]

On Sat, Jul 06, 2002 at 03:54:12PM +0200, Matthias Andree wrote:
> On Fri, 05 Jul 2002, Linus Torvalds wrote:
> 
> > More merges all over the map - ppc, scsi, USB, kbuild, input drivers etc.
> 
> Did the LVM guys (are you listening?) tell anything if they were about
> to go fix the current 2.5 LVM breakage? Or does EVMS work on 2.5 instead?

I'll say this yet again:

Heinz Mauelshagen is maintaining LVM1.0.x on 2.4 kernels.  This is for
bug fixes only, no new features will be added.

Alasdair Kergon, Patrick Caulfield and myself are working on the more
generic device-mapper driver for both 2.4/2.5.  Initially we have
concentrated on 2.4, this driver is now very stable IMO (I would
certainly trust my data to it in preference to LVM1).

I will post a URL to the 2.5 patch at some point this week.

There is no intention to maintain the broken design that is LVM1 in
the 2.5 series - we do not have the spare resources to waste.

- Joe

Re: [patch] Typo fixes in input code

[Vojtech Pavlik]

On Sun, Jul 07, 2002 at 12:22:48PM +1000, Brad Hards wrote:
> On Sun, 7 Jul 2002 03:48, James Simmons wrote:
> > You patch is right except for drivers/input/gameport/Config.help. That was
> > right before your patch.
> OK. I assumed that Config.in was the authoritative source, and Config.help 
> should match. Looks like (based on the Makefile) that I probably should have 
> changed it to be CONFIG_GAMEPORT_EMU10K1 in the Config.in. In fact, that 
> driver won't ever be built with vanilla 2.5.25, with or without the previous 
> patch
> 
> BK already has the previous change applied, so this in an incremental diff:
> 
> <bk text>
> EMU10K1 build fix
> 
> Revert the CONFIG_INPUT_EMU10K1 change to drivers/input/gameport/Config.help, 
> and change drivers/input/gameport/Config.in to use CONFIG_GAMEPORT_EMU10K1
> </bk text> 

Thanks, applied.


-- 
Vojtech Pavlik
SuSE Labs

[PATCH] 2.5.25 end_request trivia

[Martin Dalecki]

[-- Attachment #1: Type: text/plain, Size: 286 bytes --]

The following patch does the following:

1. Make airo include tqueue.h, which is needed to make this driver
compile at all again.

2. Adjust aztcd.c and sonycd535.c to the recent end_request() signature
changes.

The patch is against 2.5.24, but still applies cleanly on top of 2.5.25.

[-- Attachment #2: misc-2.5.24.diff --]
[-- Type: text/plain, Size: 2105 bytes --]

diff -urN linux-2.5.24/drivers/cdrom/aztcd.c linux/drivers/cdrom/aztcd.c
--- linux-2.5.24/drivers/cdrom/aztcd.c	2002-06-21 00:53:56.000000000 +0200
+++ linux/drivers/cdrom/aztcd.c	2002-06-23 20:12:27.000000000 +0200
@@ -2083,12 +2083,12 @@
 				}
 				azt_state = AZT_S_IDLE;
 				while (current_valid())
-					end_request(0);
+					end_request(CURRENT, 0);
 				return;
 			}
 
 /*	  if (aztSendCmd(ACMD_SET_MODE)) RETURN("azt_poll 3");
-	  outb(0x01, DATA_PORT);          
+	  outb(0x01, DATA_PORT);
 	  PA_OK;
 	  STEN_LOW;
 */
@@ -2138,7 +2138,7 @@
 				}
 				azt_state = AZT_S_IDLE;
 				while (current_valid())
-					end_request(0);
+					end_request(CURRENT, 0);
 				return;
 			}
 
@@ -2236,7 +2236,7 @@
 						break;
 					}
 					if (current_valid())
-						end_request(0);
+						end_request(CURRENT, 0);
 					AztTries = 5;
 				}
 				azt_state = AZT_S_START;
diff -urN linux-2.5.24/drivers/cdrom/sonycd535.c linux/drivers/cdrom/sonycd535.c
--- linux-2.5.24/drivers/cdrom/sonycd535.c	2002-06-21 00:53:49.000000000 +0200
+++ linux/drivers/cdrom/sonycd535.c	2002-06-23 20:12:27.000000000 +0200
@@ -805,14 +805,8 @@
 	Byte cmd[2];
 
 	while (1) {
-		/*
-		 * The beginning here is stolen from the hard disk driver.  I hope
-		 * it's right.
-		 */
-		if (blk_queue_empty(QUEUE)) {
-			CLEAR_INTR;
+		if (blk_queue_empty(QUEUE))
 			return;
-		}
 
 		dev = minor(CURRENT->rq_dev);
 		block = CURRENT->sector;
@@ -828,7 +822,6 @@
 				 * If the block address is invalid or the request goes beyond the end of
 				 * the media, return an error.
 				 */
-				
 				if (sony_toc->lead_out_start_lba <= (block / 4)) {
 					end_request(CURRENT, 0);
 					return;
diff -urN linux-2.5.24/drivers/net/wireless/airo.c linux/drivers/net/wireless/airo.c
--- linux-2.5.24/drivers/net/wireless/airo.c	2002-06-21 00:53:45.000000000 +0200
+++ linux/drivers/net/wireless/airo.c	2002-06-23 18:25:56.000000000 +0200
@@ -32,6 +32,7 @@
 #include <linux/timer.h>
 #include <linux/interrupt.h>
 #include <linux/in.h>
+#include <linux/tqueue.h>
 #include <asm/io.h>
 #include <asm/system.h>
 #include <asm/bitops.h>