The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=33469f101146796a1de3f7736c504ce2539c952b
commit 33469f101146796a1de3f7736c504ce2539c952b Author: Warner Losh <[email protected]> AuthorDate: 2023-08-14 22:31:37 +0000 Commit: Warner Losh <[email protected]> CommitDate: 2023-08-14 22:33:26 +0000 nvme: use mtx_padaalign instead of mtx + alignment attribute nvme driver predates, it seems, mtx_padalign. Modernize. Sponsored by: Netflix --- sys/dev/nvme/nvme_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/nvme/nvme_private.h b/sys/dev/nvme/nvme_private.h index b35e14cb8d0c..bb81676336a6 100644 --- a/sys/dev/nvme/nvme_private.h +++ b/sys/dev/nvme/nvme_private.h @@ -203,7 +203,7 @@ struct nvme_qpair { struct nvme_tracker **act_tr; - struct mtx lock __aligned(CACHE_LINE_SIZE); + struct mtx_padalign lock; } __aligned(CACHE_LINE_SIZE);
