GitHub-Mirror/linux-bl808
2
0
Fork 0
mirror of https://github.com/Fishwaldo/linux-bl808.git synced 2025-06-17 20:25:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
* '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
This commit is contained in:
Linus Torvalds 2009-10-05 12:06:59 -07:00
commit e8d809c613
3 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
arch/microblaze/kernel/entry.S
View file

@ -592,6 +592,8 @@ C_ENTRY(full_exception_trap):
nop nop
mfs r7, rfsr; /* save FSR */ mfs r7, rfsr; /* save FSR */
nop nop
mts rfsr, r0; /* Clear sticky fsr */
nop
la r12, r0, full_exception la r12, r0, full_exception
set_vms; set_vms;
rtbd r12, 0; rtbd r12, 0;

2
arch/microblaze/kernel/hw_exception_handler.S
View file

@ -384,7 +384,7 @@ handle_other_ex: /* Handle Other exceptions here */
addk r8, r17, r0; /* Load exception address */ addk r8, r17, r0; /* Load exception address */
bralid r15, full_exception; /* Branch to the handler */ bralid r15, full_exception; /* Branch to the handler */
nop; nop;
mts r0, rfsr; /* Clear sticky fsr */ mts rfsr, r0; /* Clear sticky fsr */
nop nop
/* /*

2
arch/microblaze/kernel/process.c
View file

@ -235,7 +235,9 @@ void start_thread(struct pt_regs *regs, unsigned long pc, unsigned long usp)
regs->pc = pc; regs->pc = pc;
regs->r1 = usp; regs->r1 = usp;
regs->pt_mode = 0; regs->pt_mode = 0;
#ifdef CONFIG_MMU
regs->msr |= MSR_UMS; regs->msr |= MSR_UMS;
#endif
} }
#ifdef CONFIG_MMU #ifdef CONFIG_MMU