diff options
author | Jiang Liu <liuj97@gmail.com> | 2013-07-03 18:03:34 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-03 19:07:34 -0400 |
commit | 2e555f8d0f81d8e28a63fe432ec7bcc26e95006b (patch) | |
tree | 3f7318a9da6aa62d16ab306f285349e7ea12c243 /arch | |
parent | 1622d1abdf7b554eb7cc40c0d08d989176732242 (diff) |
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>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/avr32/kernel/setup.c | 2 | ||||
-rw-r--r-- | arch/avr32/kernel/vmlinux.lds.S | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/avr32/kernel/setup.c b/arch/avr32/kernel/setup.c index b4247f478065..209ae5ad3495 100644 --- a/arch/avr32/kernel/setup.c +++ b/arch/avr32/kernel/setup.c | |||
@@ -555,7 +555,7 @@ void __init setup_arch (char **cmdline_p) | |||
555 | { | 555 | { |
556 | struct clk *cpu_clk; | 556 | struct clk *cpu_clk; |
557 | 557 | ||
558 | init_mm.start_code = (unsigned long)_text; | 558 | init_mm.start_code = (unsigned long)_stext; |
559 | init_mm.end_code = (unsigned long)_etext; | 559 | init_mm.end_code = (unsigned long)_etext; |
560 | init_mm.end_data = (unsigned long)_edata; | 560 | init_mm.end_data = (unsigned long)_edata; |
561 | init_mm.brk = (unsigned long)_end; | 561 | init_mm.brk = (unsigned long)_end; |
diff --git a/arch/avr32/kernel/vmlinux.lds.S b/arch/avr32/kernel/vmlinux.lds.S index 9cd2bd91d64a..a4589176bed5 100644 --- a/arch/avr32/kernel/vmlinux.lds.S +++ b/arch/avr32/kernel/vmlinux.lds.S | |||
@@ -23,7 +23,7 @@ SECTIONS | |||
23 | { | 23 | { |
24 | . = CONFIG_ENTRY_ADDRESS; | 24 | . = CONFIG_ENTRY_ADDRESS; |
25 | .init : AT(ADDR(.init) - LOAD_OFFSET) { | 25 | .init : AT(ADDR(.init) - LOAD_OFFSET) { |
26 | _stext = .; | 26 | _text = .; |
27 | __init_begin = .; | 27 | __init_begin = .; |
28 | _sinittext = .; | 28 | _sinittext = .; |
29 | *(.text.reset) | 29 | *(.text.reset) |
@@ -46,7 +46,7 @@ SECTIONS | |||
46 | 46 | ||
47 | .text : AT(ADDR(.text) - LOAD_OFFSET) { | 47 | .text : AT(ADDR(.text) - LOAD_OFFSET) { |
48 | _evba = .; | 48 | _evba = .; |
49 | _text = .; | 49 | _stext = .; |
50 | *(.ex.text) | 50 | *(.ex.text) |
51 | *(.irq.text) | 51 | *(.irq.text) |
52 | KPROBES_TEXT | 52 | KPROBES_TEXT |