x86/PCI: build failure at x86/kernel/pci-dma.c with !CONFIG_PCI

Browse source

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>

...

This commit is contained in:

Fenghua Yu 2008-10-23 16:51:00 -07:00 • committed by Jesse Barnes

parent e013e13bf6

commit 3b15e58198

5 changed files with 16 additions and 23 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

arch/ia64/include/asm/iommu.h

View file

7

arch/ia64/kernel/pci-dma.c

View file

1

arch/x86/include/asm/iommu.h

View file

16

arch/x86/kernel/pci-dma.c

View file