From f41da843fdb9c34cd6c5ca9ffc26659d459518d2 Mon Sep 17 00:00:00 2001
From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date: Tue, 29 Jul 2008 13:38:53 +0900
Subject: [PATCH] --- yaml --- r: 107191 b: refs/heads/master c:
 8978b74253280d59e97cf49a3ec2c0cbccd5b801 h: refs/heads/master i:   107189:
 1bcdfb838053e5fdd2d1d7749cb7d0625bd374fa   107187:
 0cfc9b267273474e99b27639e3f17118dce7b786   107183:
 5dbc17211a786e65a00411ce07476412b71988ec v: v3

---
 [refs]                             | 2 +-
 trunk/arch/x86/kernel/pci-dma.c    | 8 ++++++++
 trunk/include/asm-x86/iommu.h      | 2 ++
 trunk/include/linux/iommu-helper.h | 1 -
 trunk/lib/iommu-helper.c           | 8 --------
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index ca8375e9cd21..0d61501c6648 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35780c8ea7ad5c6d5483244d5f5bf37176fda86a
+refs/heads/master: 8978b74253280d59e97cf49a3ec2c0cbccd5b801
diff --git a/trunk/arch/x86/kernel/pci-dma.c b/trunk/arch/x86/kernel/pci-dma.c
index 8dbffb846de9..87d4d6964ec2 100644
--- a/trunk/arch/x86/kernel/pci-dma.c
+++ b/trunk/arch/x86/kernel/pci-dma.c
@@ -123,6 +123,14 @@ void __init pci_iommu_alloc(void)
 
 	pci_swiotlb_init();
 }
+
+unsigned long iommu_num_pages(unsigned long addr, unsigned long len)
+{
+	unsigned long size = roundup((addr & ~PAGE_MASK) + len, PAGE_SIZE);
+
+	return size >> PAGE_SHIFT;
+}
+EXPORT_SYMBOL(iommu_num_pages);
 #endif
 
 /*
diff --git a/trunk/include/asm-x86/iommu.h b/trunk/include/asm-x86/iommu.h
index ecc8061904a9..5f888cc5be49 100644
--- a/trunk/include/asm-x86/iommu.h
+++ b/trunk/include/asm-x86/iommu.h
@@ -7,6 +7,8 @@ extern struct dma_mapping_ops nommu_dma_ops;
 extern int force_iommu, no_iommu;
 extern int iommu_detected;
 
+extern unsigned long iommu_num_pages(unsigned long addr, unsigned long len);
+
 #ifdef CONFIG_GART_IOMMU
 extern int gart_iommu_aperture;
 extern int gart_iommu_aperture_allowed;
diff --git a/trunk/include/linux/iommu-helper.h b/trunk/include/linux/iommu-helper.h
index f8598f583944..c975caf75385 100644
--- a/trunk/include/linux/iommu-helper.h
+++ b/trunk/include/linux/iommu-helper.h
@@ -8,4 +8,3 @@ extern unsigned long iommu_area_alloc(unsigned long *map, unsigned long size,
 				      unsigned long align_mask);
 extern void iommu_area_free(unsigned long *map, unsigned long start,
 			    unsigned int nr);
-extern unsigned long iommu_num_pages(unsigned long addr, unsigned long len);
diff --git a/trunk/lib/iommu-helper.c b/trunk/lib/iommu-helper.c
index 889ddce2021e..a3b8d4c3f77a 100644
--- a/trunk/lib/iommu-helper.c
+++ b/trunk/lib/iommu-helper.c
@@ -80,11 +80,3 @@ void iommu_area_free(unsigned long *map, unsigned long start, unsigned int nr)
 	}
 }
 EXPORT_SYMBOL(iommu_area_free);
-
-unsigned long iommu_num_pages(unsigned long addr, unsigned long len)
-{
-	unsigned long size = roundup((addr & ~PAGE_MASK) + len, PAGE_SIZE);
-
-	return size >> PAGE_SHIFT;
-}
-EXPORT_SYMBOL(iommu_num_pages);