x86, vmlinux.lds: unify parainstructions

32 bit:

 - increase alignment from 4 to 8 for .parainstructions
 - increase alignment from 4 to 8 for .altinstructions

64 bit:

 - move ALIGN() outside output section for .altinstructions

None of the above should result in any functional change.

[ Impact: refactor and unify linker script ]

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Tim Abbott <tabbott@MIT.EDU>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
LKML-Reference: <1240991249-27117-10-git-send-email-sam@ravnborg.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

3 files changed, 18 insertions, 36 deletions

diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
index 8b203c4ced9b..c8dd71ecb56f 100644
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -291,6 +291,24 @@ SECTIONS
 
         SECURITY_INIT
 
+        . = ALIGN(8);
+        .parainstructions : AT(ADDR(.parainstructions) - LOAD_OFFSET) {
+                __parainstructions = .;
+                *(.parainstructions)
+                __parainstructions_end = .;
+        }
+
+        . = ALIGN(8);
+        .altinstructions : AT(ADDR(.altinstructions) - LOAD_OFFSET) {
+                __alt_instructions = .;
+                *(.altinstructions)
+                __alt_instructions_end = .;
+        }
+
+        .altinstr_replacement : AT(ADDR(.altinstr_replacement) - LOAD_OFFSET) {
+                *(.altinstr_replacement)
+        }
+
 
 #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 d8ba5394af03..5df9647bb5d9 100644
--- a/arch/x86/kernel/vmlinux_32.lds.S
+++ b/arch/x86/kernel/vmlinux_32.lds.S
@@ -1,21 +1,3 @@
-        . = ALIGN(4);
-        .altinstructions : AT(ADDR(.altinstructions) - LOAD_OFFSET) {
-                __alt_instructions = .;
-                *(.altinstructions)
-                __alt_instructions_end = .;
-        }
-
-        .altinstr_replacement : AT(ADDR(.altinstr_replacement) - LOAD_OFFSET) {
-                *(.altinstr_replacement)
-        }
-
-        . = ALIGN(4);
-        .parainstructions : AT(ADDR(.parainstructions) - LOAD_OFFSET) {
-                __parainstructions = .;
-                *(.parainstructions)
-                __parainstructions_end = .;
-        }
-
         /*
          * .exit.text is discard at runtime, not link time, to deal with
          *  references from .altinstructions and .eh_frame
diff --git a/arch/x86/kernel/vmlinux_64.lds.S b/arch/x86/kernel/vmlinux_64.lds.S
index 0e8054e0c5c4..9ef709669852 100644
--- a/arch/x86/kernel/vmlinux_64.lds.S
+++ b/arch/x86/kernel/vmlinux_64.lds.S
@@ -1,21 +1,3 @@
-        . = ALIGN(8);
-        .parainstructions : AT(ADDR(.parainstructions) - LOAD_OFFSET) {
-                __parainstructions = .;
-                *(.parainstructions)
-                __parainstructions_end = .;
-        }
-
-        .altinstructions : AT(ADDR(.altinstructions) - LOAD_OFFSET) {
-                . = ALIGN(8);
-                __alt_instructions = .;
-                *(.altinstructions)
-                __alt_instructions_end = .;
-        }
-
-        .altinstr_replacement : AT(ADDR(.altinstr_replacement) - LOAD_OFFSET) {
-                *(.altinstr_replacement)
-        }
-
         /*
          * .exit.text is discard at runtime, not link time, to deal with
          *  references from .altinstructions and .eh_frame