The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=5ca9d41700078aa0757ee49aafbdd8f52fc96aae
commit 5ca9d41700078aa0757ee49aafbdd8f52fc96aae Author: Dmitry Chagin <[email protected]> AuthorDate: 2021-06-29 17:20:01 +0000 Commit: Dmitry Chagin <[email protected]> CommitDate: 2021-06-29 17:20:01 +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 --- 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 3e1b2e517141..7ea33c9a0d8d 100644 --- a/sys/compat/linuxkpi/common/src/linux_compat.c +++ b/sys/compat/linuxkpi/common/src/linux_compat.c @@ -108,7 +108,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 <linux/rbtree.h> /* Undo Linux compat changes. */ _______________________________________________ [email protected] mailing list https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all To unsubscribe, send any mail to "[email protected]"
