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

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.

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

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

Simple add sys/lock.h

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

Compiles fines on amd64 and arm64.

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