From 1c644af17dad38a35362cb241545764ad4cccf20 Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Tue, 27 Jan 2009 23:43:59 +0900 Subject: [PATCH] --- yaml --- r: 138904 b: refs/heads/master c: fb4467274de0c93e15c4a4fd3249d62454ba57dc h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/ia64/kernel/dma-mapping.c | 3 +++ trunk/arch/ia64/kernel/pci-swiotlb.c | 3 --- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 7e63444173a4..0b1d51d253a6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b041cf22ddb742874040d0a3259d0be46f3d3a4b +refs/heads/master: fb4467274de0c93e15c4a4fd3249d62454ba57dc diff --git a/trunk/arch/ia64/kernel/dma-mapping.c b/trunk/arch/ia64/kernel/dma-mapping.c index 7060e13fa421..086a2aeb0404 100644 --- a/trunk/arch/ia64/kernel/dma-mapping.c +++ b/trunk/arch/ia64/kernel/dma-mapping.c @@ -1,5 +1,8 @@ #include +/* Set this to 1 if there is a HW IOMMU in the system */ +int iommu_detected __read_mostly; + struct dma_map_ops *dma_ops; EXPORT_SYMBOL(dma_ops); diff --git a/trunk/arch/ia64/kernel/pci-swiotlb.c b/trunk/arch/ia64/kernel/pci-swiotlb.c index d21dea44e76f..717ad4f1c708 100644 --- a/trunk/arch/ia64/kernel/pci-swiotlb.c +++ b/trunk/arch/ia64/kernel/pci-swiotlb.c @@ -13,9 +13,6 @@ int swiotlb __read_mostly; EXPORT_SYMBOL(swiotlb); -/* Set this to 1 if there is a HW IOMMU in the system */ -int iommu_detected __read_mostly; - struct dma_map_ops swiotlb_dma_ops = { .alloc_coherent = swiotlb_alloc_coherent, .free_coherent = swiotlb_free_coherent,