The patch titled remove generic__raw_read_trylock() has been added to the -mm tree. Its filename is remove-generic__raw_read_trylock.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: remove generic__raw_read_trylock() From: Matthew Wilcox <matthew@xxxxxx> If the cpu has the lock held for write, is interrupted, and the interrupt handler calls read_trylock(), it's an instant deadlock. Now, Dave Miller has subsequently pointed out that we don't have any situations where this can occur. Nevertheless, we should delete generic__raw_read_lock (and its associated EXPORT to make Arjan happy) so that nobody thinks they can use it. Cc: "David S. Miller" <davem@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- kernel/spinlock.c | 11 ----------- 1 file changed, 11 deletions(-) diff -puN kernel/spinlock.c~remove-generic__raw_read_trylock kernel/spinlock.c --- a/kernel/spinlock.c~remove-generic__raw_read_trylock +++ a/kernel/spinlock.c @@ -21,17 +21,6 @@ #include <linux/debug_locks.h> #include <linux/module.h> -/* - * Generic declaration of the raw read_trylock() function, - * architectures are supposed to optimize this: - */ -int __lockfunc generic__raw_read_trylock(raw_rwlock_t *lock) -{ - __raw_read_lock(lock); - return 1; -} -EXPORT_SYMBOL(generic__raw_read_trylock); - int __lockfunc _spin_trylock(spinlock_t *lock) { preempt_disable(); _ Patches currently in -mm which might be from matthew@xxxxxx are origin.patch git-parisc.patch m32r-revise-__raw_read_trylock.patch superh-list-is-moderated.patch remove-generic__raw_read_trylock.patch make-sure-nobodys-leaking-resources.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html