From bbefe73df5481154647f24e14ffee7c0ed75a112 Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Tue, 5 Jun 2012 19:28:14 +0900 Subject: [PATCH] --- yaml --- r: 323625 b: refs/heads/master c: 72ef3794c5cd5f5f0e6355c24a529224c449cd14 h: refs/heads/master i: 323623: c9e058814700d30c60b56797a735563b9c493585 v: v3 --- [refs] | 2 +- trunk/kernel/kprobes.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d50e0124a79a..1d71bbe3a455 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 647664eaf4033501739ac1f42dd52ce8c9266ccc +refs/heads/master: 72ef3794c5cd5f5f0e6355c24a529224c449cd14 diff --git a/trunk/kernel/kprobes.c b/trunk/kernel/kprobes.c index c62b8546cc90..7a8a1222c7b1 100644 --- a/trunk/kernel/kprobes.c +++ b/trunk/kernel/kprobes.c @@ -561,9 +561,9 @@ static __kprobes void kprobe_optimizer(struct work_struct *work) { LIST_HEAD(free_list); + mutex_lock(&kprobe_mutex); /* Lock modules while optimizing kprobes */ mutex_lock(&module_mutex); - mutex_lock(&kprobe_mutex); /* * Step 1: Unoptimize kprobes and collect cleaned (unused and disarmed) @@ -586,8 +586,8 @@ static __kprobes void kprobe_optimizer(struct work_struct *work) /* Step 4: Free cleaned kprobes after quiesence period */ do_free_cleaned_kprobes(&free_list); - mutex_unlock(&kprobe_mutex); mutex_unlock(&module_mutex); + mutex_unlock(&kprobe_mutex); /* Step 5: Kick optimizer again if needed */ if (!list_empty(&optimizing_list) || !list_empty(&unoptimizing_list))