# 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 <w@1wt.eu>
# 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 <asm/pointer_auth.h> remove from the arm64 <asm/smp.h>
#       that causes the circular dependency.
#     
#       But we might as well do the whole belt-and-suspenders thing, and
#       minimize inclusion in <linux/random.h> too. Either will fix the
#       problem, and both are good changes.   - Linus ]
#     
#     Reported-by: Daniel Díaz <daniel.diaz@linaro.org>
#     Reported-by: Kees Cook <keescook@chromium.org>
#     Tested-by: Marc Zyngier <maz@kernel.org>
#     Fixes: f227e3ec3b5c
#     Cc: Stephen Rothwell <sfr@canb.auug.org.au>
#     Signed-off-by: Willy Tarreau <w@1wt.eu>
#     Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
# < /opt/cross/kisskb/br-sparc64-full-2016.08-613-ge98b4dd/bin/sparc64-linux-gcc --version
# < /opt/cross/kisskb/br-sparc64-full-2016.08-613-ge98b4dd/bin/sparc64-linux-ld --version
# < git log --format=%s --max-count=1 1c9df907da83812e4f33b59d3d142c864d9da57f
# < make -s -j 80 ARCH=sparc64 O=/kisskb/build/linus_sparc64-allmodconfig_sparc64 CROSS_COMPILE=/opt/cross/kisskb/br-sparc64-full-2016.08-613-ge98b4dd/bin/sparc64-linux-  allmodconfig
# Added to kconfig CONFIG_BUILD_DOCSRC=n
# Added to kconfig CONFIG_HAVE_FTRACE_MCOUNT_RECORD=n
# Added to kconfig CONFIG_SAMPLES=n
# Added to kconfig CONFIG_MODULE_SIG=n
# < make -s -j 80 ARCH=sparc64 O=/kisskb/build/linus_sparc64-allmodconfig_sparc64 CROSS_COMPILE=/opt/cross/kisskb/br-sparc64-full-2016.08-613-ge98b4dd/bin/sparc64-linux-  help
# make -s -j 80 ARCH=sparc64 O=/kisskb/build/linus_sparc64-allmodconfig_sparc64 CROSS_COMPILE=/opt/cross/kisskb/br-sparc64-full-2016.08-613-ge98b4dd/bin/sparc64-linux-  olddefconfig
# make -s -j 80 ARCH=sparc64 O=/kisskb/build/linus_sparc64-allmodconfig_sparc64 CROSS_COMPILE=/opt/cross/kisskb/br-sparc64-full-2016.08-613-ge98b4dd/bin/sparc64-linux-  
<stdin>:1511:2: warning: #warning syscall clone3 not implemented [-Wcpp]
In file included from /kisskb/src/arch/sparc/include/asm/percpu_64.h:11:0,
                 from /kisskb/src/arch/sparc/include/asm/percpu.h:5,
                 from /kisskb/src/include/linux/random.h:14,
                 from /kisskb/src/fs/crypto/policy.c:13:
/kisskb/src/arch/sparc/include/asm/trap_block.h:54:39: error: 'NR_CPUS' undeclared here (not in a function)
 extern struct trap_per_cpu trap_block[NR_CPUS];
                                       ^
make[3]: *** [/kisskb/src/scripts/Makefile.build:280: fs/crypto/policy.o] Error 1
make[3]: *** Waiting for unfinished jobs....
make[2]: *** [/kisskb/src/scripts/Makefile.build:497: fs/crypto] Error 2
make[2]: *** Waiting for unfinished jobs....
make[1]: *** [/kisskb/src/Makefile:1756: fs] Error 2
make[1]: *** Waiting for unfinished jobs....
In file included from /kisskb/src/arch/sparc/include/asm/percpu_64.h:11:0,
                 from /kisskb/src/arch/sparc/include/asm/percpu.h:5,
                 from /kisskb/src/include/linux/random.h:14,
                 from /kisskb/src/include/linux/net.h:18,
                 from /kisskb/src/net/ipv6/ip6_fib.c:20:
/kisskb/src/arch/sparc/include/asm/trap_block.h:54:39: error: 'NR_CPUS' undeclared here (not in a function)
 extern struct trap_per_cpu trap_block[NR_CPUS];
                                       ^
make[3]: *** [/kisskb/src/scripts/Makefile.build:280: net/ipv6/ip6_fib.o] Error 1
make[3]: *** Waiting for unfinished jobs....
In file included from /kisskb/src/arch/sparc/include/asm/percpu_64.h:11:0,
                 from /kisskb/src/arch/sparc/include/asm/percpu.h:5,
                 from /kisskb/src/include/linux/random.h:14,
                 from /kisskb/src/net/mptcp/protocol.h:10,
                 from /kisskb/src/net/mptcp/crypto.c:27:
/kisskb/src/arch/sparc/include/asm/trap_block.h:54:39: error: 'NR_CPUS' undeclared here (not in a function)
 extern struct trap_per_cpu trap_block[NR_CPUS];
                                       ^
make[3]: *** [/kisskb/src/scripts/Makefile.build:280: net/mptcp/crypto.o] Error 1
make[2]: *** [/kisskb/src/scripts/Makefile.build:497: net/mptcp] Error 2
make[2]: *** Waiting for unfinished jobs....
make[2]: *** [/kisskb/src/scripts/Makefile.build:497: net/ipv6] Error 2
In file included from /kisskb/src/arch/sparc/include/asm/percpu_64.h:11:0,
                 from /kisskb/src/arch/sparc/include/asm/percpu.h:5,
                 from /kisskb/src/include/linux/random.h:14,
                 from /kisskb/src/lib/uuid.c:14:
