Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge

1 files changed, 5 insertions, 2 deletions

diff --git a/include/asm-powerpc/eeh_event.h b/include/asm-powerpc/eeh_event.h
index 5e11a00b6fa0..93d55a2bebfd 100644
--- a/include/asm-powerpc/eeh_event.h
+++ b/include/asm-powerpc/eeh_event.h
@@ -30,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 */
 };
 
@@ -47,8 +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 */