aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-10-30 12:09:44 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-30 12:09:44 -0700
commitd6c3112abe44d7f718bd5aec8ab9469fecff6041 (patch)
tree362e826e1e39e6108301893ba35100c8719028b6 /arch/ia64
parentfce4877a6792ad72b88f6fd7556d19da5f20364d (diff)
parent3b15e581981b3ad35809f56d8131d5c19b6da1bd (diff)
downloadkernel_samsung_smdk4412-d6c3112abe44d7f718bd5aec8ab9469fecff6041.zip
kernel_samsung_smdk4412-d6c3112abe44d7f718bd5aec8ab9469fecff6041.tar.gz
kernel_samsung_smdk4412-d6c3112abe44d7f718bd5aec8ab9469fecff6041.tar.bz2
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: x86/PCI: build failure at x86/kernel/pci-dma.c with !CONFIG_PCI
Diffstat (limited to 'arch/ia64')
-rw-r--r--arch/ia64/include/asm/iommu.h1
-rw-r--r--arch/ia64/kernel/pci-dma.c7
2 files changed, 0 insertions, 8 deletions
diff --git a/arch/ia64/include/asm/iommu.h b/arch/ia64/include/asm/iommu.h
index 5fb2bb9..0490794 100644
--- a/arch/ia64/include/asm/iommu.h
+++ b/arch/ia64/include/asm/iommu.h
@@ -11,6 +11,5 @@ extern int force_iommu, no_iommu;
extern int iommu_detected;
extern void iommu_dma_init(void);
extern void machvec_init(const char *name);
-extern int forbid_dac;
#endif
diff --git a/arch/ia64/kernel/pci-dma.c b/arch/ia64/kernel/pci-dma.c
index 10a75b5..031abbf 100644
--- a/arch/ia64/kernel/pci-dma.c
+++ b/arch/ia64/kernel/pci-dma.c
@@ -89,13 +89,6 @@ int iommu_dma_supported(struct device *dev, u64 mask)
{
struct dma_mapping_ops *ops = get_dma_ops(dev);
-#ifdef CONFIG_PCI
- if (mask > 0xffffffff && forbid_dac > 0) {
- dev_info(dev, "Disallowing DAC for device\n");
- return 0;
- }
-#endif
-
if (ops->dma_supported_op)
return ops->dma_supported_op(dev, mask);