diff options
| author | Sebastian Ott | 2013-08-29 19:40:01 +0200 |
|---|---|---|
| committer | Martin Schwidefsky | 2013-08-30 08:57:20 +0200 |
| commit | 57b5918c33a0797930c3791fb602a8a9d46ef80c (patch) | |
| tree | 47e3a5b503e8551f130fb722fbf1ae281e6ed292 /arch/s390/include | |
| parent | s390/pci: try harder to modify a function (diff) | |
| download | kernel-qcow2-linux-57b5918c33a0797930c3791fb602a8a9d46ef80c.tar.gz kernel-qcow2-linux-57b5918c33a0797930c3791fb602a8a9d46ef80c.tar.xz kernel-qcow2-linux-57b5918c33a0797930c3791fb602a8a9d46ef80c.zip | |
s390/pci: update function handle after resume from hibernate
Function handles may change while the system was in hibernation
use list pci functions and update the function handles.
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')
| -rw-r--r-- | arch/s390/include/asm/pci.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/s390/include/asm/pci.h b/arch/s390/include/asm/pci.h index 4b2bbc1fdbe0..c290f13d1c47 100644 --- a/arch/s390/include/asm/pci.h +++ b/arch/s390/include/asm/pci.h @@ -6,6 +6,7 @@ /* must be set before including pci_clp.h */ #define PCI_BAR_COUNT 6 +#include <linux/pci.h> #include <asm-generic/pci.h> #include <asm-generic/pci-dma-compat.h> #include <asm/pci_clp.h> @@ -137,6 +138,7 @@ int zpci_unregister_ioat(struct zpci_dev *, u8); /* CLP */ int clp_scan_pci_devices(void); int clp_rescan_pci_devices(void); +int clp_rescan_pci_devices_simple(void); int clp_add_pci_device(u32, u32, int); int clp_enable_fh(struct zpci_dev *, u8); int clp_disable_fh(struct zpci_dev *); @@ -145,9 +147,11 @@ int clp_disable_fh(struct zpci_dev *); /* Error handling and recovery */ void zpci_event_error(void *); void zpci_event_availability(void *); +void zpci_rescan(void); #else /* CONFIG_PCI */ static inline void zpci_event_error(void *e) {} static inline void zpci_event_availability(void *e) {} +static inline void zpci_rescan(void) {} #endif /* CONFIG_PCI */ #ifdef CONFIG_HOTPLUG_PCI_S390 |