Module Name: src
Committed By: riastradh
Date: Thu Jul 17 21:14:24 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_gem_stolen.c
Log Message:
Don't double-free obj->pages, with two different allocators to boot!
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_stolen.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_stolen.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_stolen.c:1.2 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_stolen.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_stolen.c:1.2 Wed Jul 16 20:56:24 2014
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_stolen.c Thu Jul 17 21:14:24 2014
@@ -302,8 +302,8 @@ static void i915_gem_object_put_pages_st
kmem_free(obj->pages, (obj->igo_nsegs * sizeof(obj->pages[0])));
#else
sg_free_table(obj->pages);
-#endif
kfree(obj->pages);
+#endif
}
static const struct drm_i915_gem_object_ops i915_gem_object_stolen_ops = {
