Merge branch 'torvalds/master'

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

diff --git a/arch/avr32/kernel/vmlinux.lds.S b/arch/avr32/kernel/vmlinux.lds.S
index 9cd2bd91d64a613a90b07e148c9e06bda955b9b1..a4589176bed5d7940d1f0e66d144a933892557f5 100644 (file)
--- a/arch/avr32/kernel/vmlinux.lds.S
+++ b/arch/avr32/kernel/vmlinux.lds.S
@@ -23,7 +23,7 @@ SECTIONS
 {
        . = CONFIG_ENTRY_ADDRESS;
        .init           : AT(ADDR(.init) - LOAD_OFFSET) {
-               _stext = .;
+               _text = .;
                __init_begin = .;
                        _sinittext = .;
                        *(.text.reset)
@@ -46,7 +46,7 @@ SECTIONS
 
        .text           : AT(ADDR(.text) - LOAD_OFFSET) {
                _evba = .;
-               _text = .;
+               _stext = .;
                *(.ex.text)
                *(.irq.text)
                KPROBES_TEXT