diff options
| author | Akinobu Mita <akinobu.mita@gmail.com> | 2012-11-09 12:10:43 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-11-16 09:59:51 +1000 |
| commit | 55aa914e9274cf1d55397cc04eb926eb055c79f7 (patch) | |
| tree | d90993007c009f362c32dfef0debc55383a19f44 | |
| parent | ac207ed2471150e06af0afc76e4becc701fa2733 (diff) | |
| download | linux-3.10-55aa914e9274cf1d55397cc04eb926eb055c79f7.tar.gz linux-3.10-55aa914e9274cf1d55397cc04eb926eb055c79f7.tar.bz2 linux-3.10-55aa914e9274cf1d55397cc04eb926eb055c79f7.zip | |
drm/ttm: remove unneeded preempt_disable/enable
It is unnecessary to disable preemption explicitly while calling
copy_highpage(). Because copy_highpage() will do it again through
kmap_atomic/kunmap_atomic.
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/ttm/ttm_tt.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c index bf8260133ea..7d759a43029 100644 --- a/drivers/gpu/drm/ttm/ttm_tt.c +++ b/drivers/gpu/drm/ttm/ttm_tt.c @@ -308,9 +308,7 @@ int ttm_tt_swapin(struct ttm_tt *ttm) if (unlikely(to_page == NULL)) goto out_err; - preempt_disable(); copy_highpage(to_page, from_page); - preempt_enable(); page_cache_release(from_page); } @@ -358,9 +356,7 @@ int ttm_tt_swapout(struct ttm_tt *ttm, struct file *persistent_swap_storage) ret = PTR_ERR(to_page); goto out_err; } - preempt_disable(); copy_highpage(to_page, from_page); - preempt_enable(); set_page_dirty(to_page); mark_page_accessed(to_page); page_cache_release(to_page); |