The patch titled lockdep: shrink held_lock structure (fix) has been removed from the -mm tree. Its filename was lockdep-shrink-held_lock-structure-fix.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: lockdep: shrink held_lock structure (fix) From: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx> Replacement patch - on account of the old one having a bug that basically disables lockdep. Cc: Dave Jones <davej@xxxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/lockdep.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff -puN include/linux/lockdep.h~lockdep-shrink-held_lock-structure-fix include/linux/lockdep.h --- a/include/linux/lockdep.h~lockdep-shrink-held_lock-structure-fix +++ a/include/linux/lockdep.h @@ -229,10 +229,10 @@ struct held_lock { * The following field is used to detect when we cross into an * interrupt context: */ - unsigned int irq_context:1; + unsigned int irq_context:2; /* bit 0 - soft, bit 1 - hard */ unsigned int trylock:1; - unsigned int read:2; - unsigned int check:1; + unsigned int read:2; /* see lock_acquire() comment */ + unsigned int check:2; /* see lock_acquire() comment */ unsigned int hardirqs_off:1; }; _ Patches currently in -mm which might be from a.p.zijlstra@xxxxxxxxx are origin.patch linux-next.patch irq-warn-about-irqf_disabledirqf_shared.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