ARM: 9444/1: add KEEP() keyword to ARM_VECTORS

commit c3d944a367c0d9e4e125c7006e52f352e75776dc upstream.

Without this, the vectors are removed if LD_DEAD_CODE_DATA_ELIMINATION
is enabled.  At startup, the CPU (silently) hangs in the undefined
instruction exception as soon as the first timer interrupt arrives.

On my setup, the system also boots fine without the 2nd and 3rd KEEP()
statements, so I cannot tell whether these are actually required.

[nathan: Use OVERLAY_KEEP() to avoid breaking old ld.lld versions]

Cc: stable@vger.kernel.org
Fixes: ed0f94102251 ("ARM: 9404/1: arm32: enable HAVE_LD_DEAD_CODE_DATA_ELIMINATION")
Signed-off-by: Christian Eggers <ceggers@arri.de>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/arm/include/asm/vmlinux.lds.h b/arch/arm/include/asm/vmlinux.lds.h
index d60f6e83a9f700f3fc5fe1e08b09c7263f49bf79..f6623fc6cc39858eda69848c0f7a707ee0254d0a 100644 (file)
--- a/arch/arm/include/asm/vmlinux.lds.h
+++ b/arch/arm/include/asm/vmlinux.lds.h
@@ -125,13 +125,13 @@
        __vectors_lma = .;                                              \
        OVERLAY 0xffff0000 : NOCROSSREFS AT(__vectors_lma) {            \
                .vectors {                                              \
-                       *(.vectors)                                     \
+                       OVERLAY_KEEP(*(.vectors))                       \
                }                                                       \
                .vectors.bhb.loop8 {                                    \
-                       *(.vectors.bhb.loop8)                           \
+                       OVERLAY_KEEP(*(.vectors.bhb.loop8))             \
                }                                                       \
                .vectors.bhb.bpiall {                                   \
-                       *(.vectors.bhb.bpiall)                          \
+                       OVERLAY_KEEP(*(.vectors.bhb.bpiall))            \
                }                                                       \
        }                                                               \
        ARM_LMA(__vectors, .vectors);                                   \