From: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Date: Wed, 14 Oct 2009 10:43:44 +0000 (+0200)
Subject: [S390] hypfs: Use subcode 6 if subcode 7 is not available
X-Git-Tag: v2.6.32-rc5~19^2~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7874b1b66a53c4d9c8dcb37884cbb758aa2d712c;p=platform%2Fkernel%2Flinux-3.10.git

[S390] hypfs: Use subcode 6 if subcode 7 is not available

Hypfs never worked on systems that only provide D204 subcode 6.
In these cases we nevertheless used subcode 7. With this fix, we
use subcode 6, if it is available and the system does not provide
subcode 7.

Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
---

diff --git a/arch/s390/hypfs/hypfs_diag.c b/arch/s390/hypfs/hypfs_diag.c
index 704dd39..77df726 100644
--- a/arch/s390/hypfs/hypfs_diag.c
+++ b/arch/s390/hypfs/hypfs_diag.c
@@ -438,7 +438,7 @@ static int diag204_probe(void)
 		}
 		if (diag204((unsigned long)SUBC_STIB6 |
 			    (unsigned long)INFO_EXT, pages, buf) >= 0) {
-			diag204_store_sc = SUBC_STIB7;
+			diag204_store_sc = SUBC_STIB6;
 			diag204_info_type = INFO_EXT;
 			goto out;
 		}