From 89c5329948b775e36ff39f870b9a26e04cb866f1 Mon Sep 17 00:00:00 2001 From: Anton Blanchard Date: Thu, 22 Sep 2005 21:44:04 -0700 Subject: [PATCH] --- yaml --- r: 9233 b: refs/heads/master c: 586a90eb4c0b512df766e08a7718af7c6b9b2dcf h: refs/heads/master i: 9231: 40f5f16960851126ac758c718d29f5e292f329c6 v: v3 --- [refs] | 2 +- trunk/arch/ppc64/kernel/pSeries_iommu.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c24c9f0a5d9e..264f18f0ca95 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 275abf5b06676ca057cf3e15f0d027eafcb204a0 +refs/heads/master: 586a90eb4c0b512df766e08a7718af7c6b9b2dcf diff --git a/trunk/arch/ppc64/kernel/pSeries_iommu.c b/trunk/arch/ppc64/kernel/pSeries_iommu.c index 8c6313e7e145..25d6c7eebfd0 100644 --- a/trunk/arch/ppc64/kernel/pSeries_iommu.c +++ b/trunk/arch/ppc64/kernel/pSeries_iommu.c @@ -525,9 +525,8 @@ static void iommu_dev_setup_pSeriesLP(struct pci_dev *dev) * slots on POWER4 machines. */ if (dma_window == NULL || pdn->parent == NULL) { - /* Fall back to regular (non-LPAR) dev setup */ - DBG("No dma window for device, falling back to regular setup\n"); - iommu_dev_setup_pSeries(dev); + DBG("No dma window for device, linking to parent\n"); + PCI_DN(dn)->iommu_table = PCI_DN(pdn)->iommu_table; return; } else { DBG("Found DMA window, allocating table\n");