aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/powerpc/kernel/exceptions-64s.S2
-rw-r--r--arch/powerpc/kernel/head_32.S2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
index 6879aed47377..445137e2d0ca 100644
--- a/arch/powerpc/kernel/exceptions-64s.S
+++ b/arch/powerpc/kernel/exceptions-64s.S
@@ -1498,7 +1498,7 @@ USE_TEXT_SECTION()
1498 .balign IFETCH_ALIGN_BYTES 1498 .balign IFETCH_ALIGN_BYTES
1499do_hash_page: 1499do_hash_page:
1500#ifdef CONFIG_PPC_BOOK3S_64 1500#ifdef CONFIG_PPC_BOOK3S_64
1501 lis r0,DSISR_BAD_FAULT_64S@h 1501 lis r0,(DSISR_BAD_FAULT_64S|DSISR_DABRMATCH)@h
1502 ori r0,r0,DSISR_BAD_FAULT_64S@l 1502 ori r0,r0,DSISR_BAD_FAULT_64S@l
1503 and. r0,r4,r0 /* weird error? */ 1503 and. r0,r4,r0 /* weird error? */
1504 bne- handle_page_fault /* if not, try to insert a HPTE */ 1504 bne- handle_page_fault /* if not, try to insert a HPTE */
diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S
index 8c54166491e7..29b2fed93289 100644
--- a/arch/powerpc/kernel/head_32.S
+++ b/arch/powerpc/kernel/head_32.S
@@ -388,7 +388,7 @@ DataAccess:
388 EXCEPTION_PROLOG 388 EXCEPTION_PROLOG
389 mfspr r10,SPRN_DSISR 389 mfspr r10,SPRN_DSISR
390 stw r10,_DSISR(r11) 390 stw r10,_DSISR(r11)
391 andis. r0,r10,DSISR_BAD_FAULT_32S@h 391 andis. r0,r10,(DSISR_BAD_FAULT_32S|DSISR_DABRMATCH)@h
392 bne 1f /* if not, try to put a PTE */ 392 bne 1f /* if not, try to put a PTE */
393 mfspr r4,SPRN_DAR /* into the hash table */ 393 mfspr r4,SPRN_DAR /* into the hash table */
394 rlwinm r3,r10,32-15,21,21 /* DSISR_STORE -> _PAGE_RW */ 394 rlwinm r3,r10,32-15,21,21 /* DSISR_STORE -> _PAGE_RW */