3b15e58198
On Thu, Oct 23, 2008 at 04:09:52PM -0700, Alexander Beregalov wrote: > arch/x86/kernel/built-in.o: In function `iommu_setup': > pci-dma.c:(.init.text+0x36ad): undefined reference to `forbid_dac' > pci-dma.c:(.init.text+0x36cc): undefined reference to `forbid_dac' > pci-dma.c:(.init.text+0x3711): undefined reference to `forbid_dac This patch partially reverts a patch to add IOMMU support to ia64. The forbid_dac variable was incorrectly moved to quirks.c, which isn't built when PCI is disabled. Tested-by: "Alexander Beregalov" <a.beregalov@gmail.com> Acked-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Signed-off-by: Fenghua Yu <fenghua.yu@intel.com> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
50 lines
1.1 KiB
C
50 lines
1.1 KiB
C
#ifndef _ASM_X86_IOMMU_H
|
|
#define _ASM_X86_IOMMU_H
|
|
|
|
extern void pci_iommu_shutdown(void);
|
|
extern void no_iommu_init(void);
|
|
extern struct dma_mapping_ops nommu_dma_ops;
|
|
extern int force_iommu, no_iommu;
|
|
extern int iommu_detected;
|
|
extern int dmar_disabled;
|
|
|
|
extern unsigned long iommu_nr_pages(unsigned long addr, unsigned long len);
|
|
|
|
/* 10 seconds */
|
|
#define DMAR_OPERATION_TIMEOUT ((cycles_t) tsc_khz*10*1000)
|
|
|
|
#ifdef CONFIG_GART_IOMMU
|
|
extern int gart_iommu_aperture;
|
|
extern int gart_iommu_aperture_allowed;
|
|
extern int gart_iommu_aperture_disabled;
|
|
|
|
extern void early_gart_iommu_check(void);
|
|
extern void gart_iommu_init(void);
|
|
extern void gart_iommu_shutdown(void);
|
|
extern void __init gart_parse_options(char *);
|
|
extern void gart_iommu_hole_init(void);
|
|
|
|
#else
|
|
#define gart_iommu_aperture 0
|
|
#define gart_iommu_aperture_allowed 0
|
|
#define gart_iommu_aperture_disabled 1
|
|
|
|
static inline void early_gart_iommu_check(void)
|
|
{
|
|
}
|
|
static inline void gart_iommu_init(void)
|
|
{
|
|
}
|
|
static inline void gart_iommu_shutdown(void)
|
|
{
|
|
}
|
|
static inline void gart_parse_options(char *options)
|
|
{
|
|
}
|
|
static inline void gart_iommu_hole_init(void)
|
|
{
|
|
}
|
|
#endif
|
|
|
|
#endif /* _ASM_X86_IOMMU_H */
|