summaryrefslogtreecommitdiff
path: root/arch/s390
diff options
context:
space:
mode:
authorSebastian Ott <sebott@linux.vnet.ibm.com>2013-01-15 19:04:39 +0100
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2013-02-14 15:55:05 +0100
commit9a17e972529e07d6e2531e6b6712bf29687df8a6 (patch)
tree4e5668c9830d043541028647617b080028f962f0 /arch/s390
parent5c8d0983fcd1a57acae15f717a67127f97d06780 (diff)
downloadlinux-3.10-9a17e972529e07d6e2531e6b6712bf29687df8a6.tar.gz
linux-3.10-9a17e972529e07d6e2531e6b6712bf29687df8a6.tar.bz2
linux-3.10-9a17e972529e07d6e2531e6b6712bf29687df8a6.zip
s390/chsc: cleanup SEI helper functions
Cleanup the functions used to call SEI. Also provide !CONFIG_PCI dummys for pci error handling. Reviewed-by: Peter Oberparleiter <peter.oberparleiter@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')
-rw-r--r--arch/s390/include/asm/pci.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/s390/include/asm/pci.h b/arch/s390/include/asm/pci.h
index b1fa93c606a..23d6a245e8a 100644
--- a/arch/s390/include/asm/pci.h
+++ b/arch/s390/include/asm/pci.h
@@ -160,9 +160,14 @@ void zpci_teardown_msi_irq(struct zpci_dev *, struct msi_desc *);
int zpci_msihash_init(void);
void zpci_msihash_exit(void);
+#ifdef CONFIG_PCI
/* Error handling and recovery */
void zpci_event_error(void *);
void zpci_event_availability(void *);
+#else /* CONFIG_PCI */
+static inline void zpci_event_error(void *e) {}
+static inline void zpci_event_availability(void *e) {}
+#endif /* CONFIG_PCI */
/* Helpers */
struct zpci_dev *get_zdev(struct pci_dev *);