3 files changed, 26 insertions, 24 deletions

diff --git a/arch/x86/vdso/vdso-fakesections.c b/arch/x86/vdso/vdso-fakesections.c
index 56927a7e4977..aa5fbfab20a5 100644
--- a/arch/x86/vdso/vdso-fakesections.c
+++ b/arch/x86/vdso/vdso-fakesections.c
@@ -16,9 +16,6 @@ const char fake_shstrtab[] __attribute__((section(".fake_shstrtab"))) =
         ".rodata\0"
         ".fake_shstrtab\0"  /* Yay, self-referential code. */
         ".note\0"
-        ".data\0"
-        ".altinstructions\0"
-        ".altinstr_replacement\0"
         ".eh_frame_hdr\0"
         ".eh_frame\0"
         ".text";
diff --git a/arch/x86/vdso/vdso-layout.lds.S b/arch/x86/vdso/vdso-layout.lds.S
index e4cbc2145bab..9197544eea9a 100644
--- a/arch/x86/vdso/vdso-layout.lds.S
+++ b/arch/x86/vdso/vdso-layout.lds.S
@@ -14,7 +14,7 @@
 # error unknown VDSO target
 #endif
 
-#define NUM_FAKE_SHDRS 16
+#define NUM_FAKE_SHDRS 13
 
 SECTIONS
 {
@@ -28,15 +28,17 @@ SECTIONS
         .gnu.version_d  : { *(.gnu.version_d) }
         .gnu.version_r  : { *(.gnu.version_r) }
 
-        .note           : { *(.note.*) }                :text   :note
-
-        .eh_frame_hdr   : { *(.eh_frame_hdr) }          :text   :eh_frame_hdr
-        .eh_frame       : { KEEP (*(.eh_frame)) }       :text
-
         .dynamic        : { *(.dynamic) }               :text   :dynamic
 
         .rodata         : {
                 *(.rodata*)
+                *(.data*)
+                *(.sdata*)
+                *(.got.plt) *(.got)
+                *(.gnu.linkonce.d.*)
+                *(.bss*)
+                *(.dynbss*)
+                *(.gnu.linkonce.b.*)
 
                 /*
                  * Ideally this would live in a C file, but that won't
@@ -50,28 +52,29 @@ SECTIONS
 
         .fake_shstrtab  : { *(.fake_shstrtab) }         :text
 
-        .data           : {
-                *(.data*)
-                *(.sdata*)
-                *(.got.plt) *(.got)
-                *(.gnu.linkonce.d.*)
-                *(.bss*)
-                *(.dynbss*)
-                *(.gnu.linkonce.b.*)
-        }
 
-        .altinstructions        : { *(.altinstructions) }
-        .altinstr_replacement   : { *(.altinstr_replacement) }
+        .note           : { *(.note.*) }                :text   :note
+
+        .eh_frame_hdr   : { *(.eh_frame_hdr) }          :text   :eh_frame_hdr
+        .eh_frame       : { KEEP (*(.eh_frame)) }       :text
+
 
         /*
-         * Align the actual code well away from the non-instruction data.
-         * This is the best thing for the I-cache.
+         * Text is well-separated from actual data: there's plenty of
+         * stuff that isn't used at runtime in between.
          */
-        . = ALIGN(0x100);
 
         .text           : { *(.text*) }                 :text   =0x90909090,
 
         /*
+         * At the end so that eu-elflint stays happy when vdso2c strips
+         * these.  A better implementation would avoid allocating space
+         * for these.
+         */
+        .altinstructions        : { *(.altinstructions) }       :text
+        .altinstr_replacement   : { *(.altinstr_replacement) }  :text
+
+        /*
          * The remainder of the vDSO consists of special pages that are
          * shared between the kernel and userspace.  It needs to be at the
          * end so that it doesn't overlap the mapping of the actual
diff --git a/arch/x86/vdso/vdso2c.h b/arch/x86/vdso/vdso2c.h
index f01ed4bde880..f42e2ddc663d 100644
--- a/arch/x86/vdso/vdso2c.h
+++ b/arch/x86/vdso/vdso2c.h
@@ -92,7 +92,9 @@ static void BITSFUNC(copy_section)(struct BITSFUNC(fake_sections) *out,
 {
         uint64_t flags = GET_LE(&in->sh_flags);
 
-        bool copy = flags & SHF_ALLOC;
+        bool copy = flags & SHF_ALLOC &&
+                strcmp(name, ".altinstructions") &&
+                strcmp(name, ".altinstr_replacement");
 
         if (!copy)
                 return;