aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/pci
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2015-02-14 05:23:21 -0500
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2015-03-25 06:49:37 -0400
commit86cd741bc6ed0edf6ea0e8ec5c840cf9e3f3a7cb (patch)
tree2fe71e719cae68adc4409e3004eacd7f7455358c /arch/s390/pci
parent26f15caaf993bbb6f246a30aad3c96a349564528 (diff)
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/pci')
-rw-r--r--arch/s390/pci/pci.c3
1 files changed, 1 insertions, 2 deletions
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)
913 if (!s390_pci_probe) 913 if (!s390_pci_probe)
914 return 0; 914 return 0;
915 915
916 if (!test_facility(2) || !test_facility(69) 916 if (!test_facility(69) || !test_facility(71) || !test_facility(72))
917 || !test_facility(71) || !test_facility(72))
918 return 0; 917 return 0;
919 918
920 rc = zpci_debug_init(); 919 rc = zpci_debug_init();