]> git.baikalelectronics.ru Git - kernel.git/commitdiff
ia64: Hide the archdata.iommu field behind generic IOMMU_API
authorKrzysztof Kozlowski <krzk@kernel.org>
Mon, 18 May 2020 12:08:54 +0000 (14:08 +0200)
committerJoerg Roedel <jroedel@suse.de>
Wed, 27 May 2020 14:41:29 +0000 (16:41 +0200)
There is a generic, kernel wide configuration symbol for enabling the
IOMMU specific bits: CONFIG_IOMMU_API.  Implementations (including
INTEL_IOMMU driver) select it so use it here as well.

This makes the conditional archdata.iommu field consistent with other
platforms and also fixes any compile test builds of other IOMMU drivers,
when INTEL_IOMMU is not selected).

For the case when INTEL_IOMMU and COMPILE_TEST are not selected, this
should create functionally equivalent code/choice.  With COMPILE_TEST
this field could appear if other IOMMU drivers are chosen but
INTEL_IOMMU not.

Reported-by: kbuild test robot <lkp@intel.com>
Fixes: f76d9909dcdf ("iommu: Enable compile testing for some of drivers")
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Link: https://lore.kernel.org/r/20200518120855.27822-1-krzk@kernel.org
Signed-off-by: Joerg Roedel <jroedel@suse.de>
arch/ia64/include/asm/device.h

index 410a769ece9581f96bec0382567b313a17169401..3eb397415381077d2e5d01954f6945f4cc48b3d2 100644 (file)
@@ -6,7 +6,7 @@
 #define _ASM_IA64_DEVICE_H
 
 struct dev_archdata {
-#ifdef CONFIG_INTEL_IOMMU
+#ifdef CONFIG_IOMMU_API
        void *iommu; /* hook for IOMMU specific extension */
 #endif
 };