X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=kernel%2Fspinlock.c;h=2c6c2bf8551446873520376373d78273d16d4f58;hb=c7132aeb72ad1106dc76279de4d005f9e1c5815c;hp=476c3741511b31af1717f90e052880e0e6c9b585;hpb=6f3a28f7d1f0a65a78443c273b6e8ec01becf301;p=powerpc.git

diff --git a/kernel/spinlock.c b/kernel/spinlock.c
index 476c374151..2c6c2bf855 100644
--- a/kernel/spinlock.c
+++ b/kernel/spinlock.c
@@ -293,6 +293,27 @@ void __lockfunc _spin_lock_nested(spinlock_t *lock, int subclass)
 }
 
 EXPORT_SYMBOL(_spin_lock_nested);
+unsigned long __lockfunc _spin_lock_irqsave_nested(spinlock_t *lock, int subclass)
+{
+	unsigned long flags;
+
+	local_irq_save(flags);
+	preempt_disable();
+	spin_acquire(&lock->dep_map, subclass, 0, _RET_IP_);
+	/*
+	 * On lockdep we dont want the hand-coded irq-enable of
+	 * _raw_spin_lock_flags() code, because lockdep assumes
+	 * that interrupts are not re-enabled during lock-acquire:
+	 */
+#ifdef CONFIG_PROVE_SPIN_LOCKING
+	_raw_spin_lock(lock);
+#else
+	_raw_spin_lock_flags(lock, &flags);
+#endif
+	return flags;
+}
+
+EXPORT_SYMBOL(_spin_lock_irqsave_nested);
 
 #endif