| Message ID | 1467748666-7986-2-git-send-email-tim.gardner@canonical.com |
|---|---|
| State | New |
| Headers | show |
diff --git a/arch/powerpc/kernel/eeh.c b/arch/powerpc/kernel/eeh.c index 81e2d3e..40e4d4a 100644 --- a/arch/powerpc/kernel/eeh.c +++ b/arch/powerpc/kernel/eeh.c @@ -1072,13 +1072,7 @@ void eeh_add_device_early(struct pci_dn *pdn) struct pci_controller *phb; struct eeh_dev *edev = pdn_to_eeh_dev(pdn); - if (!edev) - return; - - /* Some platforms (like Cell) don't have EEH capabilities, so we - * need to abort here. In case of pseries or powernv, we have EEH - * so we can continue. */ - if (!machine_is(pseries) && !machine_is(powernv)) + if (!edev || !eeh_enabled()) return; if (!eeh_has_flag(EEH_PROBE_MODE_DEVTREE))
BugLink: http://bugs.launchpad.net/bugs/1599250 This reverts commit 623aabd5d68d9d7c1ed94da92e70d413815a126a. Signed-off-by: Tim Gardner <tim.gardner@canonical.com> --- arch/powerpc/kernel/eeh.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)