From owner-svn-src-head@FreeBSD.ORG Fri Mar 8 18:11:03 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 684D875C; Fri, 8 Mar 2013 18:11:03 +0000 (UTC) (envelope-from dumbbell@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 5AC89B33; Fri, 8 Mar 2013 18:11:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r28IB3J2009021; Fri, 8 Mar 2013 18:11:03 GMT (envelope-from dumbbell@svn.freebsd.org) Received: (from dumbbell@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r28IB2JI009017; Fri, 8 Mar 2013 18:11:02 GMT (envelope-from dumbbell@svn.freebsd.org) Message-Id: <201303081811.r28IB2JI009017@svn.freebsd.org> From: Jean-Sebastien Pedron Date: Fri, 8 Mar 2013 18:11:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r248060 - in head/sys/dev/drm2: . ttm X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Mar 2013 18:11:03 -0000 Author: dumbbell Date: Fri Mar 8 18:11:02 2013 New Revision: 248060 URL: http://svnweb.freebsd.org/changeset/base/248060 Log: drm: Fix a call to free(9) with an incorrect malloc type While here, the call to free(9) is moved to drm_global.c, near the initial malloc(9). Reviewed by: Konstantin Belousov (kib@) Modified: head/sys/dev/drm2/drm_global.c head/sys/dev/drm2/ttm/ttm_bo.c head/sys/dev/drm2/ttm/ttm_memory.c Modified: head/sys/dev/drm2/drm_global.c ============================================================================== --- head/sys/dev/drm2/drm_global.c Fri Mar 8 18:08:12 2013 (r248059) +++ head/sys/dev/drm2/drm_global.c Fri Mar 8 18:11:02 2013 (r248060) @@ -104,6 +104,7 @@ void drm_global_item_unref(struct drm_gl MPASS(ref->object == item->object); if (--item->refcount == 0) { ref->release(ref); + free(item->object, M_DRM_GLOBAL); item->object = NULL; } sx_xunlock(&item->mutex); Modified: head/sys/dev/drm2/ttm/ttm_bo.c ============================================================================== --- head/sys/dev/drm2/ttm/ttm_bo.c Fri Mar 8 18:08:12 2013 (r248059) +++ head/sys/dev/drm2/ttm/ttm_bo.c Fri Mar 8 18:11:02 2013 (r248060) @@ -1400,7 +1400,6 @@ static void ttm_bo_global_kobj_release(s ttm_mem_unregister_shrink(glob->mem_glob, &glob->shrink); vm_page_free(glob->dummy_read_page); - free(glob, M_DRM_GLOBAL); } void ttm_bo_global_release(struct drm_global_reference *ref) Modified: head/sys/dev/drm2/ttm/ttm_memory.c ============================================================================== --- head/sys/dev/drm2/ttm/ttm_memory.c Fri Mar 8 18:08:12 2013 (r248059) +++ head/sys/dev/drm2/ttm/ttm_memory.c Fri Mar 8 18:11:02 2013 (r248060) @@ -125,8 +125,6 @@ static ssize_t ttm_mem_zone_store(struct static void ttm_mem_global_kobj_release(struct ttm_mem_global *glob) { - - free(glob, M_TTM_ZONE); } static bool ttm_zones_above_swap_target(struct ttm_mem_global *glob,