From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

Date: Tue, 1 Mar 2022 10:01:56 +0800

Subject: iommu/vt-d: Move intel_iommu_ops to header file

Git-commit: 2852631d96a643e0b21a9b14ad38caf465d7225f

Patch-mainline: v5.18-rc1

References: bsc#1205701

Compiler is not happy about hidden declaration of intel_iommu_ops.

.../iommu.c:414:24: warning: symbol 'intel_iommu_ops' was not declared. Should it be static?

Move declaration to header file to make compiler happy.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

Link: https://lore.kernel.org/r/20220207141240.8253-1-andriy.shevchenko@linux.intel.com

Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>

Link: https://lore.kernel.org/r/20220301020159.633356-10-baolu.lu@linux.intel.com

Signed-off-by: Joerg Roedel <jroedel@suse.de>

---

 drivers/iommu/intel/dmar.c  | 2 --

 include/linux/intel-iommu.h | 2 ++

 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/iommu/intel/dmar.c b/drivers/iommu/intel/dmar.c

index 6d10be50ec30..4de960834a1b 100644

--- a/drivers/iommu/intel/dmar.c

+++ b/drivers/iommu/intel/dmar.c

@@ -66,8 +66,6 @@ static unsigned long dmar_seq_ids[BITS_TO_LONGS(DMAR_UNITS_SUPPORTED)];

 static int alloc_iommu(struct dmar_drhd_unit *drhd);

 static void free_iommu(struct intel_iommu *iommu);

-extern const struct iommu_ops intel_iommu_ops;

-

 static void dmar_register_drhd_unit(struct dmar_drhd_unit *drhd)

 {

 	/*

diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h

index 03f1134fc2fe..4909d6c9ac21 100644

--- a/include/linux/intel-iommu.h

+++ b/include/linux/intel-iommu.h

@@ -783,6 +783,8 @@ bool context_present(struct context_entry *context);

 struct context_entry *iommu_context_addr(struct intel_iommu *iommu, u8 bus,

 					 u8 devfn, int alloc);

+extern const struct iommu_ops intel_iommu_ops;

+

 #ifdef CONFIG_INTEL_IOMMU

 extern int iommu_calculate_agaw(struct intel_iommu *iommu);

 extern int iommu_calculate_max_sagaw(struct intel_iommu *iommu);