From 0ebf274f09a77421e09a16c30c160892f3c98bca Mon Sep 17 00:00:00 2001 From: Patrick Daly Date: Wed, 10 Feb 2016 19:14:54 -0800 Subject: [PATCH] iommu/arm-smmu: Restore __arm_smmu_get_pci_sid() This function is used upstream. Restore it. Change-Id: If828a4e3504a27b866daea9caa6d9238b362bb16 Signed-off-by: Patrick Daly --- drivers/iommu/arm-smmu.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index 367850948804..6c962c603333 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -2542,6 +2542,12 @@ static bool arm_smmu_capable(enum iommu_cap cap) } } +static int __arm_smmu_get_pci_sid(struct pci_dev *pdev, u16 alias, void *data) +{ + *((u16 *)data) = alias; + return 0; /* Continue walking */ +} + static void __arm_smmu_release_pci_iommudata(void *data) { kfree(data);