aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/uprobes.h2
-rw-r--r--kernel/events/uprobes.c10
2 files changed, 0 insertions, 12 deletions
diff --git a/include/linux/uprobes.h b/include/linux/uprobes.h
index 24594571c5a3..2615c4d7788d 100644
--- a/include/linux/uprobes.h
+++ b/include/linux/uprobes.h
@@ -101,8 +101,6 @@ extern void uprobe_dup_mmap(struct mm_struct *oldmm, struct mm_struct *newmm);
101extern void uprobe_free_utask(struct task_struct *t); 101extern void uprobe_free_utask(struct task_struct *t);
102extern void uprobe_copy_process(struct task_struct *t); 102extern void uprobe_copy_process(struct task_struct *t);
103extern unsigned long __weak uprobe_get_swbp_addr(struct pt_regs *regs); 103extern unsigned long __weak uprobe_get_swbp_addr(struct pt_regs *regs);
104extern void __weak arch_uprobe_enable_step(struct arch_uprobe *arch);
105extern void __weak arch_uprobe_disable_step(struct arch_uprobe *arch);
106extern int uprobe_post_sstep_notifier(struct pt_regs *regs); 104extern int uprobe_post_sstep_notifier(struct pt_regs *regs);
107extern int uprobe_pre_sstep_notifier(struct pt_regs *regs); 105extern int uprobe_pre_sstep_notifier(struct pt_regs *regs);
108extern void uprobe_notify_resume(struct pt_regs *regs); 106extern void uprobe_notify_resume(struct pt_regs *regs);
diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
index abbfd8440a6d..39c75cc51efc 100644
--- a/kernel/events/uprobes.c
+++ b/kernel/events/uprobes.c
@@ -1430,14 +1430,6 @@ static struct uprobe *find_active_uprobe(unsigned long bp_vaddr, int *is_swbp)
1430 return uprobe; 1430 return uprobe;
1431} 1431}
1432 1432
1433void __weak arch_uprobe_enable_step(struct arch_uprobe *arch)
1434{
1435}
1436
1437void __weak arch_uprobe_disable_step(struct arch_uprobe *arch)
1438{
1439}
1440
1441/* 1433/*
1442 * Run handler and ask thread to singlestep. 1434 * Run handler and ask thread to singlestep.
1443 * Ensure all non-fatal signals cannot interrupt thread while it singlesteps. 1435 * Ensure all non-fatal signals cannot interrupt thread while it singlesteps.
@@ -1491,7 +1483,6 @@ static void handle_swbp(struct pt_regs *regs)
1491 goto out; 1483 goto out;
1492 1484
1493 if (!pre_ssout(uprobe, regs, bp_vaddr)) { 1485 if (!pre_ssout(uprobe, regs, bp_vaddr)) {
1494 arch_uprobe_enable_step(&uprobe->arch);
1495 utask->active_uprobe = uprobe; 1486 utask->active_uprobe = uprobe;
1496 utask->state = UTASK_SSTEP; 1487 utask->state = UTASK_SSTEP;
1497 return; 1488 return;
@@ -1523,7 +1514,6 @@ static void handle_singlestep(struct uprobe_task *utask, struct pt_regs *regs)
1523 else 1514 else
1524 WARN_ON_ONCE(1); 1515 WARN_ON_ONCE(1);
1525 1516
1526 arch_uprobe_disable_step(&uprobe->arch);
1527 put_uprobe(uprobe); 1517 put_uprobe(uprobe);
1528 utask->active_uprobe = NULL; 1518 utask->active_uprobe = NULL;
1529 utask->state = UTASK_RUNNING; 1519 utask->state = UTASK_RUNNING;