csky: Fixup do_page_fault parent irq status

We must succeed parent's context irq status in page fault handler.

Signed-off-by: Guo Ren <guoren@linux.alibaba.com>

diff --git a/arch/csky/kernel/entry.S b/arch/csky/kernel/entry.S
index 185fea477a8db739b750e96d72c37d127ccbd862..c1bd7a6b4ab6c1f6455d9f8d26beda6fa09953e6 100644 (file)
--- a/arch/csky/kernel/entry.S
+++ b/arch/csky/kernel/entry.S
@@ -42,7 +42,7 @@ ENTRY(csky_pagefault)
        SAVE_ALL 0
        zero_fp
        context_tracking
-       psrset  ee, ie
+       psrset  ee
        mov     a0, sp
        jbsr    do_page_fault
        jmpi    ret_from_exception

diff --git a/arch/csky/mm/fault.c b/arch/csky/mm/fault.c
index 9533bd8d9a6aed0ba77bb1733421b488f55aa35a..cd8c7304c7e9a48defdcbc285e8ca7b751a43585 100644 (file)
--- a/arch/csky/mm/fault.c
+++ b/arch/csky/mm/fault.c
@@ -143,6 +143,10 @@ asmlinkage void do_page_fault(struct pt_regs *regs)
                return;
        }
 
+       /* Enable interrupts if they were enabled in the parent context. */
+       if (likely(regs->sr & BIT(6)))
+               local_irq_enable();
+
        /*
         * If we're in an interrupt or have no user
         * context, we must not take the fault..