Commit 46a7fa27 authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by Ingo Molnar
Browse files

x86: make only GART code include gart.h 



gart.h has only GART-specific stuff. Only GART code needs it. Other
IOMMU stuff should include iommu.h instead of gart.h.

Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: default avatarMuli Ben-Yehuda <muli@il.ibm.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent f361a450

arch/x86/kernel/amd_iommu.c

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include <linux/scatterlist.h>

#include <linux/iommu-helper.h>

#include <asm/proto.h>

#include <asm/gart.h>

#include <asm/iommu.h>

#include <asm/amd_iommu_types.h>

#include <asm/amd_iommu.h>

arch/x86/kernel/amd_iommu_init.c

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
#include <asm/pci-direct.h>

#include <asm/amd_iommu_types.h>

#include <asm/amd_iommu.h>

#include <asm/gart.h>

#include <asm/iommu.h>



/*

 * definitions for the ACPI scanning code

arch/x86/kernel/aperture_64.c

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/suspend.h>

#include <asm/e820.h>

#include <asm/io.h>

#include <asm/iommu.h>

#include <asm/gart.h>

#include <asm/pci-direct.h>

#include <asm/dma.h>

arch/x86/kernel/early-quirks.c

+1 −4
Original line number Diff line number Diff line
@@ -16,10 +16,7 @@ 
#include <asm/dma.h>

#include <asm/io_apic.h>

#include <asm/apic.h>



#ifdef CONFIG_GART_IOMMU

#include <asm/gart.h>

#endif

#include <asm/iommu.h>



static void __init fix_hypertransport_config(int num, int slot, int func)

{

arch/x86/kernel/pci-calgary_64.c

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
#include <linux/delay.h>

#include <linux/scatterlist.h>

#include <linux/iommu-helper.h>

#include <asm/gart.h>

#include <asm/iommu.h>

#include <asm/calgary.h>

#include <asm/tce.h>

#include <asm/pci-direct.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE