Merge branch 'master' into upstream

[pandora-kernel.git] / arch / s390 / crypto / crypt_s390.h

diff --git a/arch/s390/crypto/crypt_s390.h b/arch/s390/crypto/crypt_s390.h
index 0ef9829..7ee9a1b 100644 (file)
--- a/arch/s390/crypto/crypt_s390.h
+++ b/arch/s390/crypto/crypt_s390.h
@@ -297,7 +297,7 @@ static inline int crypt_s390_func_available(int func)
        int ret;
 
        /* check if CPACF facility (bit 17) is available */
-       if (!(stfl() & 1ULL << (31 - 17)))
+       if (!test_facility(17))
                return 0;
 
        switch (func & CRYPT_S390_OP_MASK) {