These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / gpu / drm / ttm / ttm_tt.c

diff --git a/kernel/drivers/gpu/drm/ttm/ttm_tt.c b/kernel/drivers/gpu/drm/ttm/ttm_tt.c
index bf080ab..4e19d0f 100644 (file)
--- a/kernel/drivers/gpu/drm/ttm/ttm_tt.c
+++ b/kernel/drivers/gpu/drm/ttm/ttm_tt.c
@@ -340,7 +340,7 @@ int ttm_tt_swapout(struct ttm_tt *ttm, struct file *persistent_swap_storage)
                swap_storage = shmem_file_setup("ttm swap",
                                                ttm->num_pages << PAGE_SHIFT,
                                                0);
-               if (unlikely(IS_ERR(swap_storage))) {
+               if (IS_ERR(swap_storage)) {
                        pr_err("Failed allocating swap storage\n");
                        return PTR_ERR(swap_storage);
                }
@@ -354,7 +354,7 @@ int ttm_tt_swapout(struct ttm_tt *ttm, struct file *persistent_swap_storage)
                if (unlikely(from_page == NULL))
                        continue;
                to_page = shmem_read_mapping_page(swap_space, i);
-               if (unlikely(IS_ERR(to_page))) {
+               if (IS_ERR(to_page)) {
                        ret = PTR_ERR(to_page);
                        goto out_err;
                }