Skip to contentSkip to conversation

mn10300: Fix crash just after starting userspace on !CONFIG_PREEMPT

PATCH New David Howells 1 participant 1 message Sep 10, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mn10300: Fix crash just after starting userspace on !CONFIG_PREEMPT

From: Akira Takeuchi <[email protected]>

Kernel crashes just after starting userspace programs, if CONFIG_PREEMPT is disabled.

Freeing unused kernel memory: 96K (90286000 - 9029e000)
MISALIGN: 97c33ff9: unsupported instruction f
MISALIGN: 97c33ff9: unsupported instruction f
MISALIGN: 97c33ff9: unsupported instruction f :

This commit fix the problem. It was introduced by the commit d17fc238ac14 (MN10300: Enable IRQs more in system call exit work path).

---
 arch/mn10300/kernel/entry.S |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
arch/mn10300/kernel/entry.S +4 -2
index 222152a..177d61d 100644
@@ -171,10 +171,10 @@ ret_from_intr:
 	mov	(REG_EPSW,fp),d0	# need to deliver signals before
 					# returning to userspace
 	and	EPSW_nSL,d0
-	beq	resume_kernel		# returning to supervisor mode
+	bne	resume_userspace	# returning to userspace
 
 #ifdef CONFIG_PREEMPT
-ENTRY(resume_kernel)
+resume_kernel:
 	LOCAL_IRQ_DISABLE
 	mov	(TI_preempt_count,a2),d0	# non-zero preempt_count ?
 	cmp	0,d0
@@ -189,6 +189,8 @@ need_resched:
 	bne	restore_all
 	call	preempt_schedule_irq[],0
 	jmp	need_resched
+#else
+	jmp	resume_kernel
 #endif