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

Commit 8211ca65 authored by Russell King's avatar Russell King
Browse files

ARM: Add compiled ISA to oops dumps 



Add the compiled ISA to oops dumps, along side the preempt/smp
configuration.  This allows us to see immediately whether the kernel
was compiled for Thumb-2 or not.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 87067a93

arch/arm/kernel/traps.c

+7 −2
Original line number Diff line number Diff line
@@ -227,6 +227,11 @@ void show_stack(struct task_struct *tsk, unsigned long *sp) 
#else

#define S_SMP ""

#endif

#ifdef CONFIG_THUMB2_KERNEL

#define S_ISA " THUMB2"

#else

#define S_ISA " ARM"

#endif



static int __die(const char *str, int err, struct thread_info *thread, struct pt_regs *regs)

{
@@ -234,8 +239,8 @@ static int __die(const char *str, int err, struct thread_info *thread, struct pt 
	static int die_counter;

	int ret;



	printk(KERN_EMERG "Internal error: %s: %x [#%d]" S_PREEMPT S_SMP "\n",

	       str, err, ++die_counter);

	printk(KERN_EMERG "Internal error: %s: %x [#%d]" S_PREEMPT S_SMP

	       S_ISA "\n", str, err, ++die_counter);



	/* trap and error numbers are mostly meaningless on ARM */

	ret = notify_die(DIE_OOPS, str, regs, err, tsk->thread.trap_no, SIGSEGV);