From: Huang Shijie <shijie.huang@arm.com>
Date: Mon, 18 Apr 2016 01:49:56 +0000 (+0800)
Subject: arm64: mm: remove the redundant code
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3a72db703cc6965662ff6063befa7d7cf2b49a2e;p=linux-beck.git

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>
---

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.