summaryrefslogtreecommitdiffstats
path: root/include/asm-powerpc/eeh_event.h
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2006-01-12 23:47:08 +0100
committerSteve French <sfrench@us.ibm.com>2006-01-12 23:47:08 +0100
commit94bc2be31a01a3055ec94176e595dfe208e92d3b (patch)
treeebfbe81c6718a6390bfa1b99c6d228237d818576 /include/asm-powerpc/eeh_event.h
parent[CIFS] Allow local filesize for file that is open for write to be updated (diff)
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6 (diff)
downloadlinux-94bc2be31a01a3055ec94176e595dfe208e92d3b.tar.xz
linux-94bc2be31a01a3055ec94176e595dfe208e92d3b.zip
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'include/asm-powerpc/eeh_event.h')
-rw-r--r--include/asm-powerpc/eeh_event.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/include/asm-powerpc/eeh_event.h b/include/asm-powerpc/eeh_event.h
index d168a30b3866..93d55a2bebfd 100644
--- a/include/asm-powerpc/eeh_event.h
+++ b/include/asm-powerpc/eeh_event.h
@@ -20,6 +20,7 @@
#ifndef ASM_PPC64_EEH_EVENT_H
#define ASM_PPC64_EEH_EVENT_H
+#ifdef __KERNEL__
/** EEH event -- structure holding pci controller data that describes
* a change in the isolation status of a PCI slot. A pointer
@@ -29,7 +30,7 @@ struct eeh_event {
struct list_head list;
struct device_node *dn; /* struct device node */
struct pci_dev *dev; /* affected device */
- int state;
+ enum pci_channel_state state; /* PCI bus state for the affected device */
int time_unavail; /* milliseconds until device might be available */
};
@@ -46,7 +47,11 @@ struct eeh_event {
*/
int eeh_send_failure_event (struct device_node *dn,
struct pci_dev *dev,
- int reset_state,
+ enum pci_channel_state state,
int time_unavail);
+/* Main recovery function */
+void handle_eeh_events (struct eeh_event *);
+
+#endif /* __KERNEL__ */
#endif /* ASM_PPC64_EEH_EVENT_H */