Merge branch 'v3.10/topic/misc' into linux-linaro-lsk

[firefly-linux-kernel-4.4.55.git] / arch / arm64 / kernel / vmlinux.lds.S

diff --git a/arch/arm64/kernel/vmlinux.lds.S b/arch/arm64/kernel/vmlinux.lds.S
index af46c8e13737ea70325bf8bf6efc1bda19c0aaf3..18a08e10357f2f2e2529210e78f2cb2f8afd76bc 100644 (file)
--- a/arch/arm64/kernel/vmlinux.lds.S
+++ b/arch/arm64/kernel/vmlinux.lds.S
@@ -85,11 +85,9 @@ SECTIONS
 
        . = ALIGN(PAGE_SIZE);
        _data = .;
-       __data_loc = _data - LOAD_OFFSET;
        _sdata = .;
        RW_DATA_SECTION(64, PAGE_SIZE, THREAD_SIZE)
        _edata = .;
-       _edata_loc = __data_loc + SIZEOF(.data);
 
        BSS_SECTION(0, 0, 0)
        _end = .;