From 7532f3bd10b1bdcab0531ae346eaa1e23ca1d920 Mon Sep 17 00:00:00 2001 From: Jan Glauber Date: Mon, 14 Nov 2011 11:19:07 +0100 Subject: [PATCH] --- yaml --- r: 275509 b: refs/heads/master c: 6ed54387dc470fc439cb154724a1ac81d251c126 h: refs/heads/master i: 275507: a5c69f912f4f1b609b0baba6d2fcc2c86c09461f v: v3 --- [refs] | 2 +- trunk/arch/s390/crypto/crypt_s390.h | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2498e349c7be..2bf7a788d6c2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cfa1e7e1d49c6f5f0b00b2cb890b521e5c0dc7ea +refs/heads/master: 6ed54387dc470fc439cb154724a1ac81d251c126 diff --git a/trunk/arch/s390/crypto/crypt_s390.h b/trunk/arch/s390/crypto/crypt_s390.h index 49676771bd66..ffd1ac255f19 100644 --- a/trunk/arch/s390/crypto/crypt_s390.h +++ b/trunk/arch/s390/crypto/crypt_s390.h @@ -368,9 +368,12 @@ static inline int crypt_s390_func_available(int func, if (facility_mask & CRYPT_S390_MSA && !test_facility(17)) return 0; - if (facility_mask & CRYPT_S390_MSA3 && !test_facility(76)) + + if (facility_mask & CRYPT_S390_MSA3 && + (!test_facility(2) || !test_facility(76))) return 0; - if (facility_mask & CRYPT_S390_MSA4 && !test_facility(77)) + if (facility_mask & CRYPT_S390_MSA4 && + (!test_facility(2) || !test_facility(77))) return 0; switch (func & CRYPT_S390_OP_MASK) {