From: Chen Gang chengang@emindsoft.com.cn

It is architecture specific mechanism header, not generic header, so move it to arch/x86/include/asm.

ALso change all related contents for it.

Signed-off-by: Chen Gang gang.chen.5i5j@gmail.com --- MAINTAINERS | 2 +- {include/linux => arch/x86/include/asm}/amd-iommu.h | 0 drivers/gpu/drm/amd/amdkfd/kfd_device.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_process.c | 2 +- drivers/iommu/amd_iommu.c | 2 +- drivers/iommu/amd_iommu_init.c | 2 +- drivers/iommu/amd_iommu_v2.c | 2 +- 7 files changed, 6 insertions(+), 6 deletions(-) rename {include/linux => arch/x86/include/asm}/amd-iommu.h (100%)

diff --git a/MAINTAINERS b/MAINTAINERS index 44666b1..893cf07 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -656,7 +656,7 @@ L: iommu@lists.linux-foundation.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git S: Maintained F: drivers/iommu/amd_iommu*.[ch] -F: include/linux/amd-iommu.h +F: arch/x86/include/asm/amd-iommu.h

AMD KFD M: Oded Gabbay oded.gabbay@gmail.com diff --git a/include/linux/amd-iommu.h b/arch/x86/include/asm/amd-iommu.h similarity index 100% rename from include/linux/amd-iommu.h rename to arch/x86/include/asm/amd-iommu.h diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c index 3f95f7c..bcbbabd 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */

-#include <linux/amd-iommu.h> +#include <asm/amd-iommu.h> #include <linux/bsearch.h> #include <linux/pci.h> #include <linux/slab.h> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process.c b/drivers/gpu/drm/amd/amdkfd/kfd_process.c index 9be0070..a268799 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_process.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_process.c @@ -24,7 +24,7 @@ #include <linux/log2.h> #include <linux/sched.h> #include <linux/slab.h> -#include <linux/amd-iommu.h> +#include <asm/amd-iommu.h> #include <linux/notifier.h> #include <linux/compat.h>

diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c index 8b2be1e..fea3056 100644 --- a/drivers/iommu/amd_iommu.c +++ b/drivers/iommu/amd_iommu.c @@ -28,7 +28,7 @@ #include <linux/iommu-helper.h> #include <linux/iommu.h> #include <linux/delay.h> -#include <linux/amd-iommu.h> +#include <asm/amd-iommu.h> #include <linux/notifier.h> #include <linux/export.h> #include <linux/irq.h> diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c index 013bdff..f7eee70 100644 --- a/drivers/iommu/amd_iommu_init.c +++ b/drivers/iommu/amd_iommu_init.c @@ -24,7 +24,7 @@ #include <linux/syscore_ops.h> #include <linux/interrupt.h> #include <linux/msi.h> -#include <linux/amd-iommu.h> +#include <asm/amd-iommu.h> #include <linux/export.h> #include <linux/iommu.h> #include <asm/pci-direct.h> diff --git a/drivers/iommu/amd_iommu_v2.c b/drivers/iommu/amd_iommu_v2.c index c865737..e6584fe 100644 --- a/drivers/iommu/amd_iommu_v2.c +++ b/drivers/iommu/amd_iommu_v2.c @@ -17,7 +17,7 @@ */

#include <linux/mmu_notifier.h> -#include <linux/amd-iommu.h> +#include <asm/amd-iommu.h> #include <linux/mm_types.h> #include <linux/profile.h> #include <linux/module.h>