# git rev-parse -q --verify 1c9df907da83812e4f33b59d3d142c864d9da57f^{commit} 1c9df907da83812e4f33b59d3d142c864d9da57f already have revision, skipping fetch # git checkout -q -f -B kisskb 1c9df907da83812e4f33b59d3d142c864d9da57f # git clean -qxdf # < git log -1 # commit 1c9df907da83812e4f33b59d3d142c864d9da57f # Author: Willy Tarreau # Date: Thu Jul 30 07:59:24 2020 +0200 # # random: fix circular include dependency on arm64 after addition of percpu.h # # Daniel Díaz and Kees Cook independently reported that commit # f227e3ec3b5c ("random32: update the net random state on interrupt and # activity") broke arm64 due to a circular dependency on include files # since the addition of percpu.h in random.h. # # The correct fix would definitely be to move all the prandom32 stuff out # of random.h but for backporting, a smaller solution is preferred. # # This one replaces linux/percpu.h with asm/percpu.h, and this fixes the # problem on x86_64, arm64, arm, and mips. Note that moving percpu.h # around didn't change anything and that removing it entirely broke # differently. When backporting, such options might still be considered # if this patch fails to help. # # [ It turns out that an alternate fix seems to be to just remove the # troublesome remove from the arm64 # that causes the circular dependency. # # But we might as well do the whole belt-and-suspenders thing, and # minimize inclusion in too. Either will fix the # problem, and both are good changes. - Linus ] # # Reported-by: Daniel Díaz # Reported-by: Kees Cook # Tested-by: Marc Zyngier # Fixes: f227e3ec3b5c # Cc: Stephen Rothwell # Signed-off-by: Willy Tarreau # Signed-off-by: Linus Torvalds # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux-ld --version # < git log --format=%s --max-count=1 1c9df907da83812e4f33b59d3d142c864d9da57f # < make -s -j 48 ARCH=powerpc O=/kisskb/build/linus_mpc85xx_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- mpc85xx_defconfig # < make -s -j 48 ARCH=powerpc O=/kisskb/build/linus_mpc85xx_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 48 ARCH=powerpc O=/kisskb/build/linus_mpc85xx_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig # make -s -j 48 ARCH=powerpc O=/kisskb/build/linus_mpc85xx_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- In file included from /kisskb/src/include/linux/kernel.h:11:0, from /kisskb/src/include/linux/list.h:9, from /kisskb/src/include/linux/module.h:12, from /kisskb/src/drivers/net/ethernet/freescale/fs_enet/mac-scc.c:15: /kisskb/src/drivers/net/ethernet/freescale/fs_enet/mac-scc.c: In function 'allocate_bd': /kisskb/src/include/linux/err.h:22:49: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define IS_ERR_VALUE(x) unlikely((unsigned long)(void *)(x) >= (unsigned long)-MAX_ERRNO) ^ /kisskb/src/include/linux/compiler.h:78:42: note: in definition of macro 'unlikely' # define unlikely(x) __builtin_expect(!!(x), 0) ^ /kisskb/src/drivers/net/ethernet/freescale/fs_enet/mac-scc.c:139:6: note: in expansion of macro 'IS_ERR_VALUE' if (IS_ERR_VALUE(fep->ring_mem_addr)) ^ /kisskb/src/arch/powerpc/boot/dts/fsl/mpc8555cds.dts:330.3-21: Warning (pci_device_bus_num): /pci@e0008000/i8259@19000:bus-range: PCI bus number 1 out of range, expected (0 - 0) /kisskb/src/arch/powerpc/boot/dts/fsl/mpc8541cds.dts:330.3-21: Warning (pci_device_bus_num): /pci@e0008000/i8259@19000:bus-range: PCI bus number 1 out of range, expected (0 - 0) INFO: Uncompressed kernel (size 0xcd376c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xcd376c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xcd376c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xcd376c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xcd376c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xcd376c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xcd376c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xcd376c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xcd376c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xcd376c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xcd376c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xcd376c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xcd376c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xcd376c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xcd376c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xcc2f68) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) Image Name: Linux-5.8.0-rc7-g1c9df907da83 Created: Fri Jul 31 03:22:26 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6287059 Bytes = 6139.71 KiB = 6.00 MiB Load Address: 00d00000 Entry Point: 00d00314 Image Name: Linux-5.8.0-rc7-g1c9df907da83 Created: Fri Jul 31 03:22:25 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6287316 Bytes = 6139.96 KiB = 6.00 MiB Load Address: 00d00000 Entry Point: 00d00314 Image Name: Linux-5.8.0-rc7-g1c9df907da83 Created: Fri Jul 31 03:22:25 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6287283 Bytes = 6139.92 KiB = 6.00 MiB Load Address: 00d00000 Entry Point: 00d002a4 Image Name: Linux-5.8.0-rc7-g1c9df907da83 Created: Fri Jul 31 03:22:26 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6287978 Bytes = 6140.60 KiB = 6.00 MiB Load Address: 00d00000 Entry Point: 00d002a4 Image Name: Linux-5.8.0-rc7-g1c9df907da83 Created: Fri Jul 31 03:22:27 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6287018 Bytes = 6139.67 KiB = 6.00 MiB Load Address: 00d00000 Entry Point: 00d002a4 Image Name: Linux-5.8.0-rc7-g1c9df907da83 Created: Fri Jul 31 03:22:24 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6254844 Bytes = 6108.25 KiB = 5.97 MiB Load Address: 00000000 Entry Point: 00000000 Image Name: Linux-5.8.0-rc7-g1c9df907da83 Created: Fri Jul 31 03:22:27 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6287122 Bytes = 6139.77 KiB = 6.00 MiB Load Address: 00d00000 Entry Point: 00d002a4 Image Name: Linux-5.8.0-rc7-g1c9df907da83 Created: Fri Jul 31 03:22:27 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6287067 Bytes = 6139.71 KiB = 6.00 MiB Load Address: 00d00000 Entry Point: 00d002a4 Image Name: Linux-5.8.0-rc7-g1c9df907da83 Created: Fri Jul 31 03:22:28 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6288750 Bytes = 6141.36 KiB = 6.00 MiB Load Address: 00d00000 Entry Point: 00d002a4 Image Name: Linux-5.8.0-rc7-g1c9df907da83 Created: Fri Jul 31 03:22:28 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6287121 Bytes = 6139.77 KiB = 6.00 MiB Load Address: 00d00000 Entry Point: 00d002a4 Image Name: Linux-5.8.0-rc7-g1c9df907da83 Created: Fri Jul 31 03:22:28 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6287058 Bytes = 6139.71 KiB = 6.00 MiB Load Address: 00d00000 Entry Point: 00d00314 Image Name: Linux-5.8.0-rc7-g1c9df907da83 Created: Fri Jul 31 03:22:28 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6287554 Bytes = 6140.19 KiB = 6.00 MiB Load Address: 00d00000 Entry Point: 00d002a4 Image Name: Linux-5.8.0-rc7-g1c9df907da83 Created: Fri Jul 31 03:22:28 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6286981 Bytes = 6139.63 KiB = 6.00 MiB Load Address: 00d00000 Entry Point: 00d00314 Image Name: Linux-5.8.0-rc7-g1c9df907da83 Created: Fri Jul 31 03:22:28 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6289141 Bytes = 6141.74 KiB = 6.00 MiB Load Address: 00d00000 Entry Point: 00d002a4 Image Name: Linux-5.8.0-rc7-g1c9df907da83 Created: Fri Jul 31 03:22:29 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6287179 Bytes = 6139.82 KiB = 6.00 MiB Load Address: 00d00000 Entry Point: 00d00314 Image Name: Linux-5.8.0-rc7-g1c9df907da83 Created: Fri Jul 31 03:22:29 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6287151 Bytes = 6139.80 KiB = 6.00 MiB Load Address: 00d00000 Entry Point: 00d002a4 Completed OK # rm -rf /kisskb/build/linus_mpc85xx_defconfig_powerpc-gcc4.9 # Build took: 0:02:22.182926