git: 2a35f3cdf63d - main - sys/mutex.h: Include sys/lock.h instead of sys/_lock.h

The branch main has been updated by manu:

URL: https://cgit.FreeBSD.org/src/commit/?id=2a35f3cdf63d1f9b1ea5ab0174adabb631757210

commit 2a35f3cdf63d1f9b1ea5ab0174adabb631757210
Author:     Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2022-10-27 09:43:19 +0000
Commit:     Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2023-11-24 09:49:58 +0000

    sys/mutex.h: Include sys/lock.h instead of sys/_lock.h
    
    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
    Differential Revision:  https://reviews.freebsd.org/D37145
    Reviewed by:    kib, mjg
---
 sys/sys/mutex.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/sys/mutex.h b/sys/sys/mutex.h
index 56c03a1b0be9..750a5e99679a 100644
--- a/sys/sys/mutex.h
+++ b/sys/sys/mutex.h
@@ -34,8 +34,8 @@
 #define _SYS_MUTEX_H_
 
 #include <sys/queue.h>
-#include <sys/_lock.h>
 #include <sys/_mutex.h>
+#include <sys/lock.h>
 
 #ifdef _KERNEL
 #include <sys/pcpu.h>