From 8022d4464e1442e75582418161dba505e9c998b4 Mon Sep 17 00:00:00 2001 From: Matthew Wilcox Date: Fri, 26 Jun 2009 17:44:18 +0000 Subject: [PATCH] --- yaml --- r: 154897 b: refs/heads/master c: ca0844e347cf0fc9719c825ea1959501117b7f89 h: refs/heads/master i: 154895: 3aa02e9388821e149b36e3879797d44ae34af3ba v: v3 --- [refs] | 2 +- trunk/drivers/parisc/sba_iommu.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 82a5add71973..8b13da6904c7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2d4618dce6a318ff4ec78dfe492cc3793015d540 +refs/heads/master: ca0844e347cf0fc9719c825ea1959501117b7f89 diff --git a/trunk/drivers/parisc/sba_iommu.c b/trunk/drivers/parisc/sba_iommu.c index d46dd57450ac..123d8fe3427d 100644 --- a/trunk/drivers/parisc/sba_iommu.c +++ b/trunk/drivers/parisc/sba_iommu.c @@ -2057,6 +2057,7 @@ void sba_directed_lmmio(struct parisc_device *pci_hba, struct resource *r) r->start = (base & ~1UL) | PCI_F_EXTEND; size = ~ READ_REG32(reg + LMMIO_DIRECT0_MASK); r->end = r->start + size; + r->flags = IORESOURCE_MEM; } } @@ -2093,4 +2094,5 @@ void sba_distributed_lmmio(struct parisc_device *pci_hba, struct resource *r ) size = (~READ_REG32(sba->sba_hpa + LMMIO_DIST_MASK)) / ROPES_PER_IOC; r->start += rope * (size + 1); /* adjust base for this rope */ r->end = r->start + size; + r->flags = IORESOURCE_MEM; }