[Merge] I have add some changes from 2.4.17-pre1 to 2.5.1-pre11

[Merge] I have add some changes from 2.4.17-pre1 to 2.5.1-pre11

[Nicolas Vollmar]

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

I hope some people can test this.
(I do not have much experience in this...)

Merge with 2.4.17-pre1

- Add buggy 440GX to broken pirq blacklist 	(Arjan Van de Ven)
- Added missing MODULE_LICENSE("GPL") in some   (Andreas Krennmair)
  modules
- Fix i810 sound driver problems		(Andris Pavenis)
- Add new entry to Sound blaster ISAPNP list	(Arjan Van de Ven)
- Updated URL for bigphysmem patch in v4l docs  (Adrian Bunk)

Nicolas


[-- Attachment #2: 2.5.1-pre11-merge.diff --]
[-- Type: text/x-diff, Size: 5339 bytes --]

diff -Nur linux/Documentation/video4linux/Zoran linux-2.5.1-pre11/Documentation/video4linux/Zoran
--- linux/Documentation/video4linux/Zoran	Wed Jul  4 23:41:33 2001
+++ linux-2.5.1-pre11/Documentation/video4linux/Zoran	Sat Dec 15 19:19:11 2001
@@ -160,9 +160,9 @@
   set aside the necessary memory during boot time. There seem to be
   several versions of this patch against various kernel versions
   floating around in the net, you may obtain one e.g. from:
-  http://www.polyware.nl/~middelin/patch/bigphysarea-2.2.1.tar.gz You
-  also have to compile your driver AFTER installing that patch in order
-  to get it working
++  http://www.polyware.nl/~middelin/hob-v4l.html#bigphysarea
++  You also have to compile your driver AFTER installing that patch in
++  order to get it working
 
   or
 
diff -Nur linux/arch/i386/kernel/dmi_scan.c linux-2.5.1-pre11/arch/i386/kernel/dmi_scan.c
--- linux/arch/i386/kernel/dmi_scan.c	Sat Dec 15 19:17:49 2001
+++ linux-2.5.1-pre11/arch/i386/kernel/dmi_scan.c	Sat Dec 15 19:20:49 2001
@@ -572,6 +572,11 @@
 			MATCH(DMI_BIOS_VERSION,"L440GX0.86B.0094.P10"),
 			NO_MATCH, NO_MATCH
                         } },
