# git rev-parse -q --verify 498e47cd1d1f3e0a870a29d1b28093e64db52fd2^{commit} 498e47cd1d1f3e0a870a29d1b28093e64db52fd2 already have revision, skipping fetch # git checkout -q -f -B kisskb 498e47cd1d1f3e0a870a29d1b28093e64db52fd2 # git clean -qxdf # < git log -1 # commit 498e47cd1d1f3e0a870a29d1b28093e64db52fd2 # Author: Linus Torvalds # Date: Wed Mar 27 09:48:47 2024 -0700 # # Fix build errors due to new UIO_MEM_DMA_COHERENT mess # # Commit 576882ef5e7f ("uio: introduce UIO_MEM_DMA_COHERENT type") # introduced a new use-case for 'struct uio_mem' where the 'mem' field now # contains a kernel virtual address when 'memtype' is set to # UIO_MEM_DMA_COHERENT. # # That in turn causes build errors, because 'mem' is of type # 'phys_addr_t', and a virtual address is a pointer type. When the code # just blindly uses cast to mix the two, it caused problems when # phys_addr_t isn't the same size as a pointer - notably on 32-bit # architectures with PHYS_ADDR_T_64BIT. # # The proper thing to do would probably be to use a union member, and not # have any casts, and make the 'mem' member be a union of 'mem.physaddr' # and 'mem.vaddr', based on 'memtype'. # # This is not that proper thing. This is just fixing the ugly casts to be # even uglier, but at least not cause build errors on 32-bit platforms # with 64-bit physical addresses. # # Reported-by: Guenter Roeck # Fixes: 576882ef5e7f ("uio: introduce UIO_MEM_DMA_COHERENT type") # Fixes: 7722151e4651 ("uio_pruss: UIO_MEM_DMA_COHERENT conversion") # Fixes: 019947805a8d ("uio_dmem_genirq: UIO_MEM_DMA_COHERENT conversion") # Cc: Greg Kroah-Hartman # Cc: Chris Leech # Cc: Nilesh Javali # Cc: Christoph Hellwig # Signed-off-by: Linus Torvalds # < /opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux-gcc --version # < /opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux-ld --version # < git log --format=%s --max-count=1 498e47cd1d1f3e0a870a29d1b28093e64db52fd2 # make -s -j 40 ARCH=um O=/kisskb/build/linus_allmodconfig_um-x86_64-gcc12 CROSS_COMPILE=/opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux- SUBARCH=x86_64 allmodconfig # Added to kconfig CONFIG_STANDALONE=y # Added to kconfig CONFIG_KCOV=n # Added to kconfig CONFIG_GCC_PLUGINS=n # Added to kconfig CONFIG_GCC_PLUGIN_CYC_COMPLEXITY=n # Added to kconfig CONFIG_GCC_PLUGIN_SANCOV=n # Added to kconfig CONFIG_GCC_PLUGIN_LATENT_ENTROPY=n # Added to kconfig CONFIG_GCC_PLUGIN_STRUCTLEAK=n # Added to kconfig CONFIG_GCC_PLUGIN_RANDSTRUCT=n # Added to kconfig CONFIG_UML_NET=n # Added to kconfig CONFIG_UML_NET_ETHERTAP=n # Added to kconfig CONFIG_UML_NET_TUNTAP=n # Added to kconfig CONFIG_UML_NET_SLIP=n # Added to kconfig CONFIG_UML_NET_DAEMON=n # Added to kconfig CONFIG_UML_NET_VDE=n # Added to kconfig CONFIG_UML_NET_MCAST=n # Added to kconfig CONFIG_UML_NET_PCAP=n # Added to kconfig CONFIG_UML_NET_SLIRP=n # Added to kconfig CONFIG_GCOV_KERNEL=n # Added to kconfig CONFIG_DEBUG_INFO_BTF=n # Added to kconfig CONFIG_BPF_PRELOAD=n # Added to kconfig CONFIG_SPI_STM32_QSPI=n # < make -s -j 40 ARCH=um O=/kisskb/build/linus_allmodconfig_um-x86_64-gcc12 CROSS_COMPILE=/opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux- SUBARCH=x86_64 help # make -s -j 40 ARCH=um O=/kisskb/build/linus_allmodconfig_um-x86_64-gcc12 CROSS_COMPILE=/opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux- SUBARCH=x86_64 olddefconfig .config:14248:warning: override: reassigning to symbol GCC_PLUGIN_LATENT_ENTROPY .config:14252:warning: override: reassigning to symbol UML_NET_ETHERTAP .config:14254:warning: override: reassigning to symbol UML_NET_SLIP .config:14259:warning: override: reassigning to symbol UML_NET_SLIRP # make -s -j 40 ARCH=um O=/kisskb/build/linus_allmodconfig_um-x86_64-gcc12 CROSS_COMPILE=/opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux- SUBARCH=x86_64 /kisskb/src/arch/x86/um/user-offsets.c:17:6: warning: no previous prototype for ‘foo’ [-Wmissing-prototypes] 17 | void foo(void) | ^~~ In file included from /kisskb/src/arch/um/kernel/asm-offsets.c:1: /kisskb/src/arch/x86/um/shared/sysdep/kernel-offsets.h:9:6: error: no previous prototype for ‘foo’ [-Werror=missing-prototypes] 9 | void foo(void) | ^~~ cc1: all warnings being treated as errors make[3]: *** [/kisskb/src/scripts/Makefile.build:117: arch/um/kernel/asm-offsets.s] Error 1 make[2]: *** [/kisskb/src/Makefile:1197: prepare0] Error 2 make[1]: *** [/kisskb/src/Makefile:240: __sub-make] Error 2 make: *** [Makefile:240: __sub-make] Error 2 Command 'make -s -j 40 ARCH=um O=/kisskb/build/linus_allmodconfig_um-x86_64-gcc12 CROSS_COMPILE=/opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux- SUBARCH=x86_64 ' returned non-zero exit status 2. # rm -rf /kisskb/build/linus_allmodconfig_um-x86_64-gcc12 # Build took: 0:00:18.078515