aboutsummaryrefslogtreecommitdiffstats
path: root/arch/microblaze/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'arch/microblaze/kernel')
-rw-r--r--arch/microblaze/kernel/hw_exception_handler.S5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/microblaze/kernel/hw_exception_handler.S b/arch/microblaze/kernel/hw_exception_handler.S
index 0a573df47ff8..52b9feb98515 100644
--- a/arch/microblaze/kernel/hw_exception_handler.S
+++ b/arch/microblaze/kernel/hw_exception_handler.S
@@ -75,6 +75,7 @@
75#include <asm/mmu.h> 75#include <asm/mmu.h>
76#include <asm/pgtable.h> 76#include <asm/pgtable.h>
77#include <asm/signal.h> 77#include <asm/signal.h>
78#include <asm/registers.h>
78#include <asm/asm-offsets.h> 79#include <asm/asm-offsets.h>
79 80
80#undef DEBUG 81#undef DEBUG
@@ -581,7 +582,7 @@ ex_handler_done:
581 * tried to access a kernel or read-protected page - always 582 * tried to access a kernel or read-protected page - always
582 * a SEGV). All other faults here must be stores, so no 583 * a SEGV). All other faults here must be stores, so no
583 * need to check ESR_S as well. */ 584 * need to check ESR_S as well. */
584 andi r4, r4, 0x800 /* ESR_Z - zone protection */ 585 andi r4, r4, ESR_DIZ /* ESR_Z - zone protection */
585 bnei r4, ex2 586 bnei r4, ex2
586 587
587 ori r4, r0, swapper_pg_dir 588 ori r4, r0, swapper_pg_dir
@@ -595,7 +596,7 @@ ex_handler_done:
595 * tried to access a kernel or read-protected page - always 596 * tried to access a kernel or read-protected page - always
596 * a SEGV). All other faults here must be stores, so no 597 * a SEGV). All other faults here must be stores, so no
597 * need to check ESR_S as well. */ 598 * need to check ESR_S as well. */
598 andi r4, r4, 0x800 /* ESR_Z */ 599 andi r4, r4, ESR_DIZ /* ESR_Z */
599 bnei r4, ex2 600 bnei r4, ex2
600 /* get current task address */ 601 /* get current task address */
601 addi r4 ,CURRENT_TASK, TOPHYS(0); 602 addi r4 ,CURRENT_TASK, TOPHYS(0);