svn commit: r346645 - in head/sys: compat/linuxkpi/common/include/linux compat/linuxkpi/common/src sys

[Li-Wen Hsu]

On Thu, Apr 25, 2019 at 5:31 AM Tycho Nightingale <tychon at freebsd.org> wrote:
>
> Author: tychon
> Date: Wed Apr 24 20:30:45 2019
> New Revision: 346645
> URL: https://svnweb.freebsd.org/changeset/base/346645
...
> Modified: head/sys/compat/linuxkpi/common/src/linux_pci.c
> ==============================================================================
> --- head/sys/compat/linuxkpi/common/src/linux_pci.c     Wed Apr 24 19:56:02 2019        (r346644)
> +++ head/sys/compat/linuxkpi/common/src/linux_pci.c     Wed Apr 24 20:30:45 2019        (r346645)
...
> +PCTRIE_DEFINE(LINUX_DMA, linux_dma_obj, dma_addr, linux_dma_trie_alloc,
> +    linux_dma_trie_free);

Here we got errors in build on 32-bit platforms use gcc:

/usr/src/sys/compat/linuxkpi/common/src/linux_pci.c:456:1: error:
static_assert failed due to requirement 'sizeof (((struct
linux_dma_obj *)0)->dma_addr) == sizeof(unsigned long long)'
"compile-time assertion failed"
PCTRIE_DEFINE(LINUX_DMA, linux_dma_obj, dma_addr, linux_dma_trie_alloc,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/usr/src/sys/sys/pctrie.h:41:10: note: expanded from macro 'PCTRIE_DEFINE'
                                                                        \
                                                                        ^
/usr/src/sys/sys/systm.h:120:21: note: expanded from macro '\
CTASSERT'
#define CTASSERT(x)     _Static_assert(x, "compile-time assertion failed")
                        ^              ~
/usr/src/sys/compat/linuxkpi/common/src/linux_pci.c:456:1: error:
incompatible pointer types returning 'dma_addr_t *' (aka 'unsigned int
*') from a function with result type 'uint64_t *' (aka 'unsigned long
long *') [-Werror,-Wincompatible-pointer-types]
PCTRIE_DEFINE(LINUX_DMA, linux_dma_obj, dma_addr, linux_dma_trie_alloc,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/usr/src/sys/sys/pctrie.h:63:9: note: expanded from macro 'PCTRIE_DEFINE'
        return &ptr->field;                                             \
               ^~~~~~~~~~~
2 errors generated.
*** [linux_pci.o] Error code 1

make[4]: stopped in /usr/src/sys/modules/linuxkpi

Can you check this?  Full build log is available at:
https://ci.freebsd.org/job/FreeBSD-head-armv7-build/4250/console

Thanks,
Li-Wen