[PATCH v6 08/39] powerpc: rearrange do_page_fault error case to be inside exception_enter

[Nicholas Piggin]

This keeps the context tracking over the entire interrupt handler which
helps later with moving context tracking into interrupt wrappers.

Signed-off-by: Nicholas Piggin <npig...@gmail.com>
---
 arch/powerpc/mm/fault.c | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
index e476d7701413..e4121fd9fcf1 100644
--- a/arch/powerpc/mm/fault.c
+++ b/arch/powerpc/mm/fault.c
@@ -544,20 +544,24 @@ NOKPROBE_SYMBOL(__do_page_fault);
 
 long do_page_fault(struct pt_regs *regs)
 {
-       const struct exception_table_entry *entry;
-       enum ctx_state prev_state = exception_enter();
-       int rc = __do_page_fault(regs, regs->dar, regs->dsisr);
-       exception_exit(prev_state);
-       if (likely(!rc))
-               return 0;
-
-       entry = search_exception_tables(regs->nip);
-       if (unlikely(!entry))
-               return rc;
+       enum ctx_state prev_state;
+       long err;
+
+       prev_state = exception_enter();
+       err = __do_page_fault(regs, regs->dar, regs->dsisr);
+       if (unlikely(err)) {
+               const struct exception_table_entry *entry;
+
+               entry = search_exception_tables(regs->nip);
+               if (likely(entry)) {
+                       instruction_pointer_set(regs, extable_fixup(entry));
+                       err = 0;
+               }
+       }
 
-       instruction_pointer_set(regs, extable_fixup(entry));
+       exception_exit(prev_state);
 
-       return 0;
+       return err;
 }
 NOKPROBE_SYMBOL(do_page_fault);
 
-- 
2.23.0