Skip to content

Commit

Permalink
microblaze: Remove additional resr and rear loading
Browse files Browse the repository at this point in the history
RESR and REAR uses the same regs in whole file.

Signed-off-by: Michal Simek <monstr@monstr.eu>
  • Loading branch information
Michal Simek committed Apr 1, 2010
1 parent b175bcf commit bd1637d
Showing 1 changed file with 3 additions and 15 deletions.
18 changes: 3 additions & 15 deletions arch/microblaze/kernel/hw_exception_handler.S
Original file line number Diff line number Diff line change
Expand Up @@ -562,20 +562,16 @@ ex_handler_done:
*/
mfs r11, rpid
nop
mfs r3, rear /* Get faulting address */
nop
/* If we are faulting a kernel address, we have to use the
* kernel page tables.
*/
ori r4, r0, CONFIG_KERNEL_START
cmpu r4, r3, r4
bgti r4, ex3
ori r5, r0, CONFIG_KERNEL_START
cmpu r5, r3, r5
bgti r5, ex3
/* First, check if it was a zone fault (which means a user
* tried to access a kernel or read-protected page - always
* a SEGV). All other faults here must be stores, so no
* need to check ESR_S as well. */
mfs r4, resr
nop
andi r4, r4, 0x800 /* ESR_Z - zone protection */
bnei r4, ex2

Expand All @@ -590,8 +586,6 @@ ex_handler_done:
* tried to access a kernel or read-protected page - always
* a SEGV). All other faults here must be stores, so no
* need to check ESR_S as well. */
mfs r4, resr
nop
andi r4, r4, 0x800 /* ESR_Z */
bnei r4, ex2
/* get current task address */
Expand Down Expand Up @@ -666,8 +660,6 @@ ex_handler_done:
* R3 = ESR
*/

mfs r3, rear /* Get faulting address */
nop
RESTORE_STATE;
bri page_fault_instr_trap

Expand All @@ -682,8 +674,6 @@ ex_handler_done:
*/
mfs r11, rpid
nop
mfs r3, rear /* Get faulting address */
nop

/* If we are faulting a kernel address, we have to use the
* kernel page tables. */
Expand Down Expand Up @@ -754,8 +744,6 @@ ex_handler_done:
*/
mfs r11, rpid
nop
mfs r3, rear /* Get faulting address */
nop

/* If we are faulting a kernel address, we have to use the
* kernel page tables.
Expand Down

0 comments on commit bd1637d

Please sign in to comment.