From: Heiko Carstens Date: Mon, 4 Dec 2006 14:40:20 +0000 (+0100) Subject: [S390] extmem unbalanced spin_lock. X-Git-Tag: v2.6.20-rc2~6^2~13^2~20^2~20 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=6b4044bdd158aa9ad07b3f68d1c7598036d3ee58;p=linux-2.6-omap-h63xx.git [S390] extmem unbalanced spin_lock. segment save will exit with a lock held if the passed segment doesn't exist. Any subsequent call to segment_save will lead to a deadlock. Fix this and give up the lock before returning. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky --- diff --git a/arch/s390/mm/extmem.c b/arch/s390/mm/extmem.c index 226275d5c4f..077af540494 100644 --- a/arch/s390/mm/extmem.c +++ b/arch/s390/mm/extmem.c @@ -563,8 +563,9 @@ segment_save(char *name) seg = segment_by_name (name); if (seg == NULL) { - PRINT_ERR ("could not find segment %s in segment_save, please report to linux390@de.ibm.com\n",name); - return; + PRINT_ERR("could not find segment %s in segment_save, please " + "report to linux390@de.ibm.com\n", name); + goto out; } startpfn = seg->start_addr >> PAGE_SHIFT;