Merge /spare/repo/linux-2.6/

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/ppc64/kernel/kprobes.c b/arch/ppc64/kernel/kprobes.c
index 7e80d49c589a..9c6facc24f70 100644
--- a/arch/ppc64/kernel/kprobes.c
+++ b/arch/ppc64/kernel/kprobes.c
@@ -59,9 +59,9 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p)
 
         /* insn must be on a special executable page on ppc64 */
         if (!ret) {
-                up(&kprobe_mutex);
-                p->ainsn.insn = get_insn_slot();
                 down(&kprobe_mutex);
+                p->ainsn.insn = get_insn_slot();
+                up(&kprobe_mutex);
                 if (!p->ainsn.insn)
                         ret = -ENOMEM;
         }
@@ -90,9 +90,9 @@ void __kprobes arch_disarm_kprobe(struct kprobe *p)
 
 void __kprobes arch_remove_kprobe(struct kprobe *p)
 {
-        up(&kprobe_mutex);
-        free_insn_slot(p->ainsn.insn);
         down(&kprobe_mutex);
+        free_insn_slot(p->ainsn.insn);
+        up(&kprobe_mutex);
 }
 
 static inline void prepare_singlestep(struct kprobe *p, struct pt_regs *regs)