diff options
| author | Ananth N Mavinakayanahalli <ananth@in.ibm.com> | 2006-01-09 20:52:46 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 08:01:40 -0800 |
| commit | 0498b63504f818e5ab39c818cd6f7b41319a1187 (patch) | |
| tree | d040fd5e2703f9ad601c6949f58ea29e8554154e /kernel | |
| parent | e597c2984c64609c6e1e1ac803f00f7550705860 (diff) | |
| download | lwn-0498b63504f818e5ab39c818cd6f7b41319a1187.tar.gz lwn-0498b63504f818e5ab39c818cd6f7b41319a1187.zip | |
[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>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/kprobes.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/kprobes.c b/kernel/kprobes.c index 19c42cbf91a0..f24cbab558f1 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c @@ -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); } } |