BUG, trident.c doesn't compile in 2.5.31

hi, couldn't find a bug report in the archive.
I tried to compile the kernel with the trident-support in OSS.

I got this message:

make[2]: Wechsel in das Verzeichnis Verzeichnis »/usr/src/linux-2.5.31/sound/oss«
gcc -Wp,-MD,./.trident.o.d -D__KERNEL__ -I/usr/src/linux-2.5.31/include
-Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=i686 -malign-functions=4 -nostdinc -iwithprefix include -DMODULE -include /usr/src/linux-2.5.31/include/linux/modversions.h
-DKBUILD_BASENAME=trident -c -o trident.o trident.c
trident.c:2153: macro synchronize_irq' used without args trident.c:2160: macro synchronize_irq' used without args make[2]: *** [trident.o] Fehler 1
make[2]: Verlassen des Verzeichnisses Verzeichnis »/usr/src/linux-2.5.31/sound/oss«
make[1]: *** [oss] Fehler 2
make[1]: Verlassen des Verzeichnisses Verzeichnis »/usr/src/linux-2.5.31/sound«
make: *** [sound] Fehler 2

Martin Koebele

here's a patch to fix it, which I've sent to rusty's trivial patch monkey and should make it to a kernel near you.

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas:
# ChangeSet 1.488 -> 1.489
# sound/oss/trident.c 1.25 -> 1.26
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/08/17 [email protected] 1.489

# fix synchronize_irq which now takes an 'irq' argument. 
# --------------------------------------------
#
diff -Nru a/sound/oss/trident.c b/sound/oss/trident.c
--- a/sound/oss/trident.c	Sat Aug 17 11:13:34 2002
+++ b/sound/oss/trident.c	Sat Aug 17 11:13:34 2002
@@ -2150,14 +2150,14 @@
 		/* FIXME: spin_lock ? */
 		if (file->f_mode & FMODE_WRITE) {
 			stop_dac(state);
-			synchronize_irq();
+			synchronize_irq(card->irq);
 			dmabuf->ready = 0;
 			dmabuf->swptr = dmabuf->hwptr = 0;
 			dmabuf->count = dmabuf->total_bytes = 0;
 		}
 		if (file->f_mode & FMODE_READ) {
 			stop_adc(state);
-			synchronize_irq();
+			synchronize_irq(card->irq);
 			dmabuf->ready = 0;
 			dmabuf->swptr = dmabuf->hwptr = 0;
 			dmabuf->count = dmabuf->total_bytes = 0;

calm down, it's *only* ones and zeros. 

http://syscalltrack.sf.net/
http://vipe.technion.ac.il/~mulix/