r2844 - trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches

Simon Horman horms@costa.debian.org
Tue, 29 Mar 2005 01:00:26 +0000


Author: horms
Date: 2005-03-29 01:00:25 +0000 (Tue, 29 Mar 2005)
New Revision: 2844

Modified:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/radeon-race-2.dpatch
Log:
Fix for radeon fix...

Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/radeon-race-2.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/radeon-race-2.dpatch	2005-03-28 15:22:29 UTC (rev 2843)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/radeon-race-2.dpatch	2005-03-29 01:00:25 UTC (rev 2844)
@@ -16,7 +16,7 @@
  	orig_bufsz = cmdbuf.bufsz;
  	if (orig_bufsz != 0) {
 -		kbuf = drm_alloc(cmdbuf.bufsz, DRM_MEM_DRIVER);
-+		kbuf = DRM_ALLOC(cmdbuf.bufsz);
++		kbuf = DRM_MALLOC(cmdbuf.bufsz);
  		if (kbuf == NULL)
  			return DRM_ERR(ENOMEM);
  		if (DRM_COPY_FROM_USER(kbuf, cmdbuf.buf, cmdbuf.bufsz))
@@ -25,7 +25,7 @@
  
  	if (orig_bufsz != 0)
 -		drm_free(kbuf, orig_bufsz, DRM_MEM_DRIVER);
-+		DRM_FREE(kbuf, orig_bufsz, DRM_MEM_DRIVER);
++		DRM_FREE(kbuf, orig_bufsz);
  
  	DRM_DEBUG("DONE\n");
  	COMMIT_RING();
@@ -34,7 +34,7 @@
  err:
  	if (orig_bufsz != 0)
 -		drm_free(kbuf, orig_bufsz, DRM_MEM_DRIVER);
-+		DRM_FREE(kbuf, orig_bufsz, DRM_MEM_DRIVER);
++		DRM_FREE(kbuf, orig_bufsz);
  	return DRM_ERR(EINVAL);
  }