[parisc-linux-cvs] Apply Grant's fix to ccio.

[Ryan Bradetich]

--=-ncbjXDnWyArlUmoZiNuB
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

This patch does the following:

	* Fix the bug Grant fixed in -pa5 in ccio-dma.c	
	* Bump kernel to -pa6

- Ryan



--=-ncbjXDnWyArlUmoZiNuB
Content-Disposition: attachment; filename=ccio-dma.diff
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=ISO-8859-1

Index: Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /var/cvs/linux/Makefile,v
retrieving revision 1.210
diff -u -p -r1.210 Makefile
--- Makefile	2001/11/30 03:53:06	1.210
+++ Makefile	2001/12/01 01:54:43
@@ -1,7 +1,7 @@
 VERSION =3D 2
 PATCHLEVEL =3D 4
 SUBLEVEL =3D 16
-EXTRAVERSION =3D -pa5
+EXTRAVERSION =3D -pa6
=20
 KERNELRELEASE=3D$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
=20
Index: arch/parisc/kernel/ccio-dma.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /var/cvs/linux/arch/parisc/kernel/ccio-dma.c,v
retrieving revision 1.47
diff -u -p -r1.47 ccio-dma.c
--- arch/parisc/kernel/ccio-dma.c	2001/11/17 02:07:46	1.47
+++ arch/parisc/kernel/ccio-dma.c	2001/12/01 01:54:44
@@ -908,7 +908,8 @@ ccio_coalesce_chunks(struct ioc *ioc, st
 			** exceed DMA_CHUNK_SIZE if we coalesce the
 			** next entry.
 			*/  =20
-			if (dma_len + startsg->length > DMA_CHUNK_SIZE)
+			if(ROUNDUP(dma_len + dma_offset + startsg->length,
+				   IOVP_SIZE) > DMA_CHUNK_SIZE)
 				break;
=20
 			/*

--=-ncbjXDnWyArlUmoZiNuB--