Merge tag 'v3.13-rc4' into core/locking

Merge Linux 3.13-rc4, to refresh this rather old tree with the latest fixes.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 7 insertions, 2 deletions

diff --git a/arch/powerpc/kernel/eeh_event.c b/arch/powerpc/kernel/eeh_event.c
index d27c5afc90ae..72d748b56c86 100644
--- a/arch/powerpc/kernel/eeh_event.c
+++ b/arch/powerpc/kernel/eeh_event.c
@@ -74,8 +74,13 @@ static int eeh_event_handler(void * dummy)
                 pe = event->pe;
                 if (pe) {
                         eeh_pe_state_mark(pe, EEH_PE_RECOVERING);
-                        pr_info("EEH: Detected PCI bus error on PHB#%d-PE#%x\n",
-                                 pe->phb->global_number, pe->addr);
+                        if (pe->type & EEH_PE_PHB)
+                                pr_info("EEH: Detected error on PHB#%d\n",
+                                         pe->phb->global_number);
+                        else
+                                pr_info("EEH: Detected PCI bus error on "
+                                        "PHB#%d-PE#%x\n",
+                                        pe->phb->global_number, pe->addr);
                         eeh_handle_event(pe);
                         eeh_pe_state_clear(pe, EEH_PE_RECOVERING);
                 } else {