diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2015-02-14 11:23:21 +0100 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2015-03-25 11:49:37 +0100 |
| commit | 86cd741bc6ed0edf6ea0e8ec5c840cf9e3f3a7cb (patch) | |
| tree | 2fe71e719cae68adc4409e3004eacd7f7455358c /arch/s390 | |
| parent | 26f15caaf993bbb6f246a30aad3c96a349564528 (diff) | |
| download | linux-86cd741bc6ed0edf6ea0e8ec5c840cf9e3f3a7cb.tar.gz linux-86cd741bc6ed0edf6ea0e8ec5c840cf9e3f3a7cb.tar.bz2 linux-86cd741bc6ed0edf6ea0e8ec5c840cf9e3f3a7cb.zip | |
s390: remove test_facility(2) (== z/Architecture mode active) checks
Given that the kernel now always runs in 64 bit mode, it is
pointless to check if the z/Architecture mode is active.
Remove the checks.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/crypto/crypt_s390.h | 8 | ||||
| -rw-r--r-- | arch/s390/pci/pci.c | 3 |
2 files changed, 3 insertions, 8 deletions
diff --git a/arch/s390/crypto/crypt_s390.h b/arch/s390/crypto/crypt_s390.h index 6c5cc6da7111..ba3b2aefddf5 100644 --- a/arch/s390/crypto/crypt_s390.h +++ b/arch/s390/crypto/crypt_s390.h @@ -369,14 +369,10 @@ 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(2) || !test_facility(76))) + if (facility_mask & CRYPT_S390_MSA3 && !test_facility(76)) return 0; - if (facility_mask & CRYPT_S390_MSA4 && - (!test_facility(2) || !test_facility(77))) + if (facility_mask & CRYPT_S390_MSA4 && !test_facility(77)) return 0; - switch (func & CRYPT_S390_OP_MASK) { case CRYPT_S390_KM: ret = crypt_s390_km(KM_QUERY, &status, NULL, NULL, 0); diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c index f0b85443e060..c74c9ee3554a 100644 --- a/arch/s390/pci/pci.c +++ b/arch/s390/pci/pci.c @@ -913,8 +913,7 @@ static int __init pci_base_init(void) if (!s390_pci_probe) return 0; - if (!test_facility(2) || !test_facility(69) - || !test_facility(71) || !test_facility(72)) + if (!test_facility(69) || !test_facility(71) || !test_facility(72)) return 0; rc = zpci_debug_init(); |