From 08cd6c89f78ebe047d62484b45ee4f7e51fb5b15 Mon Sep 17 00:00:00 2001 From: Marcel Ziswiler Date: Thu, 21 Jun 2018 15:39:33 +0200 Subject: arm: fix build issue caused by spectre/meltdown patch Currently building fails as follows due to an erroneous + sign in front of an #endif in arch/arm/mm/fsr-3level.c: In file included from /home/user/linux-3.10/arch/arm/mm/fault.c:554:0: /home/user/linux-3.10/arch/arm/mm/fsr-3level.c:68:0: error: unterminated #else make[2]: *** [/home/user/linux-3.10/scripts/Makefile.build:308: arch/arm/mm/fault.o] Error 1 This fixes commit de3110548b04 ("arm: Invalidate BTB on prefetch abort outside of user mapping on Cortex A8, A9, A12 and A17"). Signed-off-by: Marcel Ziswiler Acked-by: Max Krummenacher --- arch/arm/mm/fsr-3level.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mm/fsr-3level.c b/arch/arm/mm/fsr-3level.c index 791ef0c66741..1736967a8dcf 100644 --- a/arch/arm/mm/fsr-3level.c +++ b/arch/arm/mm/fsr-3level.c @@ -134,4 +134,4 @@ static struct fsr_info ifsr_info[] = { }; #else #define ifsr_info fsr_info -+#endif +#endif -- cgit v1.2.3