summaryrefslogtreecommitdiff
path: root/drivers/infiniband/hw/ipath/ipath_user_pages.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-29 01:24:12 +0300
committerIngo Molnar <mingo@elte.hu>2009-03-29 01:24:12 +0300
commitd00ab2fdd4dc4361c97777bc1fef7234329d4659 (patch)
treeb8d8f98c1af633bbc1570b4270b39727737beebf /drivers/infiniband/hw/ipath/ipath_user_pages.c
parent88f502fedba82eff252b6420e8b8328e4ae25c67 (diff)
parent7c730ccdc1188b97f5c8cb690906242c7ed75c22 (diff)
downloadlinux-d00ab2fdd4dc4361c97777bc1fef7234329d4659.tar.xz
Merge branch 'linus' into core/futexes
Diffstat (limited to 'drivers/infiniband/hw/ipath/ipath_user_pages.c')
-rw-r--r--drivers/infiniband/hw/ipath/ipath_user_pages.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/infiniband/hw/ipath/ipath_user_pages.c b/drivers/infiniband/hw/ipath/ipath_user_pages.c
index 0190edc8044e..855911e7396d 100644
--- a/drivers/infiniband/hw/ipath/ipath_user_pages.c
+++ b/drivers/infiniband/hw/ipath/ipath_user_pages.c
@@ -209,20 +209,20 @@ void ipath_release_user_pages_on_close(struct page **p, size_t num_pages)
mm = get_task_mm(current);
if (!mm)
- goto bail;
+ return;
work = kmalloc(sizeof(*work), GFP_KERNEL);
if (!work)
goto bail_mm;
- goto bail;
-
INIT_WORK(&work->work, user_pages_account);
work->mm = mm;
work->num_pages = num_pages;
+ schedule_work(&work->work);
+ return;
+
bail_mm:
mmput(mm);
-bail:
return;
}