diff options
| author | Cong Wang <amwang@redhat.com> | 2011-11-25 10:14:20 -0500 |
|---|---|---|
| committer | Cong Wang <xiyou.wangcong@gmail.com> | 2012-03-20 09:48:17 -0400 |
| commit | 1c9c20f60230bd5a6195d41f9dd2dfa60874b1da (patch) | |
| tree | 611cf33d3d7e4f19b18be7a11b303d3f30ced75f /drivers/gpu/drm/ttm | |
| parent | 4e5df7ca3091a846b65f2a940a68506790a62d6a (diff) | |
drm: remove the second argument of k[un]map_atomic()
Signed-off-by: Cong Wang <amwang@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/ttm')
| -rw-r--r-- | drivers/gpu/drm/ttm/ttm_tt.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c index 2f75d203a2bf..c10cf5e2443a 100644 --- a/drivers/gpu/drm/ttm/ttm_tt.c +++ b/drivers/gpu/drm/ttm/ttm_tt.c | |||
| @@ -309,11 +309,11 @@ int ttm_tt_swapin(struct ttm_tt *ttm) | |||
| 309 | goto out_err; | 309 | goto out_err; |
| 310 | 310 | ||
| 311 | preempt_disable(); | 311 | preempt_disable(); |
| 312 | from_virtual = kmap_atomic(from_page, KM_USER0); | 312 | from_virtual = kmap_atomic(from_page); |
| 313 | to_virtual = kmap_atomic(to_page, KM_USER1); | 313 | to_virtual = kmap_atomic(to_page); |
| 314 | memcpy(to_virtual, from_virtual, PAGE_SIZE); | 314 | memcpy(to_virtual, from_virtual, PAGE_SIZE); |
| 315 | kunmap_atomic(to_virtual, KM_USER1); | 315 | kunmap_atomic(to_virtual); |
| 316 | kunmap_atomic(from_virtual, KM_USER0); | 316 | kunmap_atomic(from_virtual); |
| 317 | preempt_enable(); | 317 | preempt_enable(); |
| 318 | page_cache_release(from_page); | 318 | page_cache_release(from_page); |
| 319 | } | 319 | } |
| @@ -365,11 +365,11 @@ int ttm_tt_swapout(struct ttm_tt *ttm, struct file *persistent_swap_storage) | |||
| 365 | goto out_err; | 365 | goto out_err; |
| 366 | } | 366 | } |
| 367 | preempt_disable(); | 367 | preempt_disable(); |
| 368 | from_virtual = kmap_atomic(from_page, KM_USER0); | 368 | from_virtual = kmap_atomic(from_page); |
| 369 | to_virtual = kmap_atomic(to_page, KM_USER1); | 369 | to_virtual = kmap_atomic(to_page); |
| 370 | memcpy(to_virtual, from_virtual, PAGE_SIZE); | 370 | memcpy(to_virtual, from_virtual, PAGE_SIZE); |
| 371 | kunmap_atomic(to_virtual, KM_USER1); | 371 | kunmap_atomic(to_virtual); |
| 372 | kunmap_atomic(from_virtual, KM_USER0); | 372 | kunmap_atomic(from_virtual); |
| 373 | preempt_enable(); | 373 | preempt_enable(); |
| 374 | set_page_dirty(to_page); | 374 | set_page_dirty(to_page); |
| 375 | mark_page_accessed(to_page); | 375 | mark_page_accessed(to_page); |