From 553d09aea93abb5440304eb6c557efc36fbd538b Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg@redhat.com>
Date: Sun, 28 Oct 2012 18:14:14 +0100
Subject: [PATCH] --- yaml --- r: 339047 b: refs/heads/master c:
 19f5ee2716373519fda2129e9333f4c3847aa742 h: refs/heads/master i:   339045:
 d7db15e7b5ddb5bb341a257b88eb234e65bcaad0   339043:
 2bb8fa74797712561405db9d39fba7fd8e3a9fd6   339039:
 67e3dc6674c5639e17c55b762c1cf7dd0e16e8bb v: v3

---
 [refs]                        |  2 +-
 trunk/include/linux/uprobes.h |  2 --
 trunk/kernel/events/uprobes.c | 10 ----------
 3 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 0aba34240905..fb20e538fac5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4dc316c64594d1a5ef2d61fba5ae0fe7fe18cdca
+refs/heads/master: 19f5ee2716373519fda2129e9333f4c3847aa742
diff --git a/trunk/include/linux/uprobes.h b/trunk/include/linux/uprobes.h
index 24594571c5a3..2615c4d7788d 100644
--- a/trunk/include/linux/uprobes.h
+++ b/trunk/include/linux/uprobes.h
@@ -101,8 +101,6 @@ extern void uprobe_dup_mmap(struct mm_struct *oldmm, struct mm_struct *newmm);
 extern void uprobe_free_utask(struct task_struct *t);
 extern void uprobe_copy_process(struct task_struct *t);
 extern unsigned long __weak uprobe_get_swbp_addr(struct pt_regs *regs);
-extern void __weak arch_uprobe_enable_step(struct arch_uprobe *arch);
-extern void __weak arch_uprobe_disable_step(struct arch_uprobe *arch);
 extern int uprobe_post_sstep_notifier(struct pt_regs *regs);
 extern int uprobe_pre_sstep_notifier(struct pt_regs *regs);
 extern void uprobe_notify_resume(struct pt_regs *regs);
diff --git a/trunk/kernel/events/uprobes.c b/trunk/kernel/events/uprobes.c
index abbfd8440a6d..39c75cc51efc 100644
--- a/trunk/kernel/events/uprobes.c
+++ b/trunk/kernel/events/uprobes.c
@@ -1430,14 +1430,6 @@ static struct uprobe *find_active_uprobe(unsigned long bp_vaddr, int *is_swbp)
 	return uprobe;
 }
 
-void __weak arch_uprobe_enable_step(struct arch_uprobe *arch)
-{
-}
-
-void __weak arch_uprobe_disable_step(struct arch_uprobe *arch)
-{
-}
-
 /*
  * Run handler and ask thread to singlestep.
  * Ensure all non-fatal signals cannot interrupt thread while it singlesteps.
@@ -1491,7 +1483,6 @@ static void handle_swbp(struct pt_regs *regs)
 		goto out;
 
 	if (!pre_ssout(uprobe, regs, bp_vaddr)) {
-		arch_uprobe_enable_step(&uprobe->arch);
 		utask->active_uprobe = uprobe;
 		utask->state = UTASK_SSTEP;
 		return;
@@ -1523,7 +1514,6 @@ static void handle_singlestep(struct uprobe_task *utask, struct pt_regs *regs)
 	else
 		WARN_ON_ONCE(1);
 
-	arch_uprobe_disable_step(&uprobe->arch);
 	put_uprobe(uprobe);
 	utask->active_uprobe = NULL;
 	utask->state = UTASK_RUNNING;