Messages in this thread Patch in this message | | | Date | Mon, 29 Oct 2007 09:52:53 -0700 | From | Mark Gross <> | Subject | Re: [PATCH] intel-iommu fixes |
| |
On Mon, Oct 29, 2007 at 04:51:16AM +0000, Al Viro wrote: > * off by one in dmar_get_fault_reason() (maximal index in > array is ARRAY_SIZE()-1, not ARRAY_SIZE()) > * NULL noise removal > * __iomem annotation fix > > Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> > --- > diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c > index 0c4ab3b..9b35259 100644 > --- a/drivers/pci/intel-iommu.c > +++ b/drivers/pci/intel-iommu.c > @@ -745,7 +745,7 @@ static char *fault_reason_strings[] = > "non-zero reserved fields in PTE", > "Unknown" > }; > -#define MAX_FAULT_REASON_IDX ARRAY_SIZE(fault_reason_strings) > +#define MAX_FAULT_REASON_IDX ARRAY_SIZE(fault_reason_strings) - 1
Probably should be +#define MAX_FAULT_REASON_IDX (ARRAY_SIZE(fault_reason_strings) - 1)
> > char *dmar_get_fault_reason(u8 fault_reason) > { > @@ -995,7 +995,6 @@ static struct intel_iommu *alloc_iommu(struct dmar_drhd_unit *drhd) > return iommu; > error_unmap: > iounmap(iommu->reg); > - iommu->reg = 0; > error: > kfree(iommu); > return NULL; > @@ -1808,7 +1807,7 @@ get_valid_domain_for_dev(struct pci_dev *pdev) > if (!domain) { > printk(KERN_ERR > "Allocating domain for %s failed", pci_name(pdev)); > - return 0; > + return NULL; > } > > /* make sure context mapping is ok */ > @@ -1818,7 +1817,7 @@ get_valid_domain_for_dev(struct pci_dev *pdev) > printk(KERN_ERR > "Domain context map for %s failed", > pci_name(pdev)); > - return 0; > + return NULL; > } > } > > diff --git a/drivers/pci/intel-iommu.h b/drivers/pci/intel-iommu.h > index ee88dd2..459ad1f 100644 > --- a/drivers/pci/intel-iommu.h > +++ b/drivers/pci/intel-iommu.h > @@ -58,7 +58,7 @@ > hi = readl(dmar + reg + 4); \ > (((u64) hi) << 32) + lo; }) > */ > -static inline u64 dmar_readq(void *addr) > +static inline u64 dmar_readq(void __iomem *addr) > { > u32 lo, hi; > lo = readl(addr); Looks good to me.
ACK --mgross - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |