From nobody Fri Jun 17 19:32:18 2022 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 833C28543BE; Fri, 17 Jun 2022 19:32:19 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LPq1b0MxFz3KYg; Fri, 17 Jun 2022 19:32:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494339; 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=gey7IBzDMW5DKtKf8reISb7UipjifABS+ZZPQBJmhfY=; b=XWd9lIccPendPrRVOs8uq+LFGiL50dbvoLOCy3ZdziaESV2iQpc90pmu7odifiA2NyQBzm jSwY1czFxvbzwS7lfKp4ZJBVXDqaeMD7mJi+H3NxvRG4VZ7nnXGlxGCpK8q70vokFXG695 /TJ21aij0pWr7dwk1KZgyl8zimwtgUhbjdHvzFcml7PmEkfWGEQQvJaZ1j6gf6dulH5zy3 0Guke9P5BoI4NaxemijeUyLp7UxgmVQrbJwkevz2Y14aZ38eYOtQ/s9tio7Z8ntLxi1ZxV 71mqaWm/BP9ESN2E8QeXeNw11fLtuoI6c0ACLfMCT9ZYmbbwoekbqQp61B+HAQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7F076257C2; Fri, 17 Jun 2022 19:32:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25HJWI9O008293; Fri, 17 Jun 2022 19:32:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJWIPx008292; Fri, 17 Jun 2022 19:32:18 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:32:18 GMT Message-Id: <202206171932.25HJWIPx008292@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 8f7fb96aaf72 - stable/13 - LinuxKPI: Rename a short description of the kmalloc type. 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8f7fb96aaf72c39a5d276e80c7baec6744a5157c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494339; 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=gey7IBzDMW5DKtKf8reISb7UipjifABS+ZZPQBJmhfY=; b=psoiuwWGyrh/EB/6ICVFqklvu9P6KO6Qh49jY4x75EiENIMUfUyuuXSzYK9JAU4dso/COE VuEa/2fN8nh7RgktMGsbTwix4lrs8k10zZyywTw2HhbI9UWl23qQzP3JjidktNpDwzahCd Kir/RIlr7MBqD8uLOExjqB+8mrJHfuxH8ifQDuQvupocLpWOQYd2NNuwz7e7hUJtW+jJkb goG2V0dlBTHg8hsmpi5Tb2iX29PnujWHKW3pmjm7+NyTEPSgLJW6wdnkfhT34om6fPnDjo COY43FsliwJ2vMlXzSF3A9GKulrfIh5PmdZZldNSTH6Dsw2BvWURpdZYmG9W6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494339; a=rsa-sha256; cv=none; b=d0aIWHO4YFztAJTzFZSIUkManEGKcF6ijcZyjnH5hpl8f88ep8KEf1cj6Iazs5CbisbRG9 SXJFU5M87DSKaxhGGoN/VQiQqmfisIP5tbJ7593iLgNzIjfu/HihXQnE+FpiV51g34OxME 2Dw0i7/ZMLhwM0i9bUoYQCvIHAr59eUpBjhjD3wnCNFmnpWLugCtUHTDZTg7hUDUs7wUN/ 0nCOoUjmB9K0GDe3qG3AkD4WUnnvkycXaQGQLXXpmXSHZXt3WHlT9BT8fN+iICbbFGGPr8 eQcmZbNSyn5jnUp2XOmEl245baZPwY1auKdQ4kr7lv3y592hRJVjPKLQaUJBQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=8f7fb96aaf72c39a5d276e80c7baec6744a5157c commit 8f7fb96aaf72c39a5d276e80c7baec6744a5157c Author: Dmitry Chagin AuthorDate: 2021-06-29 17:20:01 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:30:28 +0000 LinuxKPI: Rename a short description of the kmalloc type. To avoid duplication in the vmstat -m output rename the kmalloc type short description to 'lkpikmalloc' as the Linux emulation layer historically names its linux malloc type as 'linux'. Reviewed by: hselasky, kib, emaste Differential Revision: https://reviews.freebsd.org/D30928 MFC after: 2 weeks (cherry picked from commit 5ca9d41700078aa0757ee49aafbdd8f52fc96aae) --- sys/compat/linuxkpi/common/src/linux_compat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/src/linux_compat.c b/sys/compat/linuxkpi/common/src/linux_compat.c index 4e98ed67e26d..852bc1b153b2 100644 --- a/sys/compat/linuxkpi/common/src/linux_compat.c +++ b/sys/compat/linuxkpi/common/src/linux_compat.c @@ -117,7 +117,7 @@ static int lkpi_net_maxpps = 99; SYSCTL_INT(_compat_linuxkpi, OID_AUTO, net_ratelimit, CTLFLAG_RWTUN, &lkpi_net_maxpps, 0, "Limit number of LinuxKPI net messages per second."); -MALLOC_DEFINE(M_KMALLOC, "linux", "Linux kmalloc compat"); +MALLOC_DEFINE(M_KMALLOC, "lkpikmalloc", "Linux kmalloc compat"); #include /* Undo Linux compat changes. */