From 504214d90e43c63722b6d2c99f232a9e53719d83 Mon Sep 17 00:00:00 2001
From: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Date: Fri, 8 Jun 2012 15:02:57 +0530
Subject: [PATCH] --- yaml --- r: 312224 b: refs/heads/master c:
 7eb9ba5ed312ec6ed9d22259c5da1acb7cf4bd29 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/arch/x86/include/asm/uprobes.h | 2 +-
 trunk/arch/x86/kernel/uprobes.c      | 3 ++-
 trunk/kernel/events/uprobes.c        | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 27386113de55..e7339b3c9c33 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 70ab7003dec58afeae7f5d681dfa309b3a259f03
+refs/heads/master: 7eb9ba5ed312ec6ed9d22259c5da1acb7cf4bd29
diff --git a/trunk/arch/x86/include/asm/uprobes.h b/trunk/arch/x86/include/asm/uprobes.h
index 1e9bed14f7ae..f3971bbcd1de 100644
--- a/trunk/arch/x86/include/asm/uprobes.h
+++ b/trunk/arch/x86/include/asm/uprobes.h
@@ -48,7 +48,7 @@ struct arch_uprobe_task {
 #endif
 };
 
-extern int  arch_uprobe_analyze_insn(struct arch_uprobe *aup, struct mm_struct *mm);
+extern int  arch_uprobe_analyze_insn(struct arch_uprobe *aup, struct mm_struct *mm, unsigned long addr);
 extern int  arch_uprobe_pre_xol(struct arch_uprobe *aup, struct pt_regs *regs);
 extern int  arch_uprobe_post_xol(struct arch_uprobe *aup, struct pt_regs *regs);
 extern bool arch_uprobe_xol_was_trapped(struct task_struct *tsk);
diff --git a/trunk/arch/x86/kernel/uprobes.c b/trunk/arch/x86/kernel/uprobes.c
index dc4e910a7d96..36fd42091fa7 100644
--- a/trunk/arch/x86/kernel/uprobes.c
+++ b/trunk/arch/x86/kernel/uprobes.c
@@ -409,9 +409,10 @@ static int validate_insn_bits(struct arch_uprobe *auprobe, struct mm_struct *mm,
  * arch_uprobe_analyze_insn - instruction analysis including validity and fixups.
  * @mm: the probed address space.
  * @arch_uprobe: the probepoint information.
+ * @addr: virtual address at which to install the probepoint
  * Return 0 on success or a -ve number on error.
  */
-int arch_uprobe_analyze_insn(struct arch_uprobe *auprobe, struct mm_struct *mm)
+int arch_uprobe_analyze_insn(struct arch_uprobe *auprobe, struct mm_struct *mm, unsigned long addr)
 {
 	int ret;
 	struct insn insn;
diff --git a/trunk/kernel/events/uprobes.c b/trunk/kernel/events/uprobes.c
index 8c5e043cd309..b52376d02332 100644
--- a/trunk/kernel/events/uprobes.c
+++ b/trunk/kernel/events/uprobes.c
@@ -706,7 +706,7 @@ install_breakpoint(struct uprobe *uprobe, struct mm_struct *mm,
 		if (is_swbp_insn((uprobe_opcode_t *)uprobe->arch.insn))
 			return -EEXIST;
 
-		ret = arch_uprobe_analyze_insn(&uprobe->arch, mm);
+		ret = arch_uprobe_analyze_insn(&uprobe->arch, mm, addr);
 		if (ret)
 			return ret;