From nobody Wed Jun 3 08:23:22 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gVggv1cg8z6gJfv for ; Wed, 03 Jun 2026 08:23:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gVggt5SMYz3gQS for ; Wed, 03 Jun 2026 08:23:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780475002; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BFUP2vZIxL3BdAY93Et+7o67C0rS46/lPVuGYR2WbEM=; b=SJyLUNKZlofb5O2dXZRCxueX9anF4QEXcsyq4pkqWlUWQK2FC9CvM/CcT+xujB6L/B/4WN vqled35n++ZgRpOMs9oivtS+yqcCvHnpSjztla2W0AQVdusUC/qXNQwiyX/MMTI17HaZc6 b1+1ZUczxf/M5kbVdvfpQJshrszM6LVf9fNrByI49cCEqmIduHLMQqQL2078Xw6k7pp7oS mYvKMnZ5/o9B0i/1YaQ6k3+6mGjVBo86x/1+Mj8/md7VaKEDDOK2FBQtCL1aZqAgZH950Y wu0OzwAyfoPVgKL9XVoCv3M+4Ay366viZKZuo/dW7ajJ73fuLAqcZcBNxt3QoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780475002; a=rsa-sha256; cv=none; b=HqbPRBNf8ANgoxqa0oWYg/g96o0YOR1dMTgRMPk83OIdHYNXWLBjvueb7mhzl3lw81wA/T 0O5iR3/l3asv0K/8jRNxgJHaOJtFzYI92NGVNhr9UPMGj91xSRk+4RvepOvo7hH/H+z4Oy RZGbqevia6y4mF11sn9lGJsUJzjFR/Qj8PUJDxO5UsrjBCHkUR8nSzp6gdzoEZSkfziS56 Qq+RA3u5qj3CwYfCeHQWGRqw4pQPgBygX/87veadTOZas1Z74Ez1XCi6L0aNgY8ulDN1fx SvozSyEpruS9MzgwgVhuvpLlQv6W6/eiVG2JX8iQ/DkUIki1A/rlndke8vV85Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780475002; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BFUP2vZIxL3BdAY93Et+7o67C0rS46/lPVuGYR2WbEM=; b=linuBr9tKAY6aYnTZCtzdX7ZP2o0qoJe8M9yCmKWz4RqmQyTRPaJnHPVzXgvGg2YSNy9QC RRLTvMahbi8Dmdt/0ho/66YFXado6U9J6X75l6cnjL5UBhW+jV9wBazH0KN8g9Rgv6Cu7o imUrgS4gqjcItErx17G9hmrvZgj5XLR9vKEsOk5tX4y/8MIVO0aRvXtx2mcs9LgDjHcXsR RGpbWdPXW8IB2Ov3wC4FNI+jXG143OBVj3grYjoXUQ98A4tPVo17c9eSRK/fzlMUIDPMpM 8/GvSAASVIufDNga+OEMr42LHo7d1RqFYfWsJEVmis8RwHKMcNIyjRiaMmc87Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gVggt524zz13rX for ; Wed, 03 Jun 2026 08:23:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b048 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 03 Jun 2026 08:23:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 3c49470b551a - stable/15 - sound: Retire M_MIXER List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3c49470b551ad5302f731f4efcca97a0df1aeec4 Auto-Submitted: auto-generated Date: Wed, 03 Jun 2026 08:23:22 +0000 Message-Id: <6a1fe47a.3b048.117bd23f@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=3c49470b551ad5302f731f4efcca97a0df1aeec4 commit 3c49470b551ad5302f731f4efcca97a0df1aeec4 Author: Christos Margiolis AuthorDate: 2026-04-15 23:39:23 +0000 Commit: Christos Margiolis CommitDate: 2026-06-03 08:22:23 +0000 sound: Retire M_MIXER Even though harmless, it is not really useful, as there is essentially only one allocation with M_MIXER. Sponsored by: The FreeBSD Foundation MFC after: 1 week Pull Request: https://ron-dev.freebsd.org/FreeBSD/src/pulls/18 (cherry picked from commit e8ea97602ca97166a0729fdc32c84c9016fe7b0c) --- sys/dev/sound/pcm/mixer.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c index 8015c8fc0c32..7ccb57c205ba 100644 --- a/sys/dev/sound/pcm/mixer.c +++ b/sys/dev/sound/pcm/mixer.c @@ -37,8 +37,6 @@ #include "feeder_if.h" #include "mixer_if.h" -static MALLOC_DEFINE(M_MIXER, "mixer", "mixer"); - static int mixer_bypass = 1; SYSCTL_INT(_hw_snd, OID_AUTO, vpc_mixer_bypass, CTLFLAG_RWTUN, &mixer_bypass, 0, @@ -638,7 +636,7 @@ mixer_obj_create(device_t dev, kobj_class_t cls, void *devinfo, KASSERT(type == MIXER_TYPE_PRIMARY || type == MIXER_TYPE_SECONDARY, ("invalid mixer type=%d", type)); - m = (struct snd_mixer *)kobj_create(cls, M_MIXER, M_WAITOK | M_ZERO); + m = (struct snd_mixer *)kobj_create(cls, M_DEVBUF, M_WAITOK | M_ZERO); snprintf(m->name, sizeof(m->name), "%s:mixer", device_get_nameunit(dev)); if (desc != NULL) { @@ -659,7 +657,7 @@ mixer_obj_create(device_t dev, kobj_class_t cls, void *devinfo, if (MIXER_INIT(m)) { mtx_lock(&m->lock); mtx_destroy(&m->lock); - kobj_delete((kobj_t)m, M_MIXER); + kobj_delete((kobj_t)m, M_DEVBUF); return (NULL); } @@ -678,7 +676,7 @@ mixer_delete(struct snd_mixer *m) MIXER_UNINIT(m); mtx_destroy(&m->lock); - kobj_delete((kobj_t)m, M_MIXER); + kobj_delete((kobj_t)m, M_DEVBUF); return (0); } @@ -793,7 +791,7 @@ mixer_uninit(device_t dev) MIXER_UNINIT(m); mtx_destroy(&m->lock); - kobj_delete((kobj_t)m, M_MIXER); + kobj_delete((kobj_t)m, M_DEVBUF); d->mixer_dev = NULL;