x86/PCI: build failure at x86/kernel/pci-dma.c with !CONFIG_PCI
authorFenghua Yu <fenghua.yu@intel.com>
Thu, 23 Oct 2008 23:51:00 +0000 (16:51 -0700)
committerJesse Barnes <jbarnes@virtuousgeek.org>
Fri, 24 Oct 2008 18:09:43 +0000 (11:09 -0700)
commit3b15e581981b3ad35809f56d8131d5c19b6da1bd
treebfd195b86451f2ee5600a05be32346b157ff97db
parente013e13bf605b9e6b702adffbe2853cfc60e7806
x86/PCI: build failure at x86/kernel/pci-dma.c with !CONFIG_PCI

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>
arch/ia64/include/asm/iommu.h
arch/ia64/kernel/pci-dma.c
arch/x86/include/asm/iommu.h
arch/x86/kernel/pci-dma.c
drivers/pci/quirks.c