summaryrefslogtreecommitdiffstats
path: root/arch/arm64/mm
diff options
context:
space:
mode:
authorHuang Shijie <shijie.huang@arm.com>2016-04-18 09:49:56 +0800
committerWill Deacon <will.deacon@arm.com>2016-04-19 09:52:51 +0100
commit3a72db703cc6965662ff6063befa7d7cf2b49a2e (patch)
treec0dba386d566b68b55abc837f08de1da65713453 /arch/arm64/mm
parent66dbd6e61a526ae7d11a208238ae2c17e5cacb6b (diff)
downloadlinux-3a72db703cc6965662ff6063befa7d7cf2b49a2e.tar.bz2
arm64: mm: remove the redundant code
We already re-enable interrupts where necessary in the entry code, so there is no need to do it again in do_page fault. This patch removes the redundant code. Acked-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Huang Shijie <shijie.huang@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm64/mm')
-rw-r--r--arch/arm64/mm/fault.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c
index d24a5e05a3f2..5954881a35ac 100644
--- a/arch/arm64/mm/fault.c
+++ b/arch/arm64/mm/fault.c
@@ -262,10 +262,6 @@ static int __kprobes do_page_fault(unsigned long addr, unsigned int esr,
tsk = current;
mm = tsk->mm;
- /* Enable interrupts if they were enabled in the parent context. */
- if (interrupts_enabled(regs))
- local_irq_enable();
-
/*
* If we're in an interrupt or have no user context, we must not take
* the fault.