Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2579fee authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Ingo Molnar
Browse files

cris: Mark _stext and _end as char-arrays, not single char variables 



Mark _stext and _end as character arrays instead of single
character variable, like include/asm-generic/sections.h does.

Signed-off-by: default avatarMasami Hiramatsu <mhiramat@kernel.org>
Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Cc: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
Cc: Chris Zankel <chris@zankel.net>
Cc: David S . Miller <davem@davemloft.net>
Cc: Francis Deslauriers <francis.deslauriers@efficios.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Mikael Starvik <starvik@axis.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: linux-arch@vger.kernel.org
Cc: linux-cris-kernel@axis.com
Cc: mathieu.desnoyers@efficios.com
Link: http://lkml.kernel.org/r/150172782555.27216.2805751327900543374.stgit@devbox


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 18244362

arch/cris/arch-v32/mach-a3/arbiter.c

+2 −2
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ static void crisv32_arbiter_config(int arbiter, int region, int unused_slots) 
	}

}



extern char _stext, _etext;

extern char _stext[], _etext[];



static void crisv32_arbiter_init(void)

{
@@ -265,7 +265,7 @@ static void crisv32_arbiter_init(void) 


#ifndef CONFIG_ETRAX_KGDB

	/* Global watch for writes to kernel text segment. */

	crisv32_arbiter_watch(virt_to_phys(&_stext), &_etext - &_stext,

	crisv32_arbiter_watch(virt_to_phys(_stext), _etext - _stext,

		MARB_CLIENTS(arbiter_all_clients, arbiter_bar_all_clients),

			      arbiter_all_write, NULL);

#endif

arch/cris/arch-v32/mach-fs/arbiter.c

+2 −2
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ static void crisv32_arbiter_config(int region, int unused_slots) 
	}

}



extern char _stext, _etext;

extern char _stext[], _etext[];



static void crisv32_arbiter_init(void)

{
@@ -190,7 +190,7 @@ static void crisv32_arbiter_init(void) 


#ifndef CONFIG_ETRAX_KGDB

	/* Global watch for writes to kernel text segment. */

	crisv32_arbiter_watch(virt_to_phys(&_stext), &_etext - &_stext,

	crisv32_arbiter_watch(virt_to_phys(_stext), _etext - _stext,

			      arbiter_all_clients, arbiter_all_write, NULL);

#endif

}

arch/cris/kernel/traps.c

+3 −3
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ void (*nmi_handler)(struct pt_regs *); 
void show_trace(unsigned long *stack)

{

	unsigned long addr, module_start, module_end;

	extern char _stext, _etext;

	extern char _stext[], _etext[];

	int i;



	pr_err("\nCall Trace: ");
@@ -69,8 +69,8 @@ void show_trace(unsigned long *stack) 
		 * down the cause of the crash will be able to figure

		 * out the call path that was taken.

		 */

		if (((addr >= (unsigned long)&_stext) &&

		     (addr <= (unsigned long)&_etext)) ||

		if (((addr >= (unsigned long)_stext) &&

		     (addr <= (unsigned long)_etext)) ||

		    ((addr >= module_start) && (addr <= module_end))) {

#ifdef CONFIG_KALLSYMS

			print_ip_sym(addr);