diff options
| author | Sebastian Ott <sebott@linux.vnet.ibm.com> | 2013-12-12 17:48:32 +0100 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2013-12-16 14:37:54 +0100 |
| commit | aa3b7c296732b4351dfdbfe70be6b38a0882be14 (patch) | |
| tree | c05230a7a6b82675a8b704cae62ed2af3bf8b19f /arch/s390/include/asm/pci.h | |
| parent | 99c64b6679c41d8238b154c1a462724d7101765c (diff) | |
| download | blackbird-op-linux-aa3b7c296732b4351dfdbfe70be6b38a0882be14.tar.gz blackbird-op-linux-aa3b7c296732b4351dfdbfe70be6b38a0882be14.zip | |
s390/pci: prevent inadvertently triggered bus scans
Initialization and scanning of the pci bus is omitted on older
machines without pci support or if pci=off was specified. Remember
the fact that we ran without pci support and prevent further bus
scans during resume from hibernate or after receiving hotplug
notifications.
Reported-by: Stefan Haberland <stefan.haberland@de.ibm.com>
Reviewed-by: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/include/asm/pci.h')
| -rw-r--r-- | arch/s390/include/asm/pci.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/include/asm/pci.h b/arch/s390/include/asm/pci.h index c129ab2ac731..2583466f576b 100644 --- a/arch/s390/include/asm/pci.h +++ b/arch/s390/include/asm/pci.h @@ -144,6 +144,7 @@ int clp_disable_fh(struct zpci_dev *); void zpci_event_error(void *); void zpci_event_availability(void *); void zpci_rescan(void); +bool zpci_is_enabled(void); #else /* CONFIG_PCI */ static inline void zpci_event_error(void *e) {} static inline void zpci_event_availability(void *e) {} |
