: Reduce overly broad header pollution.
ClosedPublic
Actions

Authored by jhb on Jan 4 2023, 10:56 PM.

Details

Reviewers

asomers
kib
imp

Commits

rGfc1901abcfa9: <sys/sysctl.h>: Reduce overly broad header pollution.

Summary

Commit d3f96f661050e9bd21fe29931992a8b9e67ff189 removed <sys/queue.h>
and replaced it with the very broad <sys/systm.h>. However, none of
the changes to sysctl.h in that commit require anything defined in
<sys/systm.h>. On the other hand, <sys/sysctl.h> does still make use
of queue macros. Drop the include of <sys/systm.h> and re-add
<sys/queue.h>.

Sponsored by: DARPA
Obtained from: CheriBSD

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Skipped

Unit

Tests Skipped

Build Status

Buildable 48958
Build 45847: arc lint + arc unit

Event Timeline

jhb created this revision.Jan 4 2023, 10:56 PM

Herald added a subscriber: imp. · View Herald TranscriptJan 4 2023, 10:56 PM

jhb requested review of this revision.Jan 4 2023, 10:56 PM

Harbormaster completed remote builds in B48958: Diff 114761.Jan 4 2023, 10:56 PM

In CheriBSD the <sys/systm.h> nested include introduced a circular dependency since we have a local header included in <sys/systm.h> that uses SYSCTL_DECL_NODE(). However, I can't really see why <sys/systm.h> was added in the original change either.

kib accepted this revision.Jan 5 2023, 2:44 AM

This revision is now accepted and ready to land.Jan 5 2023, 2:44 AM

LGTM. It looks like I included sys/systm.h because an earlier, pre-phabricator version of the change included a panic() within cmp_sysctl_oid, but then I forgot to revert the header change.

imp accepted this revision.Jan 7 2023, 1:12 AM

Closed by commit rGfc1901abcfa9: <sys/sysctl.h>: Reduce overly broad header pollution. (authored by jhb). · Explain WhyJan 19 2023, 6:33 PM

This revision was automatically updated to reflect the committed changes.

jhb added a commit: rGfc1901abcfa9: <sys/sysctl.h>: Reduce overly broad header pollution..