summaryrefslogtreecommitdiff
path: root/arch/arm/probes
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2017-08-10 19:05:53 +0300
committerTony Lindgren <tony@atomide.com>2017-08-10 19:05:53 +0300
commitc002c27874faaa170b535d03d7efee89ecdd9be4 (patch)
tree70d91eba77a9c374e4f0bf9eb8636acba57ca173 /arch/arm/probes
parent866b5e447f1ad3a0d72c139fabe3dd71f351f361 (diff)
parent5771a8c08880cdca3bfb4a3fc6d309d6bba20877 (diff)
downloadlinux-c002c27874faaa170b535d03d7efee89ecdd9be4.tar.xz
Merge tag 'v4.13-rc1' into omap-for-v4.14/mmc-regulator
Linux v4.13-rc1
Diffstat (limited to 'arch/arm/probes')
-rw-r--r--arch/arm/probes/kprobes/core.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/probes/kprobes/core.c b/arch/arm/probes/kprobes/core.c
index ad1f4e6a9e33..52d1cd14fda4 100644
--- a/arch/arm/probes/kprobes/core.c
+++ b/arch/arm/probes/kprobes/core.c
@@ -182,7 +182,8 @@ void __kprobes kprobes_remove_breakpoint(void *addr, unsigned int insn)
.addr = addr,
.insn = insn,
};
- stop_machine(__kprobes_remove_breakpoint, &p, cpu_online_mask);
+ stop_machine_cpuslocked(__kprobes_remove_breakpoint, &p,
+ cpu_online_mask);
}
void __kprobes arch_disarm_kprobe(struct kprobe *p)