Module Name: src
Committed By: riastradh
Date: Sun Dec 19 11:07:20 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/ttm: ttm_bo.c ttm_memory.c
Log Message:
drm/ttm: Omit spurious kfree in global failure branches.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c
cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/drm2/dist/drm/ttm/ttm_memory.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/ttm/ttm_bo.c
diff -u src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c:1.25 src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c:1.26
--- src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c:1.25 Sun Dec 19 11:07:04 2021
+++ src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c Sun Dec 19 11:07:20 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ttm_bo.c,v 1.25 2021/12/19 11:07:04 riastradh Exp $ */
+/* $NetBSD: ttm_bo.c,v 1.26 2021/12/19 11:07:20 riastradh Exp $ */
/* SPDX-License-Identifier: GPL-2.0 OR MIT */
/**************************************************************************
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ttm_bo.c,v 1.25 2021/12/19 11:07:04 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ttm_bo.c,v 1.26 2021/12/19 11:07:20 riastradh Exp $");
#define pr_fmt(fmt) "[TTM] " fmt
@@ -1656,7 +1656,6 @@ static void ttm_bo_global_release(void)
spin_lock_destroy(&glob->lru_lock);
mutex_unlock(&ttm_global_mutex);
mutex_destroy(&ttm_global_mutex);
- kfree(glob);
return;
#endif
out:
Index: src/sys/external/bsd/drm2/dist/drm/ttm/ttm_memory.c
diff -u src/sys/external/bsd/drm2/dist/drm/ttm/ttm_memory.c:1.8 src/sys/external/bsd/drm2/dist/drm/ttm/ttm_memory.c:1.9
--- src/sys/external/bsd/drm2/dist/drm/ttm/ttm_memory.c:1.8 Sun Dec 19 10:29:08 2021
+++ src/sys/external/bsd/drm2/dist/drm/ttm/ttm_memory.c Sun Dec 19 11:07:20 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ttm_memory.c,v 1.8 2021/12/19 10:29:08 riastradh Exp $ */
+/* $NetBSD: ttm_memory.c,v 1.9 2021/12/19 11:07:20 riastradh Exp $ */
/* SPDX-License-Identifier: GPL-2.0 OR MIT */
/**************************************************************************
@@ -29,7 +29,7 @@
**************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ttm_memory.c,v 1.8 2021/12/19 10:29:08 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ttm_memory.c,v 1.9 2021/12/19 11:07:20 riastradh Exp $");
#define pr_fmt(fmt) "[TTM] " fmt
@@ -503,9 +503,7 @@ void ttm_mem_global_release(struct ttm_m
kobject_put(&zone->kobj);
#endif
}
-#ifdef __NetBSD__
- kfree(glob);
-#else
+#ifndef __NetBSD__
kobject_del(&glob->kobj);
kobject_put(&glob->kobj);
#endif
