Merge remote-tracking branch 'arm64/for-next/fixes' into for-next/core

[sfrench/cifs-2.6.git] / arch / arm64 / kernel / entry-common.c

diff --git a/arch/arm64/kernel/entry-common.c b/arch/arm64/kernel/entry-common.c
index 70e0a7591245d6a1cc1ec07c3e13a3d8e10f95e7..5346953e4382e9424079ad52cffe69f4e83bc6bc 100644 (file)
--- a/arch/arm64/kernel/entry-common.c
+++ b/arch/arm64/kernel/entry-common.c
@@ -115,7 +115,6 @@ static void noinstr el1_abort(struct pt_regs *regs, unsigned long esr)
 
        enter_from_kernel_mode(regs);
        local_daif_inherit(regs);
-       far = untagged_addr(far);
        do_mem_abort(far, esr, regs);
        local_daif_mask();
        exit_to_kernel_mode(regs);
@@ -256,7 +255,6 @@ static void noinstr el0_da(struct pt_regs *regs, unsigned long esr)
 
        enter_from_user_mode();
        local_daif_restore(DAIF_PROCCTX);
-       far = untagged_addr(far);
        do_mem_abort(far, esr, regs);
 }