Skip to content

Commit

Permalink
ARC: entry.S: confine EXCEPTION_* macros to one file
Browse files Browse the repository at this point in the history
Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
  • Loading branch information
Vineet Gupta committed Jun 19, 2015
1 parent f033737 commit a615b47
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 15 deletions.
16 changes: 16 additions & 0 deletions arch/arc/kernel/entry.S
Original file line number Diff line number Diff line change
Expand Up @@ -368,6 +368,22 @@ ENTRY(EV_TLBProtV)

END(EV_TLBProtV)

; Wrapper for Linux page fault handler called from EV_TLBMiss*
; Very similar to ProtV handler case (6a) above, but avoids the extra checks
; for Misaligned access
;
ENTRY(call_do_page_fault)

EXCEPTION_PROLOGUE
lr r0, [efa] ; Faulting Data address
mov r1, sp
FAKE_RET_FROM_EXCPN r9

mov blink, ret_from_exception
b do_page_fault

END(call_do_page_fault)

; ---------------------------------------------
; Privilege Violation Exception Handler
; ---------------------------------------------
Expand Down
16 changes: 1 addition & 15 deletions arch/arc/mm/tlbex.S
Original file line number Diff line number Diff line change
Expand Up @@ -366,19 +366,5 @@ do_slow_path_pf:

; Slow path TLB Miss handled as a regular ARC Exception
; (stack switching / save the complete reg-file).
EXCEPTION_PROLOGUE

; ------- setup args for Linux Page fault Hanlder ---------
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
; exceptions get re-enable

FAKE_RET_FROM_EXCPN r9

bl do_page_fault
b ret_from_exception

b call_do_page_fault
END(EV_TLBMissD)

0 comments on commit a615b47

Please sign in to comment.