1 files changed, 13 insertions, 1 deletions

diff --git a/arch/cris/kernel/vmlinux.lds.S b/arch/cris/kernel/vmlinux.lds.S
index d49d17d2a14f..442218980db0 100644
--- a/arch/cris/kernel/vmlinux.lds.S
+++ b/arch/cris/kernel/vmlinux.lds.S
@@ -58,6 +58,8 @@ SECTIONS
         ___data_start = . ;
         __Sdata = . ;
         .data : {                       /* Data */
+                CACHELINE_ALIGNED_DATA(32)
+                READ_MOSTLY_DATA(32)
                 DATA_DATA
         }
         __edata = . ;                   /* End of data section. */
@@ -84,6 +86,16 @@ SECTIONS
         }
         SECURITY_INIT
 
+        /* .exit.text is discarded at runtime, not link time,
+         * to deal with references from __bug_table
+         */
+        .exit.text : {
+                EXIT_TEXT
+        }
+        .exit.data : {
+                EXIT_DATA
+        }
+
 #ifdef CONFIG_ETRAX_ARCH_V10
 #ifdef CONFIG_BLK_DEV_INITRD
         .init.ramfs : {
@@ -112,7 +124,7 @@ SECTIONS
         __init_end = .;
 
         __data_end = . ;                /* Move to _edata ? */
-        BSS_SECTION(0, 0, 0)
+        BSS_SECTION(1, 1, 1)
 
         . =  ALIGN (0x20);
         _end = .;