# 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/korg/gcc-13.1.0-nolibc/sh4-linux/bin/sh4-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sh4-linux/bin/sh4-linux-ld --version # < git log --format=%s --max-count=1 498e47cd1d1f3e0a870a29d1b28093e64db52fd2 # make -s -j 160 ARCH=sh O=/kisskb/build/linus_se7619_defconfig_sh4-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sh4-linux/bin/sh4-linux- se7619_defconfig # < make -s -j 160 ARCH=sh O=/kisskb/build/linus_se7619_defconfig_sh4-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sh4-linux/bin/sh4-linux- help # make -s -j 160 ARCH=sh O=/kisskb/build/linus_se7619_defconfig_sh4-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sh4-linux/bin/sh4-linux- olddefconfig # make -s -j 160 ARCH=sh O=/kisskb/build/linus_se7619_defconfig_sh4-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sh4-linux/bin/sh4-linux- Generating include/generated/machtypes.h :1519:2: warning: #warning syscall clone3 not implemented [-Wcpp] /kisskb/src/arch/sh/mm/cache-sh2.c:85:13: warning: no previous prototype for 'sh2_cache_init' [-Wmissing-prototypes] 85 | void __init sh2_cache_init(void) | ^~~~~~~~~~~~~~ /kisskb/src/arch/sh/mm/nommu.c:76:13: warning: no previous prototype for 'kmap_coherent_init' [-Wmissing-prototypes] 76 | void __init kmap_coherent_init(void) | ^~~~~~~~~~~~~~~~~~ /kisskb/src/arch/sh/mm/nommu.c:80:7: warning: no previous prototype for 'kmap_coherent' [-Wmissing-prototypes] 80 | void *kmap_coherent(struct page *page, unsigned long addr) | ^~~~~~~~~~~~~ /kisskb/src/arch/sh/mm/nommu.c:86:6: warning: no previous prototype for 'kunmap_coherent' [-Wmissing-prototypes] 86 | void kunmap_coherent(void *kvaddr) | ^~~~~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/init.c:99:29: warning: no previous prototype for 'l2_cache_init' [-Wmissing-prototypes] 99 | void __attribute__ ((weak)) l2_cache_init(void) | ^~~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/return_address.c:49:7: warning: no previous prototype for 'return_address' [-Wmissing-prototypes] 49 | void *return_address(unsigned int depth) | ^~~~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/sys_sh.c:58:16: warning: no previous prototype for 'sys_cacheflush' [-Wmissing-prototypes] 58 | asmlinkage int sys_cacheflush(unsigned long addr, unsigned long len, int op) | ^~~~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/traps_32.c:735:6: warning: no previous prototype for 'per_cpu_trap_init' [-Wmissing-prototypes] 735 | void per_cpu_trap_init(void) | ^~~~~~~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/hw_breakpoint.c:135:5: warning: no previous prototype for 'arch_bp_generic_fields' [-Wmissing-prototypes] 135 | int arch_bp_generic_fields(int sh_len, int sh_type, | ^~~~~~~~~~~~~~~~~~~~~~ Completed OK # rm -rf /kisskb/build/linus_se7619_defconfig_sh4-gcc13 # Build took: 0:01:16.846505