Re: [Dri-devel] Kernel back-merge ...

[Linus T. <tor...@os...>]

[ Following up to myself. Damn, I hate when that happens. It's a sign of 
  early senility when you start talking to yourself, and it happens all
  too often for me ; ]

One chunk of the "whitespace" fixes wasn't whitespace, it was due to the 
2.6.x tree not having some of the backwards compatibility crud. 

So before applying that part, just edit out the one chunk that changes
DO_MUNMAP to do_munmap and apply the rest (that chunk appended here for
clarity).

Sorry for missing that on editing the patch. My bad.

		Linus

On Thu, 25 Sep 2003, Linus Torvalds wrote:
> 
> ###
> ###  Various whitespace fixes: don't mix spaces and tabs
> ###  at the beginning of lines
> ###
> 
> diff -u dri-kernel/i810_dma.c v2.5/linux/drivers/char/drm/i810_dma.c
> --- dri-kernel/i810_dma.c	2003-08-14 18:05:24.000000000 -0700
> +++ v2.5/linux/drivers/char/drm/i810_dma.c	2003-09-24 17:10:18.000000000 -0700
> @@ -194,7 +187,7 @@
>  		return -EINVAL;
>  
>  	down_write(&current->mm->mmap_sem);
> -	retcode = DO_MUNMAP(current->mm,
> +	retcode = do_munmap(current->mm,
>  			    (unsigned long)buf_priv->virtual,
>  			    (size_t) buf->total);
>  	up_write(&current->mm->mmap_sem);