git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
drivers
/
parisc
/
ccio-dma.c
diff --git
a/drivers/parisc/ccio-dma.c
b/drivers/parisc/ccio-dma.c
index
a45b0c0
..
a6b4a5a
100644
(file)
--- a/
drivers/parisc/ccio-dma.c
+++ b/
drivers/parisc/ccio-dma.c
@@
-1266,7
+1266,7
@@
ccio_ioc_init(struct ioc *ioc)
** Hot-Plug/Removal of PCI cards. (aka PCI OLARD).
*/
** Hot-Plug/Removal of PCI cards. (aka PCI OLARD).
*/
- iova_space_size = (u32) (
num_phys
pages / count_parisc_driver(&ccio_driver));
+ iova_space_size = (u32) (
totalram_
pages / count_parisc_driver(&ccio_driver));
/* limit IOVA space size to 1MB-1GB */
/* limit IOVA space size to 1MB-1GB */
@@
-1305,7
+1305,7
@@
ccio_ioc_init(struct ioc *ioc)
DBG_INIT("%s() hpa 0x%p mem %luMB IOV %dMB (%d bits)\n",
__func__, ioc->ioc_regs,
DBG_INIT("%s() hpa 0x%p mem %luMB IOV %dMB (%d bits)\n",
__func__, ioc->ioc_regs,
- (unsigned long)
num_phys
pages >> (20 - PAGE_SHIFT),
+ (unsigned long)
totalram_
pages >> (20 - PAGE_SHIFT),
iova_space_size>>20,
iov_order + PAGE_SHIFT);
iova_space_size>>20,
iov_order + PAGE_SHIFT);