/kisskb/src/arch/sparc/include/asm/trap_block.h:54:39: error: 'NR_CPUS' undeclared here (not in a function)
 extern struct trap_per_cpu trap_block[NR_CPUS];
                                       ^
make[2]: *** [/kisskb/src/scripts/Makefile.build:281: lib/uuid.o] Error 1
make[2]: *** Waiting for unfinished jobs....
make[1]: *** [/kisskb/src/Makefile:1756: lib] Error 2
In file included from /kisskb/src/arch/sparc/include/asm/percpu_64.h:11:0,
                 from /kisskb/src/arch/sparc/include/asm/percpu.h:5,
                 from /kisskb/src/include/linux/random.h:14,
                 from /kisskb/src/net/sched/cls_flow.c:12:
/kisskb/src/arch/sparc/include/asm/trap_block.h:54:39: error: 'NR_CPUS' undeclared here (not in a function)
 extern struct trap_per_cpu trap_block[NR_CPUS];
                                       ^
make[3]: *** [/kisskb/src/scripts/Makefile.build:280: net/sched/cls_flow.o] Error 1
make[3]: *** Waiting for unfinished jobs....
make[2]: *** [/kisskb/src/scripts/Makefile.build:497: net/sched] Error 2
In file included from /kisskb/src/arch/sparc/include/asm/percpu_64.h:11:0,
                 from /kisskb/src/arch/sparc/include/asm/percpu.h:5,
                 from /kisskb/src/include/linux/random.h:14,
                 from /kisskb/src/include/crypto/drbg.h:43,
                 from /kisskb/src/crypto/drbg.c:100:
/kisskb/src/arch/sparc/include/asm/trap_block.h:54:39: error: 'NR_CPUS' undeclared here (not in a function)
 extern struct trap_per_cpu trap_block[NR_CPUS];
                                       ^
make[2]: *** [/kisskb/src/scripts/Makefile.build:280: crypto/drbg.o] Error 1
make[1]: *** [/kisskb/src/Makefile:1756: crypto] Error 2
/kisskb/src/drivers/input/joystick/analog.c:160:2: warning: #warning Precise timer not defined for this architecture. [-Wcpp]
 #warning Precise timer not defined for this architecture.
  ^
In file included from /kisskb/src/arch/sparc/include/asm/percpu_64.h:11:0,
                 from /kisskb/src/arch/sparc/include/asm/percpu.h:5,
                 from /kisskb/src/include/linux/random.h:14,
                 from /kisskb/src/net/ipv4/tcp_cdg.c:29:
/kisskb/src/arch/sparc/include/asm/trap_block.h:54:39: error: 'NR_CPUS' undeclared here (not in a function)
 extern struct trap_per_cpu trap_block[NR_CPUS];
                                       ^
make[3]: *** [/kisskb/src/scripts/Makefile.build:280: net/ipv4/tcp_cdg.o] Error 1
make[2]: *** [/kisskb/src/scripts/Makefile.build:497: net/ipv4] Error 2
In file included from /kisskb/src/arch/sparc/include/asm/percpu_64.h:11:0,
                 from /kisskb/src/arch/sparc/include/asm/percpu.h:5,
                 from /kisskb/src/include/linux/random.h:14,
                 from /kisskb/src/include/linux/net.h:18,
                 from /kisskb/src/drivers/target/target_core_device.c:14:
/kisskb/src/arch/sparc/include/asm/trap_block.h:54:39: error: 'NR_CPUS' undeclared here (not in a function)
 extern struct trap_per_cpu trap_block[NR_CPUS];
                                       ^
make[3]: *** [/kisskb/src/scripts/Makefile.build:280: drivers/target/target_core_device.o] Error 1
make[3]: *** Waiting for unfinished jobs....
make[2]: *** [/kisskb/src/scripts/Makefile.build:497: drivers/target] Error 2
make[2]: *** Waiting for unfinished jobs....
make[1]: *** [/kisskb/src/Makefile:1756: net] Error 2
In file included from /kisskb/src/arch/sparc/include/asm/percpu_64.h:11:0,
                 from /kisskb/src/arch/sparc/include/asm/percpu.h:5,
                 from /kisskb/src/include/linux/random.h:14,
                 from /kisskb/src/drivers/gpu/drm/lib/drm_random.c:4:
/kisskb/src/arch/sparc/include/asm/trap_block.h:54:39: error: 'NR_CPUS' undeclared here (not in a function)
 extern struct trap_per_cpu trap_block[NR_CPUS];
                                       ^
make[4]: *** [/kisskb/src/scripts/Makefile.build:281: drivers/gpu/drm/lib/drm_random.o] Error 1
make[4]: *** Waiting for unfinished jobs....
make[3]: *** [/kisskb/src/scripts/Makefile.build:497: drivers/gpu/drm] Error 2
make[2]: *** [/kisskb/src/scripts/Makefile.build:497: drivers/gpu] Error 2
make[1]: *** [/kisskb/src/Makefile:1756: drivers] Error 2
make: *** [Makefile:185: __sub-make] Error 2
Command 'make -s -j 80 ARCH=sparc64 O=/kisskb/build/linus_sparc64-allmodconfig_sparc64 CROSS_COMPILE=/opt/cross/kisskb/br-sparc64-full-2016.08-613-ge98b4dd/bin/sparc64-linux-  ' returned non-zero exit status 2
# rm -rf /kisskb/build/linus_sparc64-allmodconfig_sparc64
# Build took: 0:10:11.658970