summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Ziswiler <marcel.ziswiler@toradex.com>2018-06-21 15:39:33 +0200
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2018-06-21 15:39:33 +0200
commit08cd6c89f78ebe047d62484b45ee4f7e51fb5b15 (patch)
tree03ad4fc03b7a84ad1220c97e4bbe7a072b102284
parente86ab6530fd4e461ae622b6c1ff72359952a7189 (diff)
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 <marcel.ziswiler@toradex.com> Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
-rw-r--r--arch/arm/mm/fsr-3level.c2
1 files changed, 1 insertions, 1 deletions
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