x86, vmlinux.lds: unify exception table

[ Impact: cleanup ]

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-6-git-send-email-sam@ravnborg.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
index a7c88bb4365030ed12f01e93ce0710cf8c668ae2..67164f6f092f929edc644a216e48ff55e4cac934 100644 (file)
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -94,6 +94,16 @@ SECTIONS
 
        NOTES :text :note
 
+       /* Exception table */
+       . = ALIGN(16);
+       __ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) {
+               __start___ex_table = .;
+               *(__ex_table)
+               __stop___ex_table = .;
+       } :text = 0x9090
+
+       RODATA
+
 
 #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 854009288ec4f4a373d288e374ab822552479c5b..920cc6989cc736b8fd5b9e88a5981815833107cb 100644 (file)
--- a/arch/x86/kernel/vmlinux_32.lds.S
+++ b/arch/x86/kernel/vmlinux_32.lds.S
@@ -1,13 +1,3 @@
-       /* Exception table */
-       . = ALIGN(16);
-       __ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) {
-               __start___ex_table = .;
-                *(__ex_table)
-               __stop___ex_table = .;
-       } :text = 0x9090
-
-       RODATA
-
        /* writeable */
        . = ALIGN(PAGE_SIZE);
        /* Data */

diff --git a/arch/x86/kernel/vmlinux_64.lds.S b/arch/x86/kernel/vmlinux_64.lds.S
index b5d43670d809d06bf0123859400ca756eaedd52d..641f3f991a014159e41a9fed078bd84212736f37 100644 (file)
--- a/arch/x86/kernel/vmlinux_64.lds.S
+++ b/arch/x86/kernel/vmlinux_64.lds.S
@@ -1,13 +1,3 @@
-       /* Exception table */
-       . = ALIGN(16);
-       __ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) {
-               __start___ex_table = .;
-                *(__ex_table)
-               __stop___ex_table = .;
-       } :text = 0x9090
-
-       RODATA
-
        /* Align data segment to page size boundary */
        . = ALIGN(PAGE_SIZE);
        /* Data */