# 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_ppc6xx_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- ppc6xx_defconfig # < make -s -j 48 ARCH=powerpc O=/kisskb/build/linus_ppc6xx_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_ppc6xx_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_ppc6xx_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- /kisskb/src/block/genhd.c: In function 'diskstats_show': /kisskb/src/block/genhd.c:1623:1: warning: the frame size of 1160 bytes is larger than 1024 bytes [-Wframe-larger-than=] } ^ INFO: Uncompressed kernel (size 0xaddd70) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) INFO: Uncompressed kernel (size 0xaddd70) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) INFO: Uncompressed kernel (size 0xaddd70) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) INFO: Uncompressed kernel (size 0xaddd70) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) INFO: Uncompressed kernel (size 0xaddd70) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) INFO: Uncompressed kernel (size 0xaddd70) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) INFO: Uncompressed kernel (size 0xaddd70) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) INFO: Uncompressed kernel (size 0xaddd70) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) INFO: Uncompressed kernel (size 0xaddd70) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) INFO: Uncompressed kernel (size 0xacd688) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) INFO: Uncompressed kernel (size 0xacd688) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) INFO: Uncompressed kernel (size 0xaddd70) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) Image Name: Linux-5.8.0-rc7+ Created: Fri Jul 31 03:53:58 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5252452 Bytes = 5129.35 KiB = 5.01 MiB Load Address: 00b00000 Entry Point: 00b00294 Image Name: Linux-5.8.0-rc7+ Created: Fri Jul 31 03:53:59 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5220430 Bytes = 5098.08 KiB = 4.98 MiB Load Address: 00000000 Entry Point: 00000000 Image Name: Linux-5.8.0-rc7+ Created: Fri Jul 31 03:53:59 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5251144 Bytes = 5128.07 KiB = 5.01 MiB Load Address: 00b00000 Entry Point: 00b00294 Image Name: Linux-5.8.0-rc7+ Created: Fri Jul 31 03:53:59 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5251427 Bytes = 5128.35 KiB = 5.01 MiB Load Address: 00b00000 Entry Point: 00b00294 Image Name: Linux-5.8.0-rc7+ Created: Fri Jul 31 03:53:59 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5251226 Bytes = 5128.15 KiB = 5.01 MiB Load Address: 00b00000 Entry Point: 00b00294 Image Name: Linux-5.8.0-rc7+ Created: Fri Jul 31 03:54:00 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5251498 Bytes = 5128.42 KiB = 5.01 MiB Load Address: 00b00000 Entry Point: 00b00294 Image Name: Linux-5.8.0-rc7+ Created: Fri Jul 31 03:54:00 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5252374 Bytes = 5129.27 KiB = 5.01 MiB Load Address: 00b00000 Entry Point: 00b00894 Image Name: Linux-5.8.0-rc7+ Created: Fri Jul 31 03:54:00 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5251097 Bytes = 5128.02 KiB = 5.01 MiB Load Address: 00b00000 Entry Point: 00b00294 Image Name: Linux-5.8.0-rc7+ Created: Fri Jul 31 03:54:00 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5253009 Bytes = 5129.89 KiB = 5.01 MiB Load Address: 00b00000 Entry Point: 00b00894 Completed OK # rm -rf /kisskb/build/linus_ppc6xx_defconfig_powerpc-gcc4.9 # Build took: 0:03:43.213016