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

[Ryan Bradetich]

This really got bumped to -pa8 ... (someone else and I apparently
committed at the same time :))

- Ryan

On Fri, 2001-11-30 at 18:57, Ryan Bradetich wrote:
> This patch does the following:
> 
> 	* Fix the bug Grant fixed in -pa5 in ccio-dma.c	
> 	* Bump kernel to -pa6
> 
> - Ryan
> 
> 
> ----
> 

> Index: Makefile
> ===================================================================
> 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 = 2
>  PATCHLEVEL = 4
>  SUBLEVEL = 16
> -EXTRAVERSION = -pa5
> +EXTRAVERSION = -pa6
>  
>  KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
>  
> Index: arch/parisc/kernel/ccio-dma.c
> ===================================================================
> 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.
>  			*/   
> -			if (dma_len + startsg->length > DMA_CHUNK_SIZE)
> +			if(ROUNDUP(dma_len + dma_offset + startsg->length,
> +				   IOVP_SIZE) > DMA_CHUNK_SIZE)
>  				break;
>  
>  			/*