aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'arch/ia64/kernel')
-rw-r--r--arch/ia64/kernel/pci-dma.c7
-rw-r--r--arch/ia64/kernel/perfmon.c5
2 files changed, 0 insertions, 12 deletions
diff --git a/arch/ia64/kernel/pci-dma.c b/arch/ia64/kernel/pci-dma.c
index 10a75b557650..031abbf9c875 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)
89{ 89{
90 struct dma_mapping_ops *ops = get_dma_ops(dev); 90 struct dma_mapping_ops *ops = get_dma_ops(dev);
91 91
92#ifdef CONFIG_PCI
93 if (mask > 0xffffffff && forbid_dac > 0) {
94 dev_info(dev, "Disallowing DAC for device\n");
95 return 0;
96 }
97#endif
98
99 if (ops->dma_supported_op) 92 if (ops->dma_supported_op)
100 return ops->dma_supported_op(dev, mask); 93 return ops->dma_supported_op(dev, mask);
101 94
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c
index ada4605d1223..6543a5547c84 100644
--- a/arch/ia64/kernel/perfmon.c
+++ b/arch/ia64/kernel/perfmon.c
@@ -1995,11 +1995,6 @@ pfm_close(struct inode *inode, struct file *filp)
1995 return -EBADF; 1995 return -EBADF;
1996 } 1996 }
1997 1997
1998 if (filp->f_flags & FASYNC) {
1999 DPRINT(("cleaning up async_queue=%p\n", ctx->ctx_async_queue));
2000 pfm_do_fasync(-1, filp, ctx, 0);
2001 }
2002
2003 PROTECT_CTX(ctx, flags); 1998 PROTECT_CTX(ctx, flags);
2004 1999
2005 state = ctx->ctx_state; 2000 state = ctx->ctx_state;