From nobody Tue Jul 18 21:45:01 2023 X-Original-To: dev-commits-src-main@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 4R5CCx2pQtz4dTqj; Tue, 18 Jul 2023 21:45:01 +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 4R5CCx275Sz42XG; Tue, 18 Jul 2023 21:45:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689716701; 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=YYSz5W4kK8v02QNxd2la0isw3z+C3JkIb7FLzgR/D1g=; b=lSY+pDP/gMf1oKc9i4r+QkwSKQou1RggghI/GRQp6IhA3LpR6V/cQnq2q3ZeETAlOos1Wo 6EYKg/nz11NpNG5OQjxbCuX+x6nNkYue98FgRB92G96xIY20az49ndUIoTFynsYrxhWJHO m0Opr379eY7Ocq0NbpGo/3jks7wJIoR4xS85Gy3qabnrLHxPO2UDFZwbnSSEfrwELQWgRM WemTb3MnZKgW5IBzptG6OQdZHOO0TRYqPEonYkaFGS7YldCtQ11439pPBPGvoNDSbA4oN8 u44BOF6POYnS27IcS7kNjHEYP8o9EAeNmfkN9iX88BvcY06u1N5t8IJbVpOCNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689716701; 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=YYSz5W4kK8v02QNxd2la0isw3z+C3JkIb7FLzgR/D1g=; b=RFJ6D7ulFBa4n3nnfrU/tAeG+4TF49E9H5DNsQzYQ7UxkJxbYDEHibAYTW0V2EgKeWev4Q Y6Z2S7Or8GpLg5s+PLn5YOJfrmxOrYM8OCHDGIt31T2vfmBAuyEdooa9KUcFKWHc1rpU2P 0okiNVl6oMKG80EYdZXI4EGou3+HiWFZ7TzwhFSleoDTn513REvVXqn9VIZEjWs1C6YO3C L1rM9qx7PxgIKA77aOh7Az6x7vnJ8sHPuMq6F+m1Ehu8+7KOxep5ZJqBEHCiZocZUtwKpO CyIe5VQzSbxJMUJVNfHEiBh+wzXkMToGOb4//BAabaOwE2nxEr3xazVxRg12ew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689716701; a=rsa-sha256; cv=none; b=b53SP09Vs66+o7QoUEulAPoTT9lH68jAdBGUprzft1WWgGplv3vn/PpxLzZ2He5rOShBEV MmSwkJGYYKpt4/TQRaWD7AIkl/4M7ONy2hKIe3NRAP5fOLeh7l8UrmFl7JYEQRZ2KzIklW kntjqmiwuhDizzrdM2NaA3OVk2CNeBPUdTNckwxfFpo2LodnE+bsw+Ran/qdi4M+Ei1Pl+ sVSx3pjl2JSz09yf12TRcXvY4VbtykR85qyvdIuhHsyZhXcinCwKwDpayY5aDwfTuaMF6/ fMZVWywBPTdbjNuk1vlArRGxXnbxS2u3B5of8MoJw49KAANteFSPjk9Ytaa81w== 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 4R5CCx0yNQzMXs; Tue, 18 Jul 2023 21:45:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36ILj1U9061930; Tue, 18 Jul 2023 21:45:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36ILj1xL061929; Tue, 18 Jul 2023 21:45:01 GMT (envelope-from git) Date: Tue, 18 Jul 2023 21:45:01 GMT Message-Id: <202307182145.36ILj1xL061929@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: b834497c6d0c - main - linux(4): Use M_LINUX for malloc type of proc emuldata List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: b834497c6d0cccaeebad8d94a32c8dd3ec0d3f9b Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=b834497c6d0cccaeebad8d94a32c8dd3ec0d3f9b commit b834497c6d0cccaeebad8d94a32c8dd3ec0d3f9b Author: Dmitry Chagin AuthorDate: 2023-07-18 21:44:17 +0000 Commit: Dmitry Chagin CommitDate: 2023-07-18 21:44:17 +0000 linux(4): Use M_LINUX for malloc type of proc emuldata MFC after: 2 weeks --- sys/compat/linux/linux_emul.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/compat/linux/linux_emul.c b/sys/compat/linux/linux_emul.c index 6a2ea1f26fe5..8384d6a42962 100644 --- a/sys/compat/linux/linux_emul.c +++ b/sys/compat/linux/linux_emul.c @@ -147,7 +147,7 @@ linux_proc_init(struct thread *td, struct thread *newtd, bool init_thread) p = newtd->td_proc; /* non-exec call */ - em = malloc(sizeof(*em), M_TEMP, M_WAITOK | M_ZERO); + em = malloc(sizeof(*em), M_LINUX, M_WAITOK | M_ZERO); if (init_thread) { LINUX_CTR1(proc_init, "thread newtd(%d)", newtd->td_tid); @@ -250,7 +250,7 @@ linux_common_execve(struct thread *td, struct image_args *eargs) p->p_emuldata = NULL; PROC_UNLOCK(p); - free(em, M_TEMP); + free(em, M_LINUX); free(pem, M_LINUX); } return (EJUSTRETURN); @@ -328,7 +328,7 @@ linux_thread_dtor(struct thread *td) LINUX_CTR1(thread_dtor, "thread(%d)", em->em_tid); - free(em, M_TEMP); + free(em, M_LINUX); } void