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>
16 lines
390 B
C
16 lines
390 B
C
#ifndef _ASM_IA64_IOMMU_H
|
|
#define _ASM_IA64_IOMMU_H 1
|
|
|
|
#define cpu_has_x2apic 0
|
|
/* 10 seconds */
|
|
#define DMAR_OPERATION_TIMEOUT (((cycles_t) local_cpu_data->itc_freq)*10)
|
|
|
|
extern void pci_iommu_shutdown(void);
|
|
extern void no_iommu_init(void);
|
|
extern int force_iommu, no_iommu;
|
|
extern int iommu_detected;
|
|
extern void iommu_dma_init(void);
|
|
extern void machvec_init(const char *name);
|
|
|
|
#endif
|