aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorSteve Capper <steve.capper@linaro.org>2015-01-23 13:45:06 +0000
committerSteve Capper <steve.capper@linaro.org>2015-01-27 16:46:20 +0000
commit723a2a41e441e00955a36e9e646ff1ec5c9f84f9 (patch)
treeba8a4fbc45fec8fa93308629a3f7a70c8304114c /arch
parentefbdd4967166356c4a9db32e71740506d9a9003d (diff)
downloadlinux-723a2a41e441e00955a36e9e646ff1ec5c9f84f9.tar.gz
Fix for kprobes, remove the spurious irqflag restore
This has been commented on upstream. Signed-off-by: Steve Capper <steve.capper@linaro.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm64/kernel/kprobes.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm64/kernel/kprobes.c b/arch/arm64/kernel/kprobes.c
index 514e11411a6..d72cd300235 100644
--- a/arch/arm64/kernel/kprobes.c
+++ b/arch/arm64/kernel/kprobes.c
@@ -649,8 +649,6 @@ trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs)
kfree(ri);
}
- kprobes_restore_local_irqflag(regs);
-
/* return 1 so that post handlers not called */
return 1;
}