Skip to content

Commit da0cbf9

Browse files
committed
Merge tag 'at91-fixes-6.1-3' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/fixes
AT91 fixes for 6.1 #3 It contains: - build fix for SAMA5D3 devices which don't have an L2 cache and due to this accesssing outer_cache.write_sec in sama5_secure_cache_init() could throw undefined reference to `outer_cache' if CONFIG_OUTER_CACHE is disabled from common sama5_defconfig. * tag 'at91-fixes-6.1-3' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux: ARM: at91: fix build for SAMA5D3 w/o L2 cache Link: https://lore.kernel.org/r/20221125093521.382105-1-claudiu.beznea@microchip.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents b7b275e + 6a3fc8c commit da0cbf9

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/arm/mach-at91/sama5.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ static void sama5_l2c310_write_sec(unsigned long val, unsigned reg)
2626
static void __init sama5_secure_cache_init(void)
2727
{
2828
sam_secure_init();
29-
if (sam_linux_is_optee_available())
29+
if (IS_ENABLED(CONFIG_OUTER_CACHE) && sam_linux_is_optee_available())
3030
outer_cache.write_sec = sama5_l2c310_write_sec;
3131
}
3232

0 commit comments

Comments
 (0)