git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
infiniband
/
core
/
uverbs_mem.c
diff --git
a/drivers/infiniband/core/uverbs_mem.c
b/drivers/infiniband/core/uverbs_mem.c
index
b543177
..
4d65a4b
100644
(file)
--- a/
drivers/infiniband/core/uverbs_mem.c
+++ b/
drivers/infiniband/core/uverbs_mem.c
@@
-53,8
+53,8
@@
static void __ib_umem_release(struct ib_device *dev, struct ib_umem *umem, int d
int i;
list_for_each_entry_safe(chunk, tmp, &umem->chunk_list, list) {
int i;
list_for_each_entry_safe(chunk, tmp, &umem->chunk_list, list) {
-
dma_unmap_sg(dev->dma_device
, chunk->page_list,
- chunk->nents, DMA_BIDIRECTIONAL);
+
ib_dma_unmap_sg(dev
, chunk->page_list,
+
chunk->nents, DMA_BIDIRECTIONAL);
for (i = 0; i < chunk->nents; ++i) {
if (umem->writable && dirty)
set_page_dirty_lock(chunk->page_list[i].page);
for (i = 0; i < chunk->nents; ++i) {
if (umem->writable && dirty)
set_page_dirty_lock(chunk->page_list[i].page);
@@
-137,10
+137,10
@@
int ib_umem_get(struct ib_device *dev, struct ib_umem *mem,
chunk->page_list[i].length = PAGE_SIZE;
}
chunk->page_list[i].length = PAGE_SIZE;
}
- chunk->nmap =
dma_map_sg(dev->dma_device
,
- &chunk->page_list[0],
- chunk->nents,
- DMA_BIDIRECTIONAL);
+ chunk->nmap =
ib_dma_map_sg(dev
,
+
&chunk->page_list[0],
+
chunk->nents,
+
DMA_BIDIRECTIONAL);
if (chunk->nmap <= 0) {
for (i = 0; i < chunk->nents; ++i)
put_page(chunk->page_list[i].page);
if (chunk->nmap <= 0) {
for (i = 0; i < chunk->nents; ++i)
put_page(chunk->page_list[i].page);
@@
-180,9
+180,10
@@
void ib_umem_release(struct ib_device *dev, struct ib_umem *umem)
up_write(¤t->mm->mmap_sem);
}
up_write(¤t->mm->mmap_sem);
}
-static void ib_umem_account(
void *work_ptr
)
+static void ib_umem_account(
struct work_struct *_work
)
{
{
- struct ib_umem_account_work *work = work_ptr;
+ struct ib_umem_account_work *work =
+ container_of(_work, struct ib_umem_account_work, work);
down_write(&work->mm->mmap_sem);
vx_vmlocked_sub(work->mm, work->diff);
down_write(&work->mm->mmap_sem);
vx_vmlocked_sub(work->mm, work->diff);
@@
-217,7
+218,7
@@
void ib_umem_release_on_close(struct ib_device *dev, struct ib_umem *umem)
return;
}
return;
}
- INIT_WORK(&work->work, ib_umem_account
, work
);
+ INIT_WORK(&work->work, ib_umem_account);
work->mm = mm;
work->diff = PAGE_ALIGN(umem->length + umem->offset) >> PAGE_SHIFT;
work->mm = mm;
work->diff = PAGE_ALIGN(umem->length + umem->offset) >> PAGE_SHIFT;