Merge remote-tracking branch 'linus/master' into testing

3 files changed, 4 insertions, 4 deletions

diff --git a/arch/avr32/kernel/process.c b/arch/avr32/kernel/process.c
index e7b61494c312..c2731003edef 100644
--- a/arch/avr32/kernel/process.c
+++ b/arch/avr32/kernel/process.c
@@ -341,7 +341,7 @@ unsigned long get_wchan(struct task_struct *p)
                  * is actually quite ugly. It might be possible to
                  * determine the frame size automatically at build
                  * time by doing this:
-                 *   - compile sched.c
+                 *   - compile sched/core.c
                  *   - disassemble the resulting sched.o
                  *   - look for 'sub sp,??' shortly after '<schedule>:'
                  */
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)
 {
         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 9cd2bd91d64a..a4589176bed5 100644
--- 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