From 842cb4ccd79a3fa35b32d3fe5b22f9c554694a86 Mon Sep 17 00:00:00 2001 From: Vasiliy Ulyanov Date: Fri, 22 Jun 2012 14:53:36 +0400 Subject: [PATCH] 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) --- driver/us_proc_inst.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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); -- 2.7.4