Date: Wed, 13 Jun 2018 07:55:58 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r335034 - head/sys/dev/liquidio Message-ID: <201806130755.w5D7tw7L063386@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Wed Jun 13 07:55:57 2018 New Revision: 335034 URL: https://svnweb.freebsd.org/changeset/base/335034 Log: Fix build of liquidio with base gcc on i386 Some casts from pointers to uint64_t and back in lio_main.c cause base gcc on i386 to warn "cast from pointer to integer of different size", and vice versa. Add additional casts to uintptr_t to suppress these. Reviewed by: sbruno MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D15754 Modified: head/sys/dev/liquidio/lio_main.c Modified: head/sys/dev/liquidio/lio_main.c ============================================================================== --- head/sys/dev/liquidio/lio_main.c Wed Jun 13 07:17:10 2018 (r335033) +++ head/sys/dev/liquidio/lio_main.c Wed Jun 13 07:55:57 2018 (r335034) @@ -1770,8 +1770,8 @@ lio_setup_glists(struct octeon_device *oct, struct lio if (g == NULL) break; - g->sg = (struct lio_sg_entry *) - ((uint64_t)lio->glists_virt_base[i] + + g->sg = (struct lio_sg_entry *)(uintptr_t) + ((uint64_t)(uintptr_t)lio->glists_virt_base[i] + (j * lio->glist_entry_size)); g->sg_dma_ptr = (uint64_t)lio->glists_dma_base[i] + (j * lio->glist_entry_size);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806130755.w5D7tw7L063386>