2 files changed, 8 insertions, 1 deletions

diff --git a/arch/powerpc/kernel/of_platform.c b/arch/powerpc/kernel/of_platform.c
index e1612dfb4a93..2049f2d00ffe 100644
--- a/arch/powerpc/kernel/of_platform.c
+++ b/arch/powerpc/kernel/of_platform.c
@@ -21,12 +21,13 @@
 #include <linux/of.h>
 #include <linux/of_device.h>
 #include <linux/of_platform.h>
+#include <linux/atomic.h>
 
 #include <asm/errno.h>
 #include <asm/topology.h>
 #include <asm/pci-bridge.h>
 #include <asm/ppc-pci.h>
-#include <linux/atomic.h>
+#include <asm/eeh.h>
 
 #ifdef CONFIG_PPC_OF_PLATFORM_PCI
 
@@ -66,6 +67,9 @@ static int __devinit of_pci_phb_probe(struct platform_device *dev)
         /* Init pci_dn data structures */
         pci_devs_phb_init_dynamic(phb);
 
+        /* Create EEH devices for the PHB */
+        eeh_dev_phb_init_dynamic(phb);
+
         /* Register devices with EEH */
 #ifdef CONFIG_EEH
         if (dev->dev.of_node->child)
diff --git a/arch/powerpc/kernel/rtas_pci.c b/arch/powerpc/kernel/rtas_pci.c
index 6cd8f0196b6d..517bd86bc3f0 100644
--- a/arch/powerpc/kernel/rtas_pci.c
+++ b/arch/powerpc/kernel/rtas_pci.c
@@ -275,6 +275,9 @@ void __init find_and_init_phbs(void)
         of_node_put(root);
         pci_devs_phb_init();
 
+        /* Create EEH devices for all PHBs */
+        eeh_dev_phb_init();
+
         /*
          * pci_probe_only and pci_assign_all_buses can be set via properties
          * in chosen.