1 files changed, 6 insertions, 3 deletions

diff --git a/arch/blackfin/kernel/vmlinux.lds.S b/arch/blackfin/kernel/vmlinux.lds.S
index 7d12c6692a65..4b4341da0585 100644
--- a/arch/blackfin/kernel/vmlinux.lds.S
+++ b/arch/blackfin/kernel/vmlinux.lds.S
@@ -68,6 +68,8 @@ SECTIONS
                 __etext = .;
         }
 
+        NOTES
+
         /* Just in case the first read only is a 32-bit access */
         RO_DATA(4)
 
@@ -109,7 +111,6 @@ SECTIONS
 #endif
 
                 DATA_DATA
-                *(.data.*)
                 CONSTRUCTORS
 
                 /* make sure the init_task is aligned to the
@@ -161,12 +162,14 @@ SECTIONS
                 *(.con_initcall.init)
                 ___con_initcall_end = .;
         }
+        PERCPU(4)
         SECURITY_INIT
         .init.ramfs :
         {
                 . = ALIGN(4);
                 ___initramfs_start = .;
                 *(.init.ramfs)
+                . = ALIGN(4);
                 ___initramfs_end = .;
         }
 
@@ -212,7 +215,7 @@ SECTIONS
                 __ebss_b_l1 = .;
         }
 
-        __l2_lma_start = .;
+        __l2_lma_start = LOADADDR(.data_b_l1) + SIZEOF(.data_b_l1);
 
         .text_data_l2 L2_START : AT(LOADADDR(.data_b_l1) + SIZEOF(.data_b_l1))
         {
@@ -240,7 +243,7 @@ SECTIONS
         /* Force trailing alignment of our init section so that when we
          * free our init memory, we don't leave behind a partial page.
          */
-        . = LOADADDR(.data_b_l1) + SIZEOF(.data_b_l1);
+        . = LOADADDR(.text_data_l2) + SIZEOF(.text_data_l2);
         . = ALIGN(PAGE_SIZE);
         ___init_end = .;