Commit 6d1b79f3 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] ppc32: fix PPC4xx for the handle_page_fault() change

From: Matt Porter <mporter@kernel.crashing.org>

Fixes PPC4xx from the do_page_fault()->handle_page_fault() change.
Signed-off-by: default avatarMatt Porter <mporter@kernel.crashing.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e254e56c
...@@ -661,8 +661,7 @@ interrupt_base: ...@@ -661,8 +661,7 @@ interrupt_base:
NORMAL_EXCEPTION_PROLOG NORMAL_EXCEPTION_PROLOG
mr r4,r12 /* Pass SRR0 as arg2 */ mr r4,r12 /* Pass SRR0 as arg2 */
li r5,0 /* Pass zero as arg3 */ li r5,0 /* Pass zero as arg3 */
addi r3,r1,STACK_FRAME_OVERHEAD EXC_XFER_EE_LITE(0x0400, handle_page_fault)
EXC_XFER_EE_LITE(0x0400, do_page_fault)
/* External Input Interrupt */ /* External Input Interrupt */
EXCEPTION(0x0500, ExternalInput, do_IRQ, EXC_XFER_LITE) EXCEPTION(0x0500, ExternalInput, do_IRQ, EXC_XFER_LITE)
...@@ -914,9 +913,7 @@ data_access: ...@@ -914,9 +913,7 @@ data_access:
mfspr r5,SPRN_ESR /* Grab the ESR, save it, pass arg3 */ mfspr r5,SPRN_ESR /* Grab the ESR, save it, pass arg3 */
stw r5,_ESR(r11) stw r5,_ESR(r11)
mfspr r4,SPRN_DEAR /* Grab the DEAR, save it, pass arg2 */ mfspr r4,SPRN_DEAR /* Grab the DEAR, save it, pass arg2 */
stw r4,_DEAR(r11) EXC_XFER_EE_LITE(0x0300, handle_page_fault)
addi r3,r1,STACK_FRAME_OVERHEAD
EXC_XFER_EE_LITE(0x0300, do_page_fault)
/* /*
......
...@@ -432,8 +432,7 @@ label: ...@@ -432,8 +432,7 @@ label:
NORMAL_EXCEPTION_PROLOG NORMAL_EXCEPTION_PROLOG
mr r4,r12 /* Pass SRR0 as arg2 */ mr r4,r12 /* Pass SRR0 as arg2 */
li r5,0 /* Pass zero as arg3 */ li r5,0 /* Pass zero as arg3 */
addi r3,r1,STACK_FRAME_OVERHEAD EXC_XFER_EE_LITE(0x400, handle_page_fault)
EXC_XFER_EE_LITE(0x400, do_page_fault)
/* 0x0500 - External Interrupt Exception */ /* 0x0500 - External Interrupt Exception */
EXCEPTION(0x0500, HardwareInterrupt, do_IRQ, EXC_XFER_LITE) EXCEPTION(0x0500, HardwareInterrupt, do_IRQ, EXC_XFER_LITE)
...@@ -763,9 +762,7 @@ DataAccess: ...@@ -763,9 +762,7 @@ DataAccess:
mfspr r5,SPRN_ESR /* Grab the ESR, save it, pass arg3 */ mfspr r5,SPRN_ESR /* Grab the ESR, save it, pass arg3 */
stw r5,_ESR(r11) stw r5,_ESR(r11)
mfspr r4,SPRN_DEAR /* Grab the DEAR, save it, pass arg2 */ mfspr r4,SPRN_DEAR /* Grab the DEAR, save it, pass arg2 */
stw r4,_DEAR(r11) EXC_XFER_EE_LITE(0x300, handle_page_fault)
addi r3,r1,STACK_FRAME_OVERHEAD
EXC_XFER_EE_LITE(0x300, do_page_fault)
/* Other PowerPC processors, namely those derived from the 6xx-series /* Other PowerPC processors, namely those derived from the 6xx-series
* have vectors from 0x2100 through 0x2F00 defined, but marked as reserved. * have vectors from 0x2100 through 0x2F00 defined, but marked as reserved.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment