From: Vasiliy Ulyanov <v.ulyanov@samsung.com>
Date: Fri, 22 Jun 2012 10:53:36 +0000 (+0400)
Subject: MEC:
X-Git-Tag: Tizen_SDK_2.3~794^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=842cb4ccd79a3fa35b32d3fe5b22f9c554694a86;p=kernel%2Fswap-modules.git

MEC:
    1. Fixed mec_add_object wrong behaviour (in case when the same
       object already exists)
    2. Added temporary workaround in get_ret_addr (the old version
       causes kernel panics on new PQ Proxima firmware)
---

diff --git a/driver/us_proc_inst.c b/driver/us_proc_inst.c
index ac3e210..6ac460d 100644
--- a/driver/us_proc_inst.c
+++ b/driver/us_proc_inst.c
@@ -1751,7 +1751,7 @@ EXPORT_SYMBOL_GPL(dump_backtrace);
 static void *get_ret_addr(struct task_struct *task, us_proc_ip_t *ip,
 		struct pt_regs *regs)
 {
-	unsigned long retaddr = 0;
+	/*unsigned long retaddr = 0;
 	struct hlist_node *item, *tmp_node;
 	struct kretprobe_instance *ri;
 
@@ -1762,6 +1762,7 @@ static void *get_ret_addr(struct task_struct *task, us_proc_ip_t *ip,
 			retaddr = (unsigned long)ri->ret_addr;
 	}
 
-	return ((void *)retaddr);
+	return ((void *)retaddr);*/
+	return regs->ARM_lr;
 }
 EXPORT_SYMBOL_GPL(get_ret_addr);