From 6455679c0b22d6a2d1d581448b04334b81806017 Mon Sep 17 00:00:00 2001 From: Vineet Gupta Date: Fri, 8 Feb 2013 12:10:17 +0530 Subject: [PATCH] --- yaml --- r: 360188 b: refs/heads/master c: 7f85e5ec0d451e4a12037dcd6936f2d7494b2c6c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arc/kernel/kprobes.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 4730893f5108..c098c450d314 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1e266629933bb3e40ac7db128f3b661f5bab56c1 +refs/heads/master: 7f85e5ec0d451e4a12037dcd6936f2d7494b2c6c diff --git a/trunk/arch/arc/kernel/kprobes.c b/trunk/arch/arc/kernel/kprobes.c index 47e42f29f927..3bfeacb674de 100644 --- a/trunk/arch/arc/kernel/kprobes.c +++ b/trunk/arch/arc/kernel/kprobes.c @@ -440,7 +440,7 @@ static int __kprobes trampoline_probe_handler(struct kprobe *p, { struct kretprobe_instance *ri = NULL; struct hlist_head *head, empty_rp; - struct hlist_node *node, *tmp; + struct hlist_node *tmp; unsigned long flags, orig_ret_address = 0; unsigned long trampoline_address = (unsigned long)&kretprobe_trampoline; @@ -460,7 +460,7 @@ static int __kprobes trampoline_probe_handler(struct kprobe *p, * real return address, and all the rest will point to * kretprobe_trampoline */ - hlist_for_each_entry_safe(ri, node, tmp, head, hlist) { + hlist_for_each_entry_safe(ri, tmp, head, hlist) { if (ri->task != current) /* another task is sharing our hash bucket */ continue; @@ -488,7 +488,7 @@ static int __kprobes trampoline_probe_handler(struct kprobe *p, kretprobe_hash_unlock(current, &flags); preempt_enable_no_resched(); - hlist_for_each_entry_safe(ri, node, tmp, &empty_rp, hlist) { + hlist_for_each_entry_safe(ri, tmp, &empty_rp, hlist) { hlist_del(&ri->hlist); kfree(ri); }