Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

[pandora-kernel.git] / include / linux / spinlock_api_smp.h

diff --git a/include/linux/spinlock_api_smp.h b/include/linux/spinlock_api_smp.h
index 78e6989..b2c4f82 100644 (file)
--- a/include/linux/spinlock_api_smp.h
+++ b/include/linux/spinlock_api_smp.h
@@ -20,6 +20,8 @@ int in_lock_functions(unsigned long addr);
 #define assert_spin_locked(x)  BUG_ON(!spin_is_locked(x))
 
 void __lockfunc _spin_lock(spinlock_t *lock)           __acquires(spinlock_t);
+void __lockfunc _spin_lock_nested(spinlock_t *lock, int subclass)
+                                                       __acquires(spinlock_t);
 void __lockfunc _read_lock(rwlock_t *lock)             __acquires(rwlock_t);
 void __lockfunc _write_lock(rwlock_t *lock)            __acquires(rwlock_t);
 void __lockfunc _spin_lock_bh(spinlock_t *lock)                __acquires(spinlock_t);