From 9bee89532d874665d19df5b195390bd4cb247086 Mon Sep 17 00:00:00 2001 From: Keshavamurthy Anil S Date: Mon, 12 Dec 2005 00:37:12 -0800 Subject: [PATCH] --- yaml --- r: 15023 b: refs/heads/master c: adad0f331f9c693129e81e233c5461e2e7c3e443 h: refs/heads/master i: 15021: 35e2df8ada7249be43e8c63ecd0ee29940d6bd77 15019: 0c91dc777c9e69c0cca2d3b40f3f854a65ffc69b 15015: 0e0b72772faa0dc24f5602d20c43d951eba0225c 15007: d033b9f72ae84f8e4eea863774e8aaaebbe6429c v: v3 --- [refs] | 2 +- trunk/kernel/kprobes.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 9a56f6714483..210d1c00dd71 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b88cb42428f14fabdaf947150c00d65891820635 +refs/heads/master: adad0f331f9c693129e81e233c5461e2e7c3e443 diff --git a/trunk/kernel/kprobes.c b/trunk/kernel/kprobes.c index fde5a16a2913..e4f0fc62bd3e 100644 --- a/trunk/kernel/kprobes.c +++ b/trunk/kernel/kprobes.c @@ -399,10 +399,7 @@ static inline void add_aggr_kprobe(struct kprobe *ap, struct kprobe *p) INIT_LIST_HEAD(&ap->list); list_add_rcu(&p->list, &ap->list); - INIT_HLIST_NODE(&ap->hlist); - hlist_del_rcu(&p->hlist); - hlist_add_head_rcu(&ap->hlist, - &kprobe_table[hash_ptr(ap->addr, KPROBE_HASH_BITS)]); + hlist_replace_rcu(&p->hlist, &ap->hlist); } /*