aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Johnston <markj@FreeBSD.org>2024-10-06 13:07:31 +0000
committerMark Johnston <markj@FreeBSD.org>2024-10-15 13:45:28 +0000
commit8a5a9dbf389e86d278764ababf2f1eb8ee276680 (patch)
treef32aa00455dc1820ae343424e62b0791fb5bfbce
parent81da8e39f78956441a27eb6bb55ac16170a21a14 (diff)
vm_object: Widen the flags field
Take advantage of a nearby 2-byte hole to avoid growing the struct. This way, only the offsets of "flags" and "pg_color" change. Bump __FreeBSD_version since some out-of-tree kernel modules may access these fields, though I haven't found any examples so far. Reviewed by: kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D35905 (cherry picked from commit 9d52823bf1dfac237e58b5208299aaa5e2df42e9)
-rw-r--r--sys/sys/param.h2
-rw-r--r--sys/vm/vm_object.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/sys/param.h b/sys/sys/param.h
index 697a96cca916..a900131fe8ec 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -75,7 +75,7 @@
* cannot include sys/param.h and should only be updated here.
*/
#undef __FreeBSD_version
-#define __FreeBSD_version 1401502
+#define __FreeBSD_version 1401503
/*
* __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,
diff --git a/sys/vm/vm_object.h b/sys/vm/vm_object.h
index 3e82a5dc7430..1d00bee603f6 100644
--- a/sys/vm/vm_object.h
+++ b/sys/vm/vm_object.h
@@ -110,8 +110,8 @@ struct vm_object {
int shadow_count; /* how many objects that this is a shadow for */
vm_memattr_t memattr; /* default memory attribute for pages */
objtype_t type; /* type of pager */
- u_short flags; /* see below */
u_short pg_color; /* (c) color of first page in obj */
+ u_int flags; /* see below */
blockcount_t paging_in_progress; /* (a) Paging (in or out) so don't collapse or destroy */
blockcount_t busy; /* (a) object is busy, disallow page busy. */
int resident_page_count; /* number of resident pages */