Commit 89b0dc95 authored by Sebastian Ott's avatar Sebastian Ott Committed by Martin Schwidefsky
Browse files

s390/pci: disable per default 



Disable pci on s390. Enable with pci=on.

Suggested-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarSebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 2c3700bb

arch/s390/pci/pci.c

+3 −3
Original line number Diff line number Diff line
@@ -1106,13 +1106,13 @@ void zpci_deregister_hp_ops(void) 
}

EXPORT_SYMBOL_GPL(zpci_deregister_hp_ops);



unsigned int s390_pci_probe = 1;

unsigned int s390_pci_probe;

EXPORT_SYMBOL_GPL(s390_pci_probe);



char * __init pcibios_setup(char *str)

{

	if (!strcmp(str, "off")) {

		s390_pci_probe = 0;

	if (!strcmp(str, "on")) {

		s390_pci_probe = 1;

		return NULL;

	}

	return str;