The patch titled
x86_64: Calgary IOMMU: calgary_init_one_nontraslated() can return void
has been added to the -mm tree. Its filename is
calgary-iommu.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: x86_64: Calgary IOMMU: calgary_init_one_nontraslated() can return void
From: Muli Ben-Yehuda <muli@xxxxxxxxxx>
Signed-off-by: Muli Ben-Yehuda <muli@xxxxxxxxxx>
Signed-off-by: Jon Mason <jdmason@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/x86_64/kernel/pci-calgary.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff -puN arch/x86_64/kernel/pci-calgary.c~calgary-iommu arch/x86_64/kernel/pci-calgary.c
--- a/arch/x86_64/kernel/pci-calgary.c~calgary-iommu
+++ a/arch/x86_64/kernel/pci-calgary.c
@@ -784,13 +784,11 @@ static inline unsigned int __init locate
return address;
}
-static int __init calgary_init_one_nontraslated(struct pci_dev *dev)
+static void __init calgary_init_one_nontraslated(struct pci_dev *dev)
{
pci_dev_get(dev);
dev->sysdata = NULL;
dev->bus->self = dev;
-
- return 0;
}
static int __init calgary_init_one(struct pci_dev *dev)
_
Patches currently in -mm which might be from muli@xxxxxxxxxx are
calgary-iommu-rearrange-struct-iommu_table.patch
calgary-iommu-consolidate-per-bus-data.patch
calgary-iommu-break-out-of.patch
calgary-iommu-fix-error-path-memleak-in.patch
calgary-iommu-fix-reference-counting-of.patch
calgary-iommu.patch
calgary-iommu-save-a-bit-of-space-in-bus_info.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
