Merge 4.14.93 into android-4.14-p

[GitHub/LineageOS/android_kernel_motorola_exynos9610.git] / arch / arm64 / kernel / vmlinux.lds.S

diff --git a/arch/arm64/kernel/vmlinux.lds.S b/arch/arm64/kernel/vmlinux.lds.S
index 6edfdf5b061d6fbb96860cbc1590e6c6a4ce8a56..a2e6d19cbd164e7f75f8cf202272b9ef1dbfa76b 100644 (file)
--- a/arch/arm64/kernel/vmlinux.lds.S
+++ b/arch/arm64/kernel/vmlinux.lds.S
@@ -61,7 +61,7 @@ jiffies = jiffies_64;
 #define TRAMP_TEXT                                     \
        . = ALIGN(PAGE_SIZE);                           \
        VMLINUX_SYMBOL(__entry_tramp_text_start) = .;   \
-       *(.entry.tramp.text)                            \
+       KEEP(*(.entry.tramp.text))                      \
        . = ALIGN(PAGE_SIZE);                           \
        VMLINUX_SYMBOL(__entry_tramp_text_end) = .;
 #else
@@ -151,11 +151,11 @@ SECTIONS
        . = ALIGN(4);
        .altinstructions : {
                __alt_instructions = .;
-               *(.altinstructions)
+               KEEP(*(.altinstructions))
                __alt_instructions_end = .;
        }
        .altinstr_replacement : {
-               *(.altinstr_replacement)
+               KEEP(*(.altinstr_replacement))
        }
 
        . = ALIGN(PAGE_SIZE);