Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 08e627b5 authored Nov 25, 2012 by Linus Torvalds

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

parents c2a65d3d e716e014

arch/powerpc/platforms/pseries/eeh_pe.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -449,7 +449,7 @@ int eeh_rmv_from_parent_pe(struct eeh_dev *edev, int purge_pe)
		if (list_empty(&pe->edevs)) {
		cnt = 0;
		list_for_each_entry(child, &pe->child_list, child) {
		if (!(pe->type & EEH_PE_INVALID)) {
		if (!(child->type & EEH_PE_INVALID)) {
		cnt++;
		break;
		}

arch/powerpc/platforms/pseries/msi.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -220,6 +220,7 @@ static struct device_node find_pe_dn(struct pci_dev dev, int *total)

		/* Get the top level device in the PE */
		edev = of_node_to_eeh_dev(dn);
		if (edev->pe)
		edev = list_first_entry(&edev->pe->edevs, struct eeh_dev, list);
		dn = eeh_dev_to_of_node(edev);
		if (!dn)