Bug#301488: kernel-source-2.6.8: fails to compile; undefined reference to `drm_free'

[Horms <horms@debian.org>]

reassign 301528 kernel-source-2.6.8
tag 301488 +pending
tag 301528 +pending
severity 301488 critical
severity 301528 critical
merge 301528 301488
thanks


Hi,

thanks to all who reported the drm_free/drm_alloc symbol problem.
The following patch should resolve the problem.
It is now in SVN and should appear in the next release.
Please feel free to test.

-- 
Horms

#! /bin/sh -e
## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Description: drm: sumbol fix for race fix patch
## DP: Patch author: Horms <horms@debian.org>
## DP: Upstream status: not suitable for upstream

. $(dirname $0)/DPATCH

@DPATCH@
--- a/drivers/char/drm/radeon_state.c	2005-03-28 17:10:39.000000000 +0900
+++ b/drivers/char/drm/radeon_state.c	2005-03-28 17:11:16.000000000 +0900
@@ -2313,7 +2313,7 @@
 	 */
 	orig_bufsz = cmdbuf.bufsz;
 	if (orig_bufsz != 0) {
-		kbuf = drm_alloc(cmdbuf.bufsz, DRM_MEM_DRIVER);
+		kbuf = DRM_ALLOC(cmdbuf.bufsz);
 		if (kbuf == NULL)
 			return DRM_ERR(ENOMEM);
 		if (DRM_COPY_FROM_USER(kbuf, cmdbuf.buf, cmdbuf.bufsz))
@@ -2413,7 +2413,7 @@
 	}
 
 	if (orig_bufsz != 0)
-		drm_free(kbuf, orig_bufsz, DRM_MEM_DRIVER);
+		DRM_FREE(kbuf, orig_bufsz, DRM_MEM_DRIVER);
 
 	DRM_DEBUG("DONE\n");
 	COMMIT_RING();
@@ -2421,7 +2421,7 @@
 
 err:
 	if (orig_bufsz != 0)
-		drm_free(kbuf, orig_bufsz, DRM_MEM_DRIVER);
+		DRM_FREE(kbuf, orig_bufsz, DRM_MEM_DRIVER);
 	return DRM_ERR(EINVAL);
 }