Commit f3e84166 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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
parents 7f043b76 da0cbf93

arch/arm/mach-at91/sama5.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}