~hc/RK356X_SDK_RELEASE.git

summary
commits
tree
docs
forks
compare

blame | history | patch | commit | commitdiff

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/arch/powerpc/include/asm/stackprotector.h
.. .. @@ -24,11 +24,7 @@
24 24  	unsigned long canary;
25 25  
26 26  	/* Try to get a semi random initial value. */
27 -#ifdef CONFIG_PREEMPT_RT
28 -	canary = (unsigned long)&canary;
29 -#else
30 27  	canary = get_random_canary();
31 -#endif
32 28  	canary ^= mftb();
33 29  	canary ^= LINUX_VERSION_CODE;
34 30  	canary &= CANARY_MASK;

..	..	@@ -24,11 +24,7 @@
24	24	unsigned long canary;
25	25
26	26	/* Try to get a semi random initial value. */
27		-#ifdef CONFIG_PREEMPT_RT
28		- canary = (unsigned long)&canary;
29		-#else
30	27	canary = get_random_canary();
31		-#endif
32	28	canary ^= mftb();
33	29	canary ^= LINUX_VERSION_CODE;
34	30	canary &= CANARY_MASK;