# 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-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux-ld --version # < git log --format=%s --max-count=1 498e47cd1d1f3e0a870a29d1b28093e64db52fd2 # make -s -j 40 ARCH=powerpc O=/kisskb/build/linus_pseries_le_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- pseries_le_defconfig Using /kisskb/src/arch/powerpc/configs/ppc64_defconfig as base Merging /kisskb/src/arch/powerpc/configs/le.config Merging /kisskb/src/arch/powerpc/configs/guest.config Value of CONFIG_VIRTIO_BLK is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_VIRTIO_BLK=m New value: CONFIG_VIRTIO_BLK=y Value of CONFIG_SCSI_VIRTIO is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_SCSI_VIRTIO=m New value: CONFIG_SCSI_VIRTIO=y Value of CONFIG_VIRTIO_NET is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_VIRTIO_NET=m New value: CONFIG_VIRTIO_NET=y Value of CONFIG_VIRTIO_CONSOLE is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_VIRTIO_CONSOLE=m New value: CONFIG_VIRTIO_CONSOLE=y Value of CONFIG_VIRTIO_PCI is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_VIRTIO_PCI=m New value: CONFIG_VIRTIO_PCI=y Value of CONFIG_VIRTIO_BALLOON is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_VIRTIO_BALLOON=m New value: CONFIG_VIRTIO_BALLOON=y Value of CONFIG_VHOST_NET is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_VHOST_NET=m New value: CONFIG_VHOST_NET=y Value of CONFIG_IBMVETH is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_IBMVETH=m New value: CONFIG_IBMVETH=y Value of CONFIG_IBMVNIC is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_IBMVNIC=m New value: CONFIG_IBMVNIC=y Merging /kisskb/src/arch/powerpc/configs/kvm_guest.config # # merged configuration written to .config (needs make) # # < make -s -j 40 ARCH=powerpc O=/kisskb/build/linus_pseries_le_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 40 ARCH=powerpc O=/kisskb/build/linus_pseries_le_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig # make -s -j 40 ARCH=powerpc O=/kisskb/build/linus_pseries_le_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- Completed OK # rm -rf /kisskb/build/linus_pseries_le_defconfig_powerpc-gcc5 # Build took: 0:02:01.785989