aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrooks Davis <brooks@FreeBSD.org>2024-04-15 16:52:40 +0000
committerBrooks Davis <brooks@FreeBSD.org>2024-04-15 20:35:40 +0000
commit101c80fe46b5c1a0f957e21ea56bf868451226aa (patch)
tree1de910192b14195503ff4786a1fc7a4e802ae0cd
parent2a8c50592f7fce8bceedf004f674a5a9eae0fd46 (diff)
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
-rw-r--r--sys/sys/malloc.h3
-rw-r--r--sys/sys/proc.h6
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) \