Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin: (88 commits)
  Blackfin: Convert BUG() to use unreachable()
  Blackfin: define __NR_recvmmsg
  Blackfin: drop duplicate sched_clock
  Blackfin: NOMPU: skip DMA ICPLB hole when it is redundant
  Blackfin: MPU: add missing __init markings
  Blackfin: add support for TIF_NOTIFY_RESUME
  Blackfin: kgdb_test: clean up code a bit
  Blackfin: convert kgdbtest to proc_fops
  Blackfin: convert cyc2ns() to clocksource_cyc2ns()
  Blackfin: ip0x: pull in asm/portmux.h for P_xxx defines
  Blackfin: drop unused ax88180 resources
  Blackfin: bf537-stamp: add ADF702x network driver resources
  Blackfin: bf537-stamp: add CAN resources
  Blackfin: bf537-stamp: add AD5258 i2c address
  Blackfin: bf537-stamp: add adau1761 i2c address
  Blackfin: bf537-stamp: add adau1371 i2c address
  Blackfin: bf537-stamp: add ADP8870 resources
  Blackfin: bf537-stamp: kill AD714x board-specific Kconfigs
  Blackfin: bf537-stamp: update ADP5520 resources
  Blackfin: bf537-stamp: add ADXL346 orientation sensing support
  ...

1 files changed, 16 insertions, 12 deletions

diff --git a/arch/blackfin/kernel/vmlinux.lds.S b/arch/blackfin/kernel/vmlinux.lds.S
index f39707c6590..66799e763dc 100644
--- a/arch/blackfin/kernel/vmlinux.lds.S
+++ b/arch/blackfin/kernel/vmlinux.lds.S
@@ -121,8 +121,6 @@ SECTIONS
                 EXIT_DATA
         }
 
-        __l1_lma_start = .;
-
         .text_l1 L1_CODE_START : AT(LOADADDR(.exit.data) + SIZEOF(.exit.data))
         {
                 . = ALIGN(4);
@@ -134,9 +132,11 @@ SECTIONS
                 . = ALIGN(4);
                 __etext_l1 = .;
         }
-        ASSERT (SIZEOF(.text_l1) <= L1_CODE_LENGTH, "L1 text overflow!")
+        __text_l1_lma = LOADADDR(.text_l1);
+        __text_l1_len = SIZEOF(.text_l1);
+        ASSERT (__text_l1_len <= L1_CODE_LENGTH, "L1 text overflow!")
 
-        .data_l1 L1_DATA_A_START : AT(LOADADDR(.text_l1) + SIZEOF(.text_l1))
+        .data_l1 L1_DATA_A_START : AT(__text_l1_lma + __text_l1_len)
         {
                 . = ALIGN(4);
                 __sdata_l1 = .;
@@ -152,9 +152,11 @@ SECTIONS
                 . = ALIGN(4);
                 __ebss_l1 = .;
         }
-        ASSERT (SIZEOF(.data_l1) <= L1_DATA_A_LENGTH, "L1 data A overflow!")
+        __data_l1_lma = LOADADDR(.data_l1);
+        __data_l1_len = SIZEOF(.data_l1);
+        ASSERT (__data_l1_len <= L1_DATA_A_LENGTH, "L1 data A overflow!")
 
-        .data_b_l1 L1_DATA_B_START : AT(LOADADDR(.data_l1) + SIZEOF(.data_l1))
+        .data_b_l1 L1_DATA_B_START : AT(__data_l1_lma + __data_l1_len)
         {
                 . = ALIGN(4);
                 __sdata_b_l1 = .;
@@ -167,11 +169,11 @@ SECTIONS
                 . = ALIGN(4);
                 __ebss_b_l1 = .;
         }
-        ASSERT (SIZEOF(.data_b_l1) <= L1_DATA_B_LENGTH, "L1 data B overflow!")
-
-        __l2_lma_start = LOADADDR(.data_b_l1) + SIZEOF(.data_b_l1);
+        __data_b_l1_lma = LOADADDR(.data_b_l1);
+        __data_b_l1_len = SIZEOF(.data_b_l1);
+        ASSERT (__data_b_l1_len <= L1_DATA_B_LENGTH, "L1 data B overflow!")
 
-        .text_data_l2 L2_START : AT(LOADADDR(.data_b_l1) + SIZEOF(.data_b_l1))
+        .text_data_l2 L2_START : AT(__data_b_l1_lma + __data_b_l1_len)
         {
                 . = ALIGN(4);
                 __stext_l2 = .;
@@ -193,12 +195,14 @@ SECTIONS
                 . = ALIGN(4);
                 __ebss_l2 = .;
         }
-        ASSERT (SIZEOF(.text_data_l2) <= L2_LENGTH, "L2 overflow!")
+        __l2_lma = LOADADDR(.text_data_l2);
+        __l2_len = SIZEOF(.text_data_l2);
+        ASSERT (__l2_len <= L2_LENGTH, "L2 overflow!")
 
         /* Force trailing alignment of our init section so that when we
          * free our init memory, we don't leave behind a partial page.
          */
-        . = LOADADDR(.text_data_l2) + SIZEOF(.text_data_l2);
+        . = __l2_lma + __l2_len;
         . = ALIGN(PAGE_SIZE);
         ___init_end = .;