Commit 86cd741b authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky

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: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 26f15caa
...@@ -369,14 +369,10 @@ static inline int crypt_s390_func_available(int func, ...@@ -369,14 +369,10 @@ static inline int crypt_s390_func_available(int func,
if (facility_mask & CRYPT_S390_MSA && !test_facility(17)) if (facility_mask & CRYPT_S390_MSA && !test_facility(17))
return 0; 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; return 0;
if (facility_mask & CRYPT_S390_MSA4 && if (facility_mask & CRYPT_S390_MSA4 && !test_facility(77))
(!test_facility(2) || !test_facility(77)))
return 0; return 0;
switch (func & CRYPT_S390_OP_MASK) { switch (func & CRYPT_S390_OP_MASK) {
case CRYPT_S390_KM: case CRYPT_S390_KM:
ret = crypt_s390_km(KM_QUERY, &status, NULL, NULL, 0); ret = crypt_s390_km(KM_QUERY, &status, NULL, NULL, 0);
......
...@@ -913,8 +913,7 @@ static int __init pci_base_init(void) ...@@ -913,8 +913,7 @@ static int __init pci_base_init(void)
if (!s390_pci_probe) if (!s390_pci_probe)
return 0; return 0;
if (!test_facility(2) || !test_facility(69) if (!test_facility(69) || !test_facility(71) || !test_facility(72))
|| !test_facility(71) || !test_facility(72))
return 0; return 0;
rc = zpci_debug_init(); rc = zpci_debug_init();
......
...@@ -165,7 +165,7 @@ static inline int ap_instructions_available(void) ...@@ -165,7 +165,7 @@ static inline int ap_instructions_available(void)
*/ */
static int ap_interrupts_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) ...@@ -176,7 +176,7 @@ static int ap_interrupts_available(void)
*/ */
static int ap_configuration_available(void) static int ap_configuration_available(void)
{ {
return test_facility(2) && test_facility(12); return test_facility(12);
} }
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment