diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-10 11:41:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-10 11:41:41 -0700 |
| commit | 2a6f86bc5ed4af2ff04bc927eb77789c70e53a1e (patch) | |
| tree | f14b3a1547a0f26789658f2939c904e180369482 /kernel/kprobes.c | |
| parent | b690a3770e99497982d48a93e30cb7de549aead8 (diff) | |
| parent | e1af3aec3e2e7d21d4b3054323779d478c19d907 (diff) | |
| download | linux-2a6f86bc5ed4af2ff04bc927eb77789c70e53a1e.tar.bz2 | |
Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
tracing: Fix trace_print_seq()
kprobes: No need to unlock kprobe_insn_mutex
tracing/fastboot: Document the need of initcall_debug
trace_export: Repair missed fields
tracing: Fix stack tracer sysctl handling
Diffstat (limited to 'kernel/kprobes.c')
| -rw-r--r-- | kernel/kprobes.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/kernel/kprobes.c b/kernel/kprobes.c index c0fa54b276d9..16b5739c516a 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c @@ -237,13 +237,9 @@ static int __kprobes collect_garbage_slots(void) { struct kprobe_insn_page *kip; struct hlist_node *pos, *next; - int safety; /* Ensure no-one is preepmted on the garbages */ - mutex_unlock(&kprobe_insn_mutex); - safety = check_safety(); - mutex_lock(&kprobe_insn_mutex); - if (safety != 0) + if (check_safety()) return -EAGAIN; hlist_for_each_entry_safe(kip, pos, next, &kprobe_insn_pages, hlist) { |