+	{ broken_pirq, "l44GX Bios", {        		/* Bad $PIR */
+			MATCH(DMI_BIOS_VENDOR, "Intel Corporation"),
+			MATCH(DMI_BIOS_VERSION,"L440GX0.86B.0120.P12"),
+			NO_MATCH, NO_MATCH
+                        } },
 	{ broken_pirq, "l44GX Bios", {		/* Bad $PIR */
 			MATCH(DMI_BIOS_VENDOR, "Intel Corporation"),
 			MATCH(DMI_BIOS_VERSION,"L440GX0.86B.0125.P13"),
diff -Nur linux/drivers/sound/i810_audio.c linux-2.5.1-pre11/drivers/sound/i810_audio.c
--- linux/drivers/sound/i810_audio.c	Fri Nov  9 23:07:41 2001
+++ linux-2.5.1-pre11/drivers/sound/i810_audio.c	Sat Dec 15 19:24:21 2001
@@ -1405,10 +1405,9 @@
 		if (dmabuf->count < 0) {
 			dmabuf->count = 0;
 		}
-		cnt = dmabuf->dmasize - dmabuf->fragsize - dmabuf->count;
-		// this is to make the copy_from_user simpler below
-		if(cnt > (dmabuf->dmasize - swptr))
-			cnt = dmabuf->dmasize - swptr;
+		cnt = dmabuf->dmasize - swptr;
+		if(cnt > (dmabuf->dmasize - dmabuf->count))
+			cnt = dmabuf->dmasize - dmabuf->count;
 		spin_unlock_irqrestore(&state->card->lock, flags);
 
 #ifdef DEBUG2
@@ -1419,16 +1418,13 @@
 		if (cnt <= 0) {
 			unsigned long tmo;
 			// There is data waiting to be played
+			i810_update_lvi(state,0);
 			if(!dmabuf->enable && dmabuf->count) {
 				/* force the starting incase SETTRIGGER has been used */
 				/* to stop it, otherwise this is a deadlock situation */
 				dmabuf->trigger |= PCM_ENABLE_OUTPUT;
 				start_dac(state);
 			}
-			// Update the LVI pointer in case we have already
-			// written data in this syscall and are just waiting
-			// on the tail bit of data
-			i810_update_lvi(state,0);
 			if (file->f_flags & O_NONBLOCK) {
 				if (!ret) ret = -EAGAIN;
 				goto ret;
@@ -1860,7 +1856,7 @@
 		if(dmabuf->mapped)
 			abinfo.bytes = dmabuf->count;
 		else
-			abinfo.bytes = dmabuf->dmasize - dmabuf->count;
+			abinfo.bytes = dmabuf->dmasize - dmabuf->fragsize - dmabuf->count;
 		abinfo.fragments = abinfo.bytes / dmabuf->userfragsize;
 		spin_unlock_irqrestore(&state->card->lock, flags);
 #ifdef DEBUG
diff -Nur linux/drivers/sound/sb_card.c linux-2.5.1-pre11/drivers/sound/sb_card.c
--- linux/drivers/sound/sb_card.c	Sat Dec 15 19:17:51 2001
+++ linux-2.5.1-pre11/drivers/sound/sb_card.c	Sat Dec 15 19:26:26 2001
@@ -347,7 +347,7 @@
 		ISAPNP_VENDOR('C','T','L'), ISAPNP_FUNCTION(0x0043),
 		0,0,0,0,
 		0,1,1,-1},
-	{"Sound Blaster AWE 32", 
+	{"Sound Blaster AWE 32",
 		ISAPNP_VENDOR('C','T','L'), ISAPNP_DEVICE(0x0039), 
 		ISAPNP_VENDOR('C','T','L'), ISAPNP_FUNCTION(0x0031),
 		0,0,0,0,
@@ -369,6 +369,11 @@
 		0,1,1,-1},
         {"Sound Blaster AWE 32",
 		ISAPNP_VENDOR('C','T','L'), ISAPNP_DEVICE(0x0045),
+		ISAPNP_VENDOR('C','T','L'), ISAPNP_FUNCTION(0x0031),
+		0,0,0,0,
+		0,1,1,-1},
+	{"Sound Blaster AWE 32",
+		ISAPNP_VENDOR('C','T','L'), ISAPNP_DEVICE(0x0047),
 		ISAPNP_VENDOR('C','T','L'), ISAPNP_FUNCTION(0x0031),
 		0,0,0,0,
 		0,1,1,-1},
diff -Nur linux/fs/inflate_fs/inflate_syms.c linux-2.5.1-pre11/fs/inflate_fs/inflate_syms.c
--- linux/fs/inflate_fs/inflate_syms.c	Thu Oct 25 22:53:53 2001
+++ linux-2.5.1-pre11/fs/inflate_fs/inflate_syms.c	Sat Dec 15 19:27:20 2001
@@ -19,3 +19,4 @@
 EXPORT_SYMBOL(zlib_fs_inflateReset);
 EXPORT_SYMBOL(zlib_fs_adler32);
 EXPORT_SYMBOL(zlib_fs_inflateSyncPoint);
+MODULE_LICENSE("GPL");
diff -Nur linux/fs/msdos/msdosfs_syms.c linux-2.5.1-pre11/fs/msdos/msdosfs_syms.c
--- linux/fs/msdos/msdosfs_syms.c	Mon Mar 13 21:35:39 2000
+++ linux-2.5.1-pre11/fs/msdos/msdosfs_syms.c	Sat Dec 15 19:27:41 2001
@@ -40,3 +40,4 @@
 
 module_init(init_msdos_fs)
 module_exit(exit_msdos_fs)
+MODULE_LICENSE("GPL");
diff -Nur linux/fs/vfat/vfatfs_syms.c linux-2.5.1-pre11/fs/vfat/vfatfs_syms.c
--- linux/fs/vfat/vfatfs_syms.c	Fri Oct 12 22:48:42 2001
+++ linux-2.5.1-pre11/fs/vfat/vfatfs_syms.c	Sat Dec 15 19:28:02 2001
@@ -33,3 +33,4 @@
 
 module_init(init_vfat_fs)
 module_exit(exit_vfat_fs)
+MODULE_LICENSE("GPL");
diff -Nur linux/net/packet/af_packet.c linux-2.5.1-pre11/net/packet/af_packet.c
--- linux/net/packet/af_packet.c	Wed Oct 31 00:08:12 2001
+++ linux-2.5.1-pre11/net/packet/af_packet.c	Sat Dec 15 19:28:28 2001
@@ -1902,3 +1902,4 @@
 
 module_init(packet_init);
 module_exit(packet_exit);
+MODULE_LICENSE("GPL");

Re: [Merge] I have add some changes from 2.4.17-pre1 to 2.5.1-pre11

[Dave Jones]

On Sat, 15 Dec 2001, Nicolas Vollmar wrote:

> Merge with 2.4.17-pre1

pre1 was the easy one (no rejects) 8-)
Theres a patch right up to -rc1[*] available at
http://www.codemonkey.org.uk/patches/2.5/

regards,
Dave.

[*] But without the bits that don't make sense to apply.

-- 
| Dave Jones.        http://www.codemonkey.org.uk
| SuSE Labs