Date: Thu, 25 Feb 2021 01:35:57 GMT From: Marcin Wojtas <mw@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: ef567155d35f - main - Fix powerpc build after 6dd69f0064f1 Message-ID: <202102250135.11P1ZvhN045573@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by mw: URL: https://cgit.FreeBSD.org/src/commit/?id=ef567155d35fd8f783d9b907e9a2765640a11527 commit ef567155d35fd8f783d9b907e9a2765640a11527 Author: Marcin Wojtas <mw@FreeBSD.org> AuthorDate: 2021-02-25 01:29:33 +0000 Commit: Marcin Wojtas <mw@FreeBSD.org> CommitDate: 2021-02-25 01:35:41 +0000 Fix powerpc build after 6dd69f0064f1 Commit 6dd69f0064f1 ("iflib: introduce isc_dma_width") failed to build on powerpc due to implicit type conversion error. Fix that. Submitted by: Artur Rojek <ar@semihalf.com> Obtained from: Semihalf Sponsored by: Amazon, Inc. --- sys/net/iflib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net/iflib.c b/sys/net/iflib.c index 6fd0ee3751f0..a7d5a8c24658 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -1390,7 +1390,7 @@ _iflib_dmamap_cb(void *arg, bus_dma_segment_t *segs, int nseg, int err) } #define DMA_WIDTH_TO_BUS_LOWADDR(width) \ - (((width) == 0) || (width) == flsl(BUS_SPACE_MAXADDR) ? \ + (((width) == 0) || (width) == flsll(BUS_SPACE_MAXADDR) ? \ BUS_SPACE_MAXADDR : (1ULL << (width)) - 1ULL) int @@ -4761,7 +4761,7 @@ iflib_device_register(device_t dev, void *sc, if_shared_ctx_t sctx, if_ctx_t *ct _iflib_pre_assert(scctx); ctx->ifc_txrx = *scctx->isc_txrx; - MPASS(scctx->isc_dma_width <= flsl(BUS_SPACE_MAXADDR)); + MPASS(scctx->isc_dma_width <= flsll(BUS_SPACE_MAXADDR)); if (sctx->isc_flags & IFLIB_DRIVER_MEDIA) ctx->ifc_mediap = scctx->isc_media;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202102250135.11P1ZvhN045573>