diff options
author | Vineet Gupta <vgupta@synopsys.com> | 2013-02-08 01:40:17 -0500 |
---|---|---|
committer | Vineet Gupta <vgupta@synopsys.com> | 2013-02-15 12:46:20 -0500 |
commit | 7f85e5ec0d451e4a12037dcd6936f2d7494b2c6c (patch) | |
tree | ef5ad51b49ef09be52033dab8787cd99ddfafbfa /arch/arc | |
parent | 1e266629933bb3e40ac7db128f3b661f5bab56c1 (diff) |
ARC: [3.9] Fallout of hlist iterator update
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>
Diffstat (limited to 'arch/arc')
-rw-r--r-- | arch/arc/kernel/kprobes.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arc/kernel/kprobes.c b/arch/arc/kernel/kprobes.c index 47e42f29f927..3bfeacb674de 100644 --- a/arch/arc/kernel/kprobes.c +++ b/arch/arc/kernel/kprobes.c | |||
@@ -440,7 +440,7 @@ static int __kprobes trampoline_probe_handler(struct kprobe *p, | |||
440 | { | 440 | { |
441 | struct kretprobe_instance *ri = NULL; | 441 | struct kretprobe_instance *ri = NULL; |
442 | struct hlist_head *head, empty_rp; | 442 | struct hlist_head *head, empty_rp; |
443 | struct hlist_node *node, *tmp; | 443 | struct hlist_node *tmp; |
444 | unsigned long flags, orig_ret_address = 0; | 444 | unsigned long flags, orig_ret_address = 0; |
445 | unsigned long trampoline_address = (unsigned long)&kretprobe_trampoline; | 445 | unsigned long trampoline_address = (unsigned long)&kretprobe_trampoline; |
446 | 446 | ||
@@ -460,7 +460,7 @@ static int __kprobes trampoline_probe_handler(struct kprobe *p, | |||
460 | * real return address, and all the rest will point to | 460 | * real return address, and all the rest will point to |
461 | * kretprobe_trampoline | 461 | * kretprobe_trampoline |
462 | */ | 462 | */ |
463 | hlist_for_each_entry_safe(ri, node, tmp, head, hlist) { | 463 | hlist_for_each_entry_safe(ri, tmp, head, hlist) { |
464 | if (ri->task != current) | 464 | if (ri->task != current) |
465 | /* another task is sharing our hash bucket */ | 465 | /* another task is sharing our hash bucket */ |
466 | continue; | 466 | continue; |
@@ -488,7 +488,7 @@ static int __kprobes trampoline_probe_handler(struct kprobe *p, | |||
488 | kretprobe_hash_unlock(current, &flags); | 488 | kretprobe_hash_unlock(current, &flags); |
489 | preempt_enable_no_resched(); | 489 | preempt_enable_no_resched(); |
490 | 490 | ||
491 | hlist_for_each_entry_safe(ri, node, tmp, &empty_rp, hlist) { | 491 | hlist_for_each_entry_safe(ri, tmp, &empty_rp, hlist) { |
492 | hlist_del(&ri->hlist); | 492 | hlist_del(&ri->hlist); |
493 | kfree(ri); | 493 | kfree(ri); |
494 | } | 494 | } |