1 files changed, 34 insertions, 14 deletions

diff --git a/arch/blackfin/kernel/vmlinux.lds.S b/arch/blackfin/kernel/vmlinux.lds.S
index fb53780247bc..eec43674a465 100644
--- a/arch/blackfin/kernel/vmlinux.lds.S
+++ b/arch/blackfin/kernel/vmlinux.lds.S
@@ -49,7 +49,8 @@ SECTIONS
                 TEXT_TEXT
                 SCHED_TEXT
                 LOCK_TEXT
-                *(.text.lock)
+                KPROBES_TEXT
+                *(.text.*)
                 *(.fixup)
 
                 . = ALIGN(16);
@@ -61,7 +62,7 @@ SECTIONS
                 __etext = .;
         }
 
-        RODATA
+        RO_DATA(PAGE_SIZE)
 
         .data :
         {
@@ -72,50 +73,63 @@ SECTIONS
                 __sdata = .;
                 . = ALIGN(THREAD_SIZE);
                 *(.data.init_task)
-                DATA_DATA
-                CONSTRUCTORS
 
                 . = ALIGN(32);
                 *(.data.cacheline_aligned)
 
+                DATA_DATA
+                *(.data.*)
+                CONSTRUCTORS
+
                 . = ALIGN(THREAD_SIZE);
                 __edata = .;
         }
 
         ___init_begin = .;
-        .init :
+
+        .init.text :
         {
                 . = ALIGN(PAGE_SIZE);
                 __sinittext = .;
                 *(.init.text)
                 __einittext = .;
+        }
+        .init.data :
+        {
+                . = ALIGN(16);
                 *(.init.data)
+        }
+        .init.setup :
+        {
                 . = ALIGN(16);
                 ___setup_start = .;
                 *(.init.setup)
                 ___setup_end = .;
-                ___start___param = .;
-                *(__param)
-                ___stop___param = .;
+        }
+        .initcall.init :
+        {
                 ___initcall_start = .;
                 INITCALLS
                 ___initcall_end = .;
+        }
+        .con_initcall.init :
+        {
                 ___con_initcall_start = .;
                 *(.con_initcall.init)
                 ___con_initcall_end = .;
-                ___security_initcall_start = .;
-                *(.security_initcall.init)
-                ___security_initcall_end = .;
+        }
+        SECURITY_INIT
+        .init.ramfs :
+        {
                 . = ALIGN(4);
                 ___initramfs_start = .;
                 *(.init.ramfs)
                 ___initramfs_end = .;
-                . = ALIGN(4);
         }
 
         __l1_lma_start = .;
 
-        .text_l1 L1_CODE_START : AT(LOADADDR(.init) + SIZEOF(.init))
+        .text_l1 L1_CODE_START : AT(LOADADDR(.init.ramfs) + SIZEOF(.init.ramfs))
         {
                 . = ALIGN(4);
                 __stext_l1 = .;
@@ -164,13 +178,19 @@ SECTIONS
         {
                 . = ALIGN(4);
                 ___bss_start = .;
-                *(.bss)
+                *(.bss .bss.*)
                 *(COMMON)
                 . = ALIGN(4);
                 ___bss_stop = .;
                 __end = .;
         }
 
+        STABS_DEBUG
+
+        DWARF_DEBUG
+
+        NOTES
+
         /DISCARD/ :
         {
                 *(.exit.text)