diff options
author | Sebastian Ott <sebott@linux.vnet.ibm.com> | 2013-08-29 13:40:01 -0400 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2013-08-30 02:57:20 -0400 |
commit | 57b5918c33a0797930c3791fb602a8a9d46ef80c (patch) | |
tree | 47e3a5b503e8551f130fb722fbf1ae281e6ed292 /arch/s390/include | |
parent | d03abe5882cc4815bf98c0e01a1deafa4a5d6730 (diff) |
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 @@ | |||
6 | /* must be set before including pci_clp.h */ | 6 | /* must be set before including pci_clp.h */ |
7 | #define PCI_BAR_COUNT 6 | 7 | #define PCI_BAR_COUNT 6 |
8 | 8 | ||
9 | #include <linux/pci.h> | ||
9 | #include <asm-generic/pci.h> | 10 | #include <asm-generic/pci.h> |
10 | #include <asm-generic/pci-dma-compat.h> | 11 | #include <asm-generic/pci-dma-compat.h> |
11 | #include <asm/pci_clp.h> | 12 | #include <asm/pci_clp.h> |
@@ -137,6 +138,7 @@ int zpci_unregister_ioat(struct zpci_dev *, u8); | |||
137 | /* CLP */ | 138 | /* CLP */ |
138 | int clp_scan_pci_devices(void); | 139 | int clp_scan_pci_devices(void); |
139 | int clp_rescan_pci_devices(void); | 140 | int clp_rescan_pci_devices(void); |
141 | int clp_rescan_pci_devices_simple(void); | ||
140 | int clp_add_pci_device(u32, u32, int); | 142 | int clp_add_pci_device(u32, u32, int); |
141 | int clp_enable_fh(struct zpci_dev *, u8); | 143 | int clp_enable_fh(struct zpci_dev *, u8); |
142 | int clp_disable_fh(struct zpci_dev *); | 144 | int clp_disable_fh(struct zpci_dev *); |
@@ -145,9 +147,11 @@ int clp_disable_fh(struct zpci_dev *); | |||
145 | /* Error handling and recovery */ | 147 | /* Error handling and recovery */ |
146 | void zpci_event_error(void *); | 148 | void zpci_event_error(void *); |
147 | void zpci_event_availability(void *); | 149 | void zpci_event_availability(void *); |
150 | void zpci_rescan(void); | ||
148 | #else /* CONFIG_PCI */ | 151 | #else /* CONFIG_PCI */ |
149 | static inline void zpci_event_error(void *e) {} | 152 | static inline void zpci_event_error(void *e) {} |
150 | static inline void zpci_event_availability(void *e) {} | 153 | static inline void zpci_event_availability(void *e) {} |
154 | static inline void zpci_rescan(void) {} | ||
151 | #endif /* CONFIG_PCI */ | 155 | #endif /* CONFIG_PCI */ |
152 | 156 | ||
153 | #ifdef CONFIG_HOTPLUG_PCI_S390 | 157 | #ifdef CONFIG_HOTPLUG_PCI_S390 |