summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Daly <pdaly@codeaurora.org>2016-02-10 19:14:54 -0800
committerDavid Keitel <dkeitel@codeaurora.org>2016-03-22 11:15:35 -0700
commit0ebf274f09a77421e09a16c30c160892f3c98bca (patch)
tree689003063f2b72704228dda4c7fa75c3e02c482b
parent4de2c32a061ad9d41079785ac8246f91e7e61bc9 (diff)
iommu/arm-smmu: Restore __arm_smmu_get_pci_sid()
This function is used upstream. Restore it. Change-Id: If828a4e3504a27b866daea9caa6d9238b362bb16 Signed-off-by: Patrick Daly <pdaly@codeaurora.org>
-rw-r--r--drivers/iommu/arm-smmu.c6
1 files changed, 6 insertions, 0 deletions
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);