Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/s390/crypto/crypt_s390.h

+2 −6
Original line number Diff line number Diff line
@@ -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);

arch/s390/pci/pci.c

+1 −2
Original line number Diff line number Diff line
@@ -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();

drivers/s390/crypto/ap_bus.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

}



/**