Re: [PATCH] kprobes: kprobe_mutex is no longer a semaphore

[Prasanna S Panchamukhi]

On Sat, Feb 25, 2006 at 12:42:46PM +0100, Jesper Juhl wrote:
> 
> kprobe_mutex used to be a semaphore it is now a mutex, so calling down/up on
> it is wrong, we should be using mutex_lock/mutex_unlock instead.
> 
> gcc was kind enough to warn about this :
>  arch/i386/kernel/kprobes.c: In function `arch_remove_kprobe':
>  arch/i386/kernel/kprobes.c:135: warning: passing arg 1 of `down' from incompatible pointer type
>  arch/i386/kernel/kprobes.c:137: warning: passing arg 1 of `up' from incompatible pointer type
> 
> 
> Signed-off-by: Jesper Juhl <jesper.juhl@xxxxxxxxx>


Looks good, this patch depends on the sem2mutex-kprobes.patch in -mm
tree.
http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.16-rc4/2.6.16-rc4-mm2/broken-out/sem2mutex-kprobes.patch

Acked-by : Prasanna S Panchamukhi <prasanna@xxxxxxxxxx>

> ---
> 
>  arch/i386/kernel/kprobes.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> --- linux-2.6.16-rc4-mm2-orig/arch/i386/kernel/kprobes.c	2006-02-24 19:25:29.000000000 +0100
> +++ linux-2.6.16-rc4-mm2/arch/i386/kernel/kprobes.c	2006-02-25 12:34:19.000000000 +0100
> @@ -132,9 +132,9 @@ void __kprobes arch_disarm_kprobe(struct
>  
>  void __kprobes arch_remove_kprobe(struct kprobe *p)
>  {
> -	down(&kprobe_mutex);
> +	mutex_lock(&kprobe_mutex);
>  	free_insn_slot(p->ainsn.insn);
> -	up(&kprobe_mutex);
> +	mutex_unlock(&kprobe_mutex);
>  }
>  
>  static inline void save_previous_kprobe(struct kprobe_ctlblk *kcb)
> 
> 

-- 
Prasanna S Panchamukhi
Linux Technology Center
India Software Labs, IBM Bangalore
Email: prasanna@xxxxxxxxxx
Ph: 91-80-51776329
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/