tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

Pull powerpc EEH bugfixes from Benjamin Herrenschmidt.

Two one-liner fixes for the new EEH code.

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc/eeh: Do not invalidate PE properly
powerpc/pseries: Fix oops with MSIs when missing EEH PEs

Linus Torvalds 08e627b5 c2a65d3d

+3 -2
+1 -1
arch/powerpc/platforms/pseries/eeh_pe.c
··· 449 449 if (list_empty(&pe->edevs)) { 450 450 cnt = 0; 451 451 list_for_each_entry(child, &pe->child_list, child) { 452 - if (!(pe->type & EEH_PE_INVALID)) { 452 + if (!(child->type & EEH_PE_INVALID)) { 453 453 cnt++; 454 454 break; 455 455 }
+2 -1
arch/powerpc/platforms/pseries/msi.c
··· 220 220 221 221 /* Get the top level device in the PE */ 222 222 edev = of_node_to_eeh_dev(dn); 223 - edev = list_first_entry(&edev->pe->edevs, struct eeh_dev, list); 223 + if (edev->pe) 224 + edev = list_first_entry(&edev->pe->edevs, struct eeh_dev, list); 224 225 dn = eeh_dev_to_of_node(edev); 225 226 if (!dn) 226 227 return NULL;