|
@@ -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);
|