Merge with Paulus

This commit is contained in:
Michael Ellerman
2005-11-04 12:12:52 +11:00
當前提交 dc3a9efb5e
共有 34 個文件被更改,包括 435 次插入633 次删除

查看文件

@@ -499,7 +499,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;