diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2015-02-14 10:23:21 (GMT) |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2015-03-25 10:49:37 (GMT) |
| commit | 86cd741bc6ed0edf6ea0e8ec5c840cf9e3f3a7cb (patch) | |
| tree | 2fe71e719cae68adc4409e3004eacd7f7455358c | |
| parent | 26f15caaf993bbb6f246a30aad3c96a349564528 (diff) | |
| download | linux-86cd741bc6ed0edf6ea0e8ec5c840cf9e3f3a7cb.tar.xz | |
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>
| -rw-r--r-- | arch/s390/crypto/crypt_s390.h | 8 | ||||
| -rw-r--r-- | arch/s390/pci/pci.c | 3 | ||||
| -rw-r--r-- | drivers/s390/crypto/ap_bus.c | 4 |
3 files changed, 5 insertions, 10 deletions
diff --git a/arch/s390/crypto/crypt_s390.h b/arch/s390/crypto/crypt_s390.h index 6c5cc6d..ba3b2ae 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 f0b8544..c74c9ee 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(); diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c index 33890c9..f0b9871 100644 --- a/drivers/s390/crypto/ap_bus.c +++ b/drivers/s390/crypto/ap_bus.c @@ -165,7 +165,7 @@ static inline int ap_instructions_available(void) */ static int ap_interrupts_available(void) { - return test_facility(2) && test_facility(65); + return test_facility(65); } /** @@ -176,7 +176,7 @@ static int ap_interrupts_available(void) */ static int ap_configuration_available(void) { - return test_facility(2) && test_facility(12); + return test_facility(12); } /** |