Page MenuHomeFreeBSD
Differential D37145

sys/mutex.h: Include sys/lock.h instead of sys/_lock.h
ClosedPublic
Actions

Authored by manu on Oct 27 2022, 9:46 AM.
Tags
None
Referenced Files
F151298418: D37145.id112328.diff
Tue, Apr 7, 10:12 AM
Unknown Object (File)
Sun, Apr 5, 4:46 AM
Unknown Object (File)
Fri, Apr 3, 1:12 PM
Unknown Object (File)
Thu, Apr 2, 12:06 PM
Unknown Object (File)
Sat, Mar 21, 8:31 AM
Unknown Object (File)
Fri, Mar 20, 4:16 AM
Unknown Object (File)
Thu, Mar 19, 11:32 PM
Unknown Object (File)
Thu, Mar 19, 5:31 AM
View All Files
Subscribers
imp

Details

Reviewers
kib
mjg
andrew
Commits
rG2a35f3cdf63d: sys/mutex.h: Include sys/lock.h instead of sys/_lock.h
Summary

It uses the LA_ defines when INVARIANTS is set.
This unbreak dpaa2 with FDT only kernel (like ALLWINNER or ROCKCHIP) as
the driver only include sys/lock.h via header polution for ACPI kernels.

Sponsored by: Beckhoff Automation GmbH & Co. KG

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

manu created this revision.Oct 27 2022, 9:46 AM
Herald added a subscriber: imp. · View Herald TranscriptOct 27 2022, 9:46 AM
manu requested review of this revision.Oct 27 2022, 9:46 AM
Harbormaster completed remote builds in B48017: Diff 112247.Oct 27 2022, 9:46 AM
manu added reviewers: kib, mjg.Oct 27 2022, 9:46 AM
mjg accepted this revision.Oct 27 2022, 1:54 PM
This revision is now accepted and ready to land.Oct 27 2022, 1:54 PM
kib added a comment.Oct 27 2022, 2:27 PM

If you do this, include it unconditionally, otherwise it would be a source of continuous troubles, where people only build-test INVARIANTS kernels. Then you can (should ?) remove sys/_lock.h.

manu updated this revision to Diff 112318.Oct 28 2022, 7:07 AM

Always include sys/lock.h

This revision now requires review to proceed.Oct 28 2022, 7:07 AM
Harbormaster completed remote builds in B48066: Diff 112318.Oct 28 2022, 7:07 AM
manu retitled this revision from sys/mutex.h: Include sys/lock when INVARIANTS is set to sys/mutex.h: Include sys/lock.h instead of sys/_lock.h.Oct 28 2022, 7:08 AM
manu added a comment.Oct 28 2022, 9:21 AM

This break buildworld, _lock is still needed for struct lock_object.
Will update the diff when I have something that compiles.

manu updated this revision to Diff 112328.Oct 28 2022, 12:14 PM

Simple add sys/lock.h

Harbormaster completed remote builds in B48076: Diff 112328.Oct 28 2022, 12:14 PM
manu added a comment.Oct 28 2022, 12:14 PM

Compiles fines on amd64 and arm64.

kib added a comment.Oct 28 2022, 12:55 PM

I do not quite understand your problem, please take a look at sys/lock.h line 38.

kib added a comment.Oct 28 2022, 12:56 PM
In D37145#844216, @kib wrote:

I do not quite understand your problem, please take a look at sys/lock.h line 38.

I probably understand. You need to put sys/lock.h before sys/_mutex.h.

manu updated this revision to Diff 112333.Oct 28 2022, 1:20 PM

Directly include sys/lock.h

Harbormaster completed remote builds in B48077: Diff 112333.Oct 28 2022, 1:20 PM
kib accepted this revision.Oct 28 2022, 1:25 PM
This revision is now accepted and ready to land.Oct 28 2022, 1:25 PM
Closed by commit rG2a35f3cdf63d: sys/mutex.h: Include sys/lock.h instead of sys/_lock.h (authored by manu). · Explain WhyNov 24 2023, 9:50 AM
This revision was automatically updated to reflect the committed changes.
manu added a commit: rG2a35f3cdf63d: sys/mutex.h: Include sys/lock.h instead of sys/_lock.h.
Herald added a reviewer: andrew. · View Herald TranscriptNov 24 2023, 9:50 AM
manu added a reverting change: rG1148518afe43: Revert "sys/mutex.h: Include sys/lock.h instead of sys/_lock.h".Nov 28 2023, 8:41 AM

Revision Contents
Changeset List

PathSize
sys/
sys/
2 lines

Diff 130502

View Options

sys/sys/mutex.h

Loading...