X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Flinux%2Fmutex.h;h=b81bc2adaeff138095b0db333948f5c03db8d610;hb=ee7b9e3706b9c5f90113eb16a1a84a1c01e09f95;hp=b2b91c47756340ab9dd1a407490c962cafb4d03c;hpb=2685b267bce34c9b66626cb11664509c32a761a5;p=linux-2.6 diff --git a/include/linux/mutex.h b/include/linux/mutex.h index b2b91c4775..b81bc2adae 100644 --- a/include/linux/mutex.h +++ b/include/linux/mutex.h @@ -105,7 +105,7 @@ do { \ extern void __mutex_init(struct mutex *lock, const char *name, struct lock_class_key *key); -/*** +/** * mutex_is_locked - is the mutex locked * @lock: the mutex to be queried * @@ -125,8 +125,10 @@ extern int fastcall mutex_lock_interruptible(struct mutex *lock); #ifdef CONFIG_DEBUG_LOCK_ALLOC extern void mutex_lock_nested(struct mutex *lock, unsigned int subclass); +extern int mutex_lock_interruptible_nested(struct mutex *lock, unsigned int subclass); #else # define mutex_lock_nested(lock, subclass) mutex_lock(lock) +# define mutex_lock_interruptible_nested(lock, subclass) mutex_lock_interruptible(lock) #endif /*