The patch titled
lockdep-spin_lock_irqsave_nested-fix-2
has been removed from the -mm tree. Its filename was
lockdep-spin_lock_irqsave_nested-fix-2.patch
This patch was dropped because it was folded into lockdep-spin_lock_irqsave_nested.patch
------------------------------------------------------
Subject: lockdep-spin_lock_irqsave_nested-fix-2
From: Andrew Morton <akpm@xxxxxxxx>
Cc: Arjan van de Ven <arjan@xxxxxxxxxxxxxxx>
Cc: Jiri Kosina <jikos@xxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/linux/spinlock_api_smp.h | 2 +-
include/linux/spinlock_api_up.h | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff -puN include/linux/spinlock_api_smp.h~lockdep-spin_lock_irqsave_nested-fix-2 include/linux/spinlock_api_smp.h
--- a/include/linux/spinlock_api_smp.h~lockdep-spin_lock_irqsave_nested-fix-2
+++ a/include/linux/spinlock_api_smp.h
@@ -33,7 +33,7 @@ void __lockfunc _write_lock_irq(rwlock_t
unsigned long __lockfunc _spin_lock_irqsave(spinlock_t *lock)
__acquires(lock);
unsigned long __lockfunc _spin_lock_irqsave_nested(spinlock_t *lock, int subclass)
- __acquires(spinlock_t);
+ __acquires(lock);
unsigned long __lockfunc _read_lock_irqsave(rwlock_t *lock)
__acquires(lock);
unsigned long __lockfunc _write_lock_irqsave(rwlock_t *lock)
diff -puN include/linux/spinlock_api_up.h~lockdep-spin_lock_irqsave_nested-fix-2 include/linux/spinlock_api_up.h
--- a/include/linux/spinlock_api_up.h~lockdep-spin_lock_irqsave_nested-fix-2
+++ a/include/linux/spinlock_api_up.h
@@ -59,7 +59,6 @@
#define _read_lock_irq(lock) __LOCK_IRQ(lock)
#define _write_lock_irq(lock) __LOCK_IRQ(lock)
#define _spin_lock_irqsave(lock, flags) __LOCK_IRQSAVE(lock, flags)
-#define _spin_lock_irqsave_nested(lock, flags, subclass) __LOCK_IRQSAVE(lock, flags, subclass)
#define _read_lock_irqsave(lock, flags) __LOCK_IRQSAVE(lock, flags)
#define _write_lock_irqsave(lock, flags) __LOCK_IRQSAVE(lock, flags)
#define _spin_trylock(lock) ({ __LOCK(lock); 1; })
_
Patches currently in -mm which might be from akpm@xxxxxxxx are
origin.patch
rtc-framework-handles-periodic-irqs.patch
lockdep-spin_lock_irqsave_nested.patch
lockdep-spin_lock_irqsave_nested-fix-2.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
