Merge tag 'powerpc-4.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

[linux.git] / arch / powerpc / kernel / eeh_event.c

diff --git a/arch/powerpc/kernel/eeh_event.c b/arch/powerpc/kernel/eeh_event.c
index accbf8b5fd46f4a701e69ce4292a8dc03cf0dc0d..61c9356bf9c97bcd61cffb2855ff109b0ebe9dbb 100644 (file)
--- a/arch/powerpc/kernel/eeh_event.c
+++ b/arch/powerpc/kernel/eeh_event.c
@@ -73,7 +73,6 @@ static int eeh_event_handler(void * dummy)
                /* We might have event without binding PE */
                pe = event->pe;
                if (pe) {
-                       eeh_pe_state_mark(pe, EEH_PE_RECOVERING);
                        if (pe->type & EEH_PE_PHB)
                                pr_info("EEH: Detected error on PHB#%x\n",
                                         pe->phb->global_number);
@@ -81,10 +80,9 @@ static int eeh_event_handler(void * dummy)
                                pr_info("EEH: Detected PCI bus error on "
                                        "PHB#%x-PE#%x\n",
                                        pe->phb->global_number, pe->addr);
-                       eeh_handle_event(pe);
-                       eeh_pe_state_clear(pe, EEH_PE_RECOVERING);
+                       eeh_handle_normal_event(pe);
                } else {
-                       eeh_handle_event(NULL);
+                       eeh_handle_special_event();
                }
 
                kfree(event);