Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
Pull another powerpc fix from Benjamin Herrenschmidt:
"I mentioned that while we had fixed the kernel crashes, EEH error
recovery didn't always recover... It appears that I had a fix for
that already in powerpc-next (with a stable CC).
I cherry-picked it today and did a few tests and it seems that things
now work quite well. The patch is also pretty simple, so I see no
reason to wait before merging it."
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc/eeh: Fix fetching bus for single-dev-PE
+2
-1
+2
-1
arch/powerpc/platforms/pseries/eeh_pe.c
+2
-1
arch/powerpc/platforms/pseries/eeh_pe.c
···
639
639
640
640
if (pe->type & EEH_PE_PHB) {
641
641
bus = pe->phb->bus;
642
-
} else if (pe->type & EEH_PE_BUS) {
642
+
} else if (pe->type & EEH_PE_BUS ||
643
+
pe->type & EEH_PE_DEVICE) {
643
644
edev = list_first_entry(&pe->edevs, struct eeh_dev, list);
644
645
pdev = eeh_dev_to_pci_dev(edev);
645
646
if (pdev)