ARC: [3.9] Fallout of hlist iterator update
authorVineet Gupta <vgupta@synopsys.com>
Fri, 8 Feb 2013 06:40:17 +0000 (12:10 +0530)
committerVineet Gupta <vgupta@synopsys.com>
Fri, 15 Feb 2013 17:46:20 +0000 (23:16 +0530)
Commit 0bbacca "hlist: drop the node parameter from iterators" changed
the iterator across the board - but ARC port being out-of-tree missed
it.

Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
arch/arc/kernel/kprobes.c

index 47e42f2..3bfeacb 100644 (file)
@@ -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);
        }