mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-01 14:44:12 +00:00
Code Issues Releases Wiki Activity

x86 gart: rename iommu.h to gart.h

Browse source 
This patch renames the include file asm-x86/iommu.h to asm-x86/gart.h to make
clear to which IOMMU implementation it belongs. The patch also adds "GART" to
the Kconfig line.

Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Acked-by: Muli Ben-Yehuda <muli@il.ibm.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Joerg Roedel 2007-10-24 12:49:47 +02:00 committed by Thomas Gleixner
parent e1054b39b2
commit 395624fcdd
12 changed files with 41 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/x86/Kconfig.x86_64
View file

@ -480,7 +480,7 @@ config HPET_EMULATE_RTC
# Mark as embedded because too many people got it wrong.
# The code disables itself when not needed.
config IOMMU
bool "IOMMU support" if EMBEDDED
bool "GART IOMMU support" if EMBEDDED
default y
select SWIOTLB
select AGP

2
arch/x86/kernel/aperture_64.c
View file

@ -20,7 +20,7 @@
#include <linux/ioport.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>
#include <asm/k8.h>

2
arch/x86/kernel/early-quirks.c
View file

@ -18,7 +18,7 @@
#include <asm/apic.h>
#ifdef CONFIG_IOMMU
#include <asm/iommu.h>
#include <asm/gart.h>
#endif
static void __init via_bugs(void)

2
arch/x86/kernel/pci-calgary_64.c
View file

@ -36,7 +36,7 @@
#include <linux/pci.h>
#include <linux/delay.h>
#include <linux/scatterlist.h>
#include <asm/iommu.h>
#include <asm/gart.h>
#include <asm/calgary.h>
#include <asm/tce.h>
#include <asm/pci-direct.h>

2
arch/x86/kernel/pci-dma_64.c
View file

@ -9,7 +9,7 @@
#include <linux/module.h>
#include <linux/dmar.h>
#include <asm/io.h>
#include <asm/iommu.h>
#include <asm/gart.h>
#include <asm/calgary.h>
int iommu_merge __read_mostly = 1;

2
arch/x86/kernel/pci-gart_64.c
View file

@ -30,7 +30,7 @@
#include <asm/mtrr.h>
#include <asm/pgtable.h>
#include <asm/proto.h>
#include <asm/iommu.h>
#include <asm/gart.h>
#include <asm/cacheflush.h>
#include <asm/swiotlb.h>
#include <asm/dma.h>

2
arch/x86/kernel/pci-nommu_64.c
View file

@ -7,7 +7,7 @@
#include <linux/dma-mapping.h>
#include <linux/scatterlist.h>
#include <asm/iommu.h>
#include <asm/gart.h>
#include <asm/processor.h>
#include <asm/dma.h>

2
arch/x86/kernel/pci-swiotlb_64.c
View file

@ -5,7 +5,7 @@
#include <linux/module.h>
#include <linux/dma-mapping.h>
#include <asm/iommu.h>
#include <asm/gart.h>
#include <asm/swiotlb.h>
#include <asm/dma.h>

2
arch/x86/kernel/reboot_64.c
View file

@ -17,7 +17,7 @@
#include <asm/pgtable.h>
#include <asm/tlbflush.h>
#include <asm/apic.h>
#include <asm/iommu.h>
#include <asm/gart.h>
/*
* Power off function, if any

2
drivers/pci/intel-iommu.c
View file

@ -34,7 +34,7 @@
#include "intel-iommu.h"
#include <asm/proto.h> /* force_iommu in this header in x86-64*/
#include <asm/cacheflush.h>
#include <asm/iommu.h>
#include <asm/gart.h>
#include "pci.h"
#define IS_GFX_DEVICE(pdev) ((pdev->class >> 16) == PCI_BASE_CLASS_DISPLAY)

29
include/asm-x86/gart.h Normal file
View file

@ -0,0 +1,29 @@
#ifndef _ASM_X8664_IOMMU_H
#define _ASM_X8664_IOMMU_H 1
extern void pci_iommu_shutdown(void);
extern void no_iommu_init(void);
extern int force_iommu, no_iommu;
extern int iommu_detected;
#ifdef CONFIG_IOMMU
extern void gart_iommu_init(void);
extern void gart_iommu_shutdown(void);
extern void __init gart_parse_options(char *);
extern void iommu_hole_init(void);
extern int fallback_aper_order;
extern int fallback_aper_force;
extern int iommu_aperture;
extern int iommu_aperture_allowed;
extern int iommu_aperture_disabled;
extern int fix_aperture;
#else
#define iommu_aperture 0
#define iommu_aperture_allowed 0
static inline void gart_iommu_shutdown(void)
{
}
#endif
#endif

4
include/asm-x86/iommu.h
View file

@ -1,5 +1,5 @@
#ifndef _ASM_X8664_IOMMU_H
#define _ASM_X8664_IOMMU_H 1
#ifndef _ASM_X8664_GART_H
#define _ASM_X8664_GART_H 1
extern void pci_iommu_shutdown(void);
extern void no_iommu_init(void);