The patch titled s390: enable interrupts on error path has been removed from the -mm tree. Its filename is s390-enable-interrupts-on-error-path.patch This patch was probably dropped from -mm because it has now been merged into a subsystem tree or into Linus's tree, or because it was folded into its parent patch in the -mm tree. From: Stefan Bader <shbader@xxxxxxxxxx> Interrupts can stay disabled if an error occurred in _chp_add(). Use spin_unlock_irq on the error paths to reenable interrupts. Signed-off-by: Stefan Bader <shbader@xxxxxxxxxx> Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- drivers/s390/cio/chsc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff -puN drivers/s390/cio/chsc.c~s390-enable-interrupts-on-error-path drivers/s390/cio/chsc.c --- devel/drivers/s390/cio/chsc.c~s390-enable-interrupts-on-error-path 2006-04-27 18:39:05.000000000 -0700 +++ devel-akpm/drivers/s390/cio/chsc.c 2006-04-27 18:39:05.000000000 -0700 @@ -635,13 +635,13 @@ __chp_add(struct subchannel_id schid, vo if (sch->schib.pmcw.chpid[i] == chp->id) { if (stsch(sch->schid, &sch->schib) != 0) { /* Endgame. */ - spin_unlock(&sch->lock); + spin_unlock_irq(&sch->lock); return -ENXIO; } break; } if (i==8) { - spin_unlock(&sch->lock); + spin_unlock_irq(&sch->lock); return 0; } sch->lpm = ((sch->schib.pmcw.pim & _ Patches currently in -mm which might be from shbader@xxxxxxxxxx are origin.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