ARC: Change calling convention of do_page_fault()
switch the args (address, pt_regs) to match with all the other "C" exception handlers. This removes the awkwardness in EV_ProtV for page fault vs. unaligned access. Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
This commit is contained in:
parent
d4599baf5c
commit
21a63b5604
|
@ -337,9 +337,9 @@ ARC_ENTRY EV_TLBProtV
|
|||
; vineetg: Mar 6th: Random Seg Fault issue #1
|
||||
; ecr and efa were not saved in case an Intr sneaks in
|
||||
; after fake rtie
|
||||
;
|
||||
|
||||
lr r2, [ecr]
|
||||
lr r1, [efa] ; Faulting Data address
|
||||
lr r0, [efa] ; Faulting Data address
|
||||
|
||||
; --------(4) Return from CPU Exception Mode ---------
|
||||
; Fake a rtie, but rtie to next label
|
||||
|
@ -348,6 +348,8 @@ ARC_ENTRY EV_TLBProtV
|
|||
|
||||
FAKE_RET_FROM_EXCPN r9
|
||||
|
||||
mov r1, sp
|
||||
|
||||
;------ (5) Type of Protection Violation? ----------
|
||||
;
|
||||
; ProtV Hardware Exception is triggered for Access Faults of 2 types
|
||||
|
@ -358,14 +360,11 @@ ARC_ENTRY EV_TLBProtV
|
|||
bbit1 r2, ECR_C_BIT_PROTV_MISALIG_DATA, 4f
|
||||
|
||||
;========= (6a) Access Violation Processing ========
|
||||
mov r0, sp ; pt_regs
|
||||
bl do_page_fault
|
||||
b ret_from_exception
|
||||
|
||||
;========== (6b) Non aligned access ============
|
||||
4:
|
||||
mov r0, r1
|
||||
mov r1, sp ; pt_regs
|
||||
|
||||
#ifdef CONFIG_ARC_MISALIGN_ACCESS
|
||||
SAVE_CALLEE_SAVED_USER
|
||||
|
|
|
@ -52,7 +52,7 @@ bad_area:
|
|||
return 1;
|
||||
}
|
||||
|
||||
void do_page_fault(struct pt_regs *regs, unsigned long address)
|
||||
void do_page_fault(unsigned long address, struct pt_regs *regs)
|
||||
{
|
||||
struct vm_area_struct *vma = NULL;
|
||||
struct task_struct *tsk = current;
|
||||
|
|
|
@ -369,8 +369,8 @@ do_slow_path_pf:
|
|||
EXCEPTION_PROLOGUE
|
||||
|
||||
; ------- setup args for Linux Page fault Hanlder ---------
|
||||
mov_s r0, sp
|
||||
lr r1, [efa]
|
||||
mov_s r1, sp
|
||||
lr r0, [efa]
|
||||
|
||||
; We don't want exceptions to be disabled while the fault is handled.
|
||||
; Now that we have saved the context we return from exception hence
|
||||
|
|
Loading…
Reference in New Issue