diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-01 10:28:17 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-01 10:28:17 -0700 |
commit | 57b1494d2ba544c62673234da6115c21fac27ffc (patch) | |
tree | 34f91f3187805fa034f8e63966d471ba2498d148 /lib | |
parent | 9fe3b64be3dc8313e9fa87255f169c608d074cbd (diff) | |
parent | 8978b74253280d59e97cf49a3ec2c0cbccd5b801 (diff) | |
download | blackbird-op-linux-57b1494d2ba544c62673234da6115c21fac27ffc.tar.gz blackbird-op-linux-57b1494d2ba544c62673234da6115c21fac27ffc.zip |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
generic, x86: fix add iommu_num_pages helper function
x86: remove stray <6> in BogoMIPS printk
x86: move dma32_reserve_bootmem() after reserve_crashkernel()
Diffstat (limited to 'lib')
-rw-r--r-- | lib/iommu-helper.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/lib/iommu-helper.c b/lib/iommu-helper.c index 889ddce2021e..a3b8d4c3f77a 100644 --- a/lib/iommu-helper.c +++ b/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); |