s390/pci: reenable per default

Sebastian Ott · Martin Schwidefsky · commit 257608fb4112 · 2013-12-16T14:37:56.000+01:00
HW, FW and Linux support is in a better shape now - let's reenable
pci bus probing per default.

Acked-by: Gerald Schaefer &lt;gerald.schaefer@de.ibm.com&gt;
Signed-off-by: Sebastian Ott &lt;sebott@linux.vnet.ibm.com&gt;
Signed-off-by: Martin Schwidefsky &lt;schwidefsky@de.ibm.com&gt;
diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c
@@ -919,13 +919,13 @@ static void zpci_mem_exit(void)
 	kmem_cache_destroy(zdev_fmb_cache);
 }
 
-static unsigned int s390_pci_probe;
+static unsigned int s390_pci_probe = 1;
 static unsigned int s390_pci_initialized;
 
 char * __init pcibios_setup(char *str)
 {
-	if (!strcmp(str, "on")) {
-		s390_pci_probe = 1;
+	if (!strcmp(str, "off")) {
+		s390_pci_probe = 0;
 		return NULL;
 	}
 	return str;

Original file line number	Diff line number	Diff line change
`@@ -919,13 +919,13 @@ static void zpci_mem_exit(void)`
`919`	`919`	`kmem_cache_destroy(zdev_fmb_cache);`
`920`	`920`	`}`
`921`	`921`
`922`		`-static unsigned int s390_pci_probe;`
	`922`	`+static unsigned int s390_pci_probe = 1;`
`923`	`923`	`static unsigned int s390_pci_initialized;`
`924`	`924`
`925`	`925`	`char * __init pcibios_setup(char *str)`
`926`	`926`	`{`
`927`		`- if (!strcmp(str, "on")) {`
`928`		`- s390_pci_probe = 1;`
	`927`	`+ if (!strcmp(str, "off")) {`
	`928`	`+ s390_pci_probe = 0;`
`929`	`929`	`return NULL;`
`930`	`930`	`}`
`931`	`931`	`return str;`