3 files changed, 20 insertions, 42 deletions

diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
index c8dd71ecb56f..1ab62a5fa1a5 100644
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -309,6 +309,26 @@ SECTIONS
                 *(.altinstr_replacement)
         }
 
+        /*
+         * .exit.text is discard at runtime, not link time, to deal with
+         *  references from .altinstructions and .eh_frame
+         */
+        .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) {
+                EXIT_TEXT
+        }
+
+        .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) {
+                EXIT_DATA
+        }
+
+#ifdef CONFIG_BLK_DEV_INITRD
+        . = ALIGN(PAGE_SIZE);
+        .init.ramfs : AT(ADDR(.init.ramfs) - LOAD_OFFSET) {
+                __initramfs_start = .;
+                *(.init.ramfs)
+                __initramfs_end = .;
+        }
+#endif
 
 #ifdef CONFIG_X86_32
 # include "vmlinux_32.lds.S"
diff --git a/arch/x86/kernel/vmlinux_32.lds.S b/arch/x86/kernel/vmlinux_32.lds.S
index 5df9647bb5d9..36c8fbd3c762 100644
--- a/arch/x86/kernel/vmlinux_32.lds.S
+++ b/arch/x86/kernel/vmlinux_32.lds.S
@@ -1,24 +1,3 @@
-        /*
-         * .exit.text is discard at runtime, not link time, to deal with
-         *  references from .altinstructions and .eh_frame
-         */
-        .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) {
-                EXIT_TEXT
-        }
-
-        .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) {
-                EXIT_DATA
-        }
-
-#if defined(CONFIG_BLK_DEV_INITRD)
-        . = ALIGN(PAGE_SIZE);
-        .init.ramfs : AT(ADDR(.init.ramfs) - LOAD_OFFSET) {
-                __initramfs_start = .;
-                *(.init.ramfs)
-                __initramfs_end = .;
-        }
-#endif
-
         PERCPU(PAGE_SIZE)
 
         . = ALIGN(PAGE_SIZE);
diff --git a/arch/x86/kernel/vmlinux_64.lds.S b/arch/x86/kernel/vmlinux_64.lds.S
index 9ef709669852..1aa536223330 100644
--- a/arch/x86/kernel/vmlinux_64.lds.S
+++ b/arch/x86/kernel/vmlinux_64.lds.S
@@ -1,24 +1,3 @@
-        /*
-         * .exit.text is discard at runtime, not link time, to deal with
-         *  references from .altinstructions and .eh_frame
-         */
-        .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) {
-                EXIT_TEXT
-        }
-
-        .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) {
-                EXIT_DATA
-        }
-
-#ifdef CONFIG_BLK_DEV_INITRD
-        . = ALIGN(PAGE_SIZE);
-        .init.ramfs : AT(ADDR(.init.ramfs) - LOAD_OFFSET) {
-                __initramfs_start = .;
-                *(.init.ramfs)
-                __initramfs_end = .;
-        }
-#endif
-
 #ifdef CONFIG_SMP
         /*
          * percpu offsets are zero-based on SMP.  PERCPU_VADDR() changes the