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

Commit e8d809c6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes-for-linus' of git://git.monstr.eu/linux-2.6-microblaze 

* 'fixes-for-linus' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze: Clear sticky FSR register after saving it to func parametr
  microblaze: UMS is used only for MMU kernel
parents ef790fe0 131e4e97

arch/microblaze/kernel/entry.S

+2 −0
Original line number Diff line number Diff line
@@ -592,6 +592,8 @@ C_ENTRY(full_exception_trap): 
	nop

	mfs	r7, rfsr;		/* save FSR */

	nop

	mts	rfsr, r0;	/* Clear sticky fsr */

	nop

	la	r12, r0, full_exception

	set_vms;

	rtbd	r12, 0;

arch/microblaze/kernel/hw_exception_handler.S

+1 −1
Original line number Diff line number Diff line
@@ -384,7 +384,7 @@ handle_other_ex: /* Handle Other exceptions here */ 
	addk	r8, r17, r0; /* Load exception address */

	bralid	r15, full_exception; /* Branch to the handler */

	nop;

	mts	r0, rfsr;	/* Clear sticky fsr */

	mts	rfsr, r0;	/* Clear sticky fsr */

	nop



	/*

arch/microblaze/kernel/process.c

+2 −0
Original line number Diff line number Diff line
@@ -235,7 +235,9 @@ void start_thread(struct pt_regs *regs, unsigned long pc, unsigned long usp) 
	regs->pc = pc;

	regs->r1 = usp;

	regs->pt_mode = 0;

#ifdef CONFIG_MMU

	regs->msr |= MSR_UMS;

#endif

}



#ifdef CONFIG_MMU