From nobody Mon Apr 15 20:41:55 2024 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 4VJJxb5LcWz5H3WZ; Mon, 15 Apr 2024 20:41:55 +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 4VJJxb4hrwz4YX6; Mon, 15 Apr 2024 20:41:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713213715; 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=WlM2Mn4rDbcZeDx7E+w8RH/2CF3m+Shi1y68NyrbdMw=; b=C8ZOmX2zir9oeoLARCv4xhn3uDvHIVHPlysisDxU5HJwcr+QI4AlAGXPPaKvFt/8WyVkF6 It/MgfHOEwHKJtjcNCS7pdqsAcj6M/GxEg2RA9Ft40eVxojIlEno7sWLL4A+KQ84IuskJe ZAi1sVkXDogTKr7sD3YS2rI5miX3ZNe9FbD0jDvXXB02HVbyZSWL0BMCidx3l2LnnusLCw iS4xzM0XdmvpE/j8eCw9ojibjkj44wSIYLZSCudzuGSEa/WLZk2r1NEigOhOnaS+EW8mHA rpBrMZ7YG/Kdlmu1mFQx8myO4e3pIGvRwZJVJZOgLVVctMi0ge1U6+beePyoKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713213715; a=rsa-sha256; cv=none; b=pODTQbAOQuUrUxI5ZuNQ0Lnvgu/BKFhDWSjwKCW/vfID2zvQBLSo5jC7hHmT/51e7CAB2d XJzDFXyEnT2+dxUiatiNqiUDT5R1Ylsoxq/ULHbChH6jN11W2knTJ7OdAW8C1CVtc3cB4k bp/Ml+DfeiySfp7smKT7Ny0rzB0TLu/hULc7IjWNfCRVEyxCSVnAuBPjpiydOZ5iPlt14B 9SbsEfczrdcbz4ZHlHzHyx9gfhK8+cs2dGO3UtiVO/JBSKDxy1SS3yhW9ZbQ4R3UXKL4Z4 dOy5Vg1BEiBiAbETbw0DhmDiuv5TUXBkJcPTpiQ4XRTQiPCnFsxQFSNGggZOVA== 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=1713213715; 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=WlM2Mn4rDbcZeDx7E+w8RH/2CF3m+Shi1y68NyrbdMw=; b=L1X99RtwcHmCkEZHdZiDAWJa5C+T47SxdgYr4Sqih94k6/X0Sk6GoxvbNWFF7KlXn41tQO ja4onyccZgsw4XAdxqH8aBe0DYtlYG8BksiibHmdA3qthmRflcMfILPvdgAvIQugvsna5/ mdm95DWAe2lELe971DCykpRmw5bVUd9IMf1tDFUWK0NsSuH+m4DtLihNVK8MNA33kwLs97 2hRS/8cfLM3Xh+gerGfW/Fw5Y4i3Z3PGlnLg5tFzt3+f/JNZpouY64G+HuxF+/+0hM9VHw FA7qF3wJntzn/pDoOlvR9ctvcMJWlsBM0QS8MpAXHHvTj/fu5lO66WhD0rGyrw== 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 4VJJxb4JR0zFHL; Mon, 15 Apr 2024 20:41:55 +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 43FKftsU043558; Mon, 15 Apr 2024 20:41:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43FKftie043555; Mon, 15 Apr 2024 20:41:55 GMT (envelope-from git) Date: Mon, 15 Apr 2024 20:41:55 GMT Message-Id: <202404152041.43FKftie043555@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 101c80fe46b5 - main - sys/malloc.h: move sys/proc.h MALLOC_DECLAREs here 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 101c80fe46b5c1a0f957e21ea56bf868451226aa Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=101c80fe46b5c1a0f957e21ea56bf868451226aa commit 101c80fe46b5c1a0f957e21ea56bf868451226aa Author: Brooks Davis AuthorDate: 2024-04-15 16:52:40 +0000 Commit: Brooks Davis CommitDate: 2024-04-15 20:35:40 +0000 sys/malloc.h: move sys/proc.h MALLOC_DECLAREs here This avoids the need to explicitly include sys/malloc.h before sys/proc.h. Suggested by: kib Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D44766 --- sys/sys/malloc.h | 3 +++ sys/sys/proc.h | 6 ------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/sys/sys/malloc.h b/sys/sys/malloc.h index ac1f86397951..f16231d61daf 100644 --- a/sys/sys/malloc.h +++ b/sys/sys/malloc.h @@ -157,6 +157,9 @@ struct malloc_type_header { MALLOC_DECLARE(M_CACHE); MALLOC_DECLARE(M_DEVBUF); +MALLOC_DECLARE(M_PARGS); +MALLOC_DECLARE(M_SESSION); +MALLOC_DECLARE(M_SUBPROC); MALLOC_DECLARE(M_TEMP); /* diff --git a/sys/sys/proc.h b/sys/sys/proc.h index fa4c7d2768f0..33b836f4150e 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -938,12 +938,6 @@ struct proc { #define SINGLE_BOUNDARY 2 #define SINGLE_ALLPROC 3 -#ifdef MALLOC_DECLARE -MALLOC_DECLARE(M_PARGS); -MALLOC_DECLARE(M_SESSION); -MALLOC_DECLARE(M_SUBPROC); -#endif - #define FOREACH_PROC_IN_SYSTEM(p) \ LIST_FOREACH((p), &allproc, p_list) #define FOREACH_THREAD_IN_PROC(p, td) \