| From 9cdf5ca80aab23540c93531ef193305778800add Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 20 Apr 2023 12:20:13 -0700 |
| Subject: iommu/amd: Fix up merge conflict resolution |
| |
| From: Jerry Snitselaar <jsnitsel@redhat.com> |
| |
| [ Upstream commit 8ec4e2befef10c7679cd59251956a428e783c0b5 ] |
| |
| Merge commit e17c6debd4b2 ("Merge branches 'arm/mediatek', 'arm/msm', 'arm/renesas', 'arm/rockchip', 'arm/smmu', 'x86/vt-d' and 'x86/amd' into next") |
| added amd_iommu_init_devices, amd_iommu_uninit_devices, |
| and amd_iommu_init_notifier back to drivers/iommu/amd/amd_iommu.h. |
| The only references to them are here, so clean them up. |
| |
| Fixes: e17c6debd4b2 ("Merge branches 'arm/mediatek', 'arm/msm', 'arm/renesas', 'arm/rockchip', 'arm/smmu', 'x86/vt-d' and 'x86/amd' into next") |
| Cc: Joerg Roedel <joro@8bytes.org> |
| Cc: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com> |
| Cc: Will Deacon <will@kernel.org> |
| Cc: Robin Murphy <robin.murphy@arm.com> |
| Signed-off-by: Jerry Snitselaar <jsnitsel@redhat.com> |
| Reviewed-by: Vasant Hegde <vasant.hegde@amd.com> |
| Link: https://lore.kernel.org/r/20230420192013.733331-1-jsnitsel@redhat.com |
| Signed-off-by: Joerg Roedel <jroedel@suse.de> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/iommu/amd/amd_iommu.h | 3 --- |
| 1 file changed, 3 deletions(-) |
| |
| diff --git a/drivers/iommu/amd/amd_iommu.h b/drivers/iommu/amd/amd_iommu.h |
| index 24c7e6c6c0de9..471f40351f4c8 100644 |
| --- a/drivers/iommu/amd/amd_iommu.h |
| +++ b/drivers/iommu/amd/amd_iommu.h |
| @@ -16,9 +16,6 @@ extern irqreturn_t amd_iommu_int_handler(int irq, void *data); |
| extern void amd_iommu_apply_erratum_63(struct amd_iommu *iommu, u16 devid); |
| extern void amd_iommu_restart_event_logging(struct amd_iommu *iommu); |
| extern void amd_iommu_restart_ga_log(struct amd_iommu *iommu); |
| -extern int amd_iommu_init_devices(void); |
| -extern void amd_iommu_uninit_devices(void); |
| -extern void amd_iommu_init_notifier(void); |
| extern void amd_iommu_set_rlookup_table(struct amd_iommu *iommu, u16 devid); |
| |
| #ifdef CONFIG_AMD_IOMMU_DEBUGFS |
| -- |
| 2.39.2 |
| |
