Merge tag 'soc-fixes-6.1-5' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

torvalds · torvalds · commit f3e8416619ce · 2022-12-08T11:22:27.000-08:00
Pull ARM SoC fix from Arnd Bergmann:
 "One last build fix came in, addressing a link failure when building
  without CONFIG_OUTER_CACHE"

* tag 'soc-fixes-6.1-5' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  ARM: at91: fix build for SAMA5D3 w/o L2 cache
diff --git a/arch/arm/mach-at91/sama5.c b/arch/arm/mach-at91/sama5.c
@@ -26,7 +26,7 @@ static void sama5_l2c310_write_sec(unsigned long val, unsigned reg)
 static void __init sama5_secure_cache_init(void)
 {
 	sam_secure_init();
-	if (sam_linux_is_optee_available())
+	if (IS_ENABLED(CONFIG_OUTER_CACHE) && sam_linux_is_optee_available())
 		outer_cache.write_sec = sama5_l2c310_write_sec;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ static void sama5_l2c310_write_sec(unsigned long val, unsigned reg)`
`26`	`26`	`static void __init sama5_secure_cache_init(void)`
`27`	`27`	`{`
`28`	`28`	`sam_secure_init();`
`29`		`- if (sam_linux_is_optee_available())`
	`29`	`+ if (IS_ENABLED(CONFIG_OUTER_CACHE) && sam_linux_is_optee_available())`
`30`	`30`	`outer_cache.write_sec = sama5_l2c310_write_sec;`
`31`	`31`	`}`
`32`	`32`