From 561afeee7478851d95992ef74d4b4996ca663d59 Mon Sep 17 00:00:00 2001 From: Nishanth Aravamudan Date: Fri, 18 Jan 2013 09:17:36 +0000 Subject: [PATCH] --- yaml --- r: 356405 b: refs/heads/master c: 71cf1def1ad8384d5fa008f96de94b36668e5460 h: refs/heads/master i: 356403: fabeb8b116b7b9a1597705a27e126173d79f5efb v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/pseries/iommu.c | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index b63261399623..b22598147afb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 22b382985a2e213e4ea0b4e436df24ab7228961d +refs/heads/master: 71cf1def1ad8384d5fa008f96de94b36668e5460 diff --git a/trunk/arch/powerpc/platforms/pseries/iommu.c b/trunk/arch/powerpc/platforms/pseries/iommu.c index a55b6858ceac..b4bb9e141149 100644 --- a/trunk/arch/powerpc/platforms/pseries/iommu.c +++ b/trunk/arch/powerpc/platforms/pseries/iommu.c @@ -1296,6 +1296,7 @@ static int iommu_reconfig_notifier(struct notifier_block *nb, unsigned long acti switch (action) { case OF_RECONFIG_DETACH_NODE: + remove_ddw(np); if (pci && pci->iommu_table) iommu_free_table(pci->iommu_table, np->full_name); @@ -1308,16 +1309,6 @@ static int iommu_reconfig_notifier(struct notifier_block *nb, unsigned long acti } } spin_unlock(&direct_window_list_lock); - - /* - * Because the notifier runs after isolation of the - * slot, we are guaranteed any DMA window has already - * been revoked and the TCEs have been marked invalid, - * so we don't need a call to remove_ddw(np). However, - * if an additional notifier action is added before the - * isolate call, we should update this code for - * completeness with such a call. - */ break; default: err = NOTIFY_DONE;