avr32: normalize global variables exported by vmlinux.lds

Normalize global variables exported by vmlinux.lds to conform usage
guidelines from include/asm-generic/sections.h.

Use _text to mark the start of the kernel image including the head text,
and _stext to mark the start of the .text section.

Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
Acked-by: Hans-Christian Egtvedt <egtvedt@samfundet.no>
Cc: Haavard Skinnemoen <hskinnemoen@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/avr32/kernel/setup.c b/arch/avr32/kernel/setup.c
index b4247f4780657993eef27f9e15ed2169b088793b..209ae5ad34958044ae3d6addcafa090f890a8be7 100644 (file)
--- a/arch/avr32/kernel/setup.c
+++ b/arch/avr32/kernel/setup.c
@@ -555,7 +555,7 @@ void __init setup_arch (char **cmdline_p)
 {
        struct clk *cpu_clk;
 
-       init_mm.start_code = (unsigned long)_text;
+       init_mm.start_code = (unsigned long)_stext;
        init_mm.end_code = (unsigned long)_etext;
        init_mm.end_data = (unsigned long)_edata;
        init_mm.brk = (unsigned long)_end;

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