]> err.no Git - linux-2.6/commit
x86: remove ifdef CONFIG_GART_IOMMU in pci-dma.c
authorFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Fri, 11 Jul 2008 01:23:43 +0000 (10:23 +0900)
committerIngo Molnar <mingo@elte.hu>
Fri, 11 Jul 2008 09:00:54 +0000 (11:00 +0200)
commitac7ded2adb2e43152fe7385ddd53bf45f5c92285
treea9698c49442b8d40f6c49cad029608b685ee9e61
parent46a7fa270afbe5fddc6042a598cfe22977b0e989
x86: remove ifdef CONFIG_GART_IOMMU in pci-dma.c

Our way to handle gart_* functions for CONFIG_GART_IOMMU and
!CONFIG_GART_IOMMU cases is inconsistent.

We have some dummy gart_* functions in !CONFIG_GART_IOMMU case and
also use ifdef CONFIG_GART_IOMMU tricks in pci-dma.c to call some
gart_* functions in only CONFIG_GART_IOMMU case.

This patch removes ifdef CONFIG_GART_IOMMU in pci-dma.c and always use
dummy gart_* functions in iommu.h.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: Muli Ben-Yehuda <muli@il.ibm.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/pci-dma.c
include/asm-x86/iommu.h