[PATCH] kprobes: fix build breakage
The following patch (against 2.6.15-rc5-mm3) fixes a kprobes build break due to changes introduced in the kprobe locking in 2.6.15-rc5-mm3. In addition, the patch reverts back the open-coding of kprobe_mutex. Signed-off-by: Ananth N Mavinakayanahalli <ananth@in.ibm.com> Acked-by: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
committed by
Linus Torvalds
parent
e597c2984c
commit
0498b63504
@ -48,7 +48,7 @@
|
||||
static struct hlist_head kprobe_table[KPROBE_TABLE_SIZE];
|
||||
static struct hlist_head kretprobe_inst_table[KPROBE_TABLE_SIZE];
|
||||
|
||||
static DECLARE_MUTEX(kprobe_mutex); /* Protects kprobe_table */
|
||||
DECLARE_MUTEX(kprobe_mutex); /* Protects kprobe_table */
|
||||
DEFINE_SPINLOCK(kretprobe_lock); /* Protects kretprobe_inst_table */
|
||||
static DEFINE_PER_CPU(struct kprobe *, kprobe_instance) = NULL;
|
||||
|
||||
@ -532,7 +532,7 @@ valid_p:
|
||||
list_del_rcu(&p->list);
|
||||
kfree(old_p);
|
||||
}
|
||||
arch_remove_kprobe(p, &kprobe_mutex);
|
||||
arch_remove_kprobe(p);
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user