diff options
| author | Guo Ren <guoren@linux.alibaba.com> | 2020-12-28 16:11:26 +0100 |
|---|---|---|
| committer | Guo Ren <guoren@linux.alibaba.com> | 2021-01-12 02:52:41 +0100 |
| commit | 0f7e8efab25735217df11c9c6b7d7696f26340ee (patch) | |
| tree | c0fd32f6bb0367ea40d310b5a667e1bc09067d77 | |
| parent | csky: Add faulthandler_disabled() check (diff) | |
| download | linux-0f7e8efab25735217df11c9c6b7d7696f26340ee.tar.xz linux-0f7e8efab25735217df11c9c6b7d7696f26340ee.zip | |
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>
| -rw-r--r-- | arch/csky/kernel/entry.S | 2 | ||||
| -rw-r--r-- | arch/csky/mm/fault.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/csky/kernel/entry.S b/arch/csky/kernel/entry.S index 185fea477a8d..c1bd7a6b4ab6 100644 --- 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 9533bd8d9a6a..cd8c7304c7e9 100644 --- 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.. |