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

Commit 8902e87f authored Nov 02, 2005 by John Rose Committed by Paul Mackerras Nov 03, 2005

[PATCH] ppc64: Fix add notifier crashes



The extraction of PCI stuff from struct device_node left some false
assumptions in notifier code.  As a result, dynamic add crashes when
non-PCI nodes are added.  This patch fixes these assumptions.

Signed-off-by: John Rose <johnrose@austin.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>

parent f4fcbbe9

arch/powerpc/platforms/pseries/iommu.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -498,7 +498,7 @@ static int iommu_reconfig_notifier(struct notifier_block *nb, unsigned long acti

		switch (action) {
		case PSERIES_RECONFIG_REMOVE:
		if (pci->iommu_table &&
		if (pci && pci->iommu_table &&
		get_property(np, "ibm,dma-window", NULL))
		iommu_free_table(np);
		break;

arch/ppc64/kernel/pci_dn.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -181,12 +181,13 @@ EXPORT_SYMBOL(fetch_dev_dn);
		static int pci_dn_reconfig_notifier(struct notifier_block nb, unsigned long action, void node)
		{
		struct device_node *np = node;
		struct pci_dn *pci;
		struct pci_dn *pci = NULL;
		int err = NOTIFY_OK;

		switch (action) {
		case PSERIES_RECONFIG_ADD:
		pci = np->parent->data;
		if (pci)
		update_dn_pci_info(np, pci->phb);
		break;
		default: