public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* Re: PATCH: __NO_VERSION__ and remove a bogomacro from drm
  2003-03-21 19:20 PATCH: __NO_VERSION__ and remove a bogomacro from drm Alan Cox
@ 2003-03-21 18:41 ` Dave Jones
  0 siblings, 0 replies; 2+ messages in thread
From: Dave Jones @ 2003-03-21 18:41 UTC (permalink / raw)
  To: Alan Cox; +Cc: linux-kernel, torvalds

On Fri, Mar 21, 2003 at 07:20:51PM +0000, Alan Cox wrote:

 > @@ -40,12 +39,6 @@
 >  #include <linux/interrupt.h>	/* For task queue support */
 >  #include <linux/delay.h>
 >  
 > -#ifdef DO_MUNMAP_4_ARGS
 > -#define DO_MUNMAP(m, a, l)	do_munmap(m, a, l, 1)
 > -#else
 > -#define DO_MUNMAP(m, a, l)	do_munmap(m, a, l)
 > -#endif
 > -
 >  #define I830_BUF_FREE		2
 >  #define I830_BUF_CLIENT		1
 >  #define I830_BUF_HARDWARE      	0
 > @@ -230,7 +223,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);
 > -

already applied in -bk

		Dave


^ permalink raw reply	[flat|nested] 2+ messages in thread
* PATCH: __NO_VERSION__ and remove a bogomacro from drm
@ 2003-03-21 19:20 Alan Cox
  2003-03-21 18:41 ` Dave Jones
  0 siblings, 1 reply; 2+ messages in thread
From: Alan Cox @ 2003-03-21 19:20 UTC (permalink / raw)
  To: linux-kernel, torvalds

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.5.65/drivers/char/drm/i830_dma.c linux-2.5.65-ac2/drivers/char/drm/i830_dma.c
--- linux-2.5.65/drivers/char/drm/i830_dma.c	2003-02-10 18:37:58.000000000 +0000
+++ linux-2.5.65-ac2/drivers/char/drm/i830_dma.c	2003-03-14 00:52:15.000000000 +0000
@@ -31,7 +31,6 @@
  *
  */
 
-#define __NO_VERSION__
 #include "i830.h"
 #include "drmP.h"
 #include "drm.h"
@@ -40,12 +39,6 @@
 #include <linux/interrupt.h>	/* For task queue support */
 #include <linux/delay.h>
 
-#ifdef DO_MUNMAP_4_ARGS
-#define DO_MUNMAP(m, a, l)	do_munmap(m, a, l, 1)
-#else
-#define DO_MUNMAP(m, a, l)	do_munmap(m, a, l)
-#endif
-
 #define I830_BUF_FREE		2
 #define I830_BUF_CLIENT		1
 #define I830_BUF_HARDWARE      	0
@@ -230,7 +223,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);

^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2003-03-21 18:32 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2003-03-21 19:20 PATCH: __NO_VERSION__ and remove a bogomacro from drm Alan Cox
2003-03-21 18:41 ` Dave Jones

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox