mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-04 09:59:32 +00:00
Code Issues Releases Wiki Activity

s390: remove test_facility(2) (== z/Architecture mode active) checks

Browse source 
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>
This commit is contained in:
Heiko Carstens 2015-02-14 11:23:21 +01:00 committed by Martin Schwidefsky
parent 26f15caaf9
commit 86cd741bc6
3 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
arch/s390/crypto/crypt_s390.h
View file

@ -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);

3
arch/s390/pci/pci.c
View file

@ -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();

4
drivers/s390/crypto/ap_bus.c
View file

@ -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)
*/ */
static int ap_configuration_available(void) static int ap_configuration_available(void)
{ {
return test_facility(2) && test_facility(12); return test_facility(12);
} }
/** /**