Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[mirror_ubuntu-bionic-kernel.git] / mm / ksm.c

diff --git a/mm/ksm.c b/mm/ksm.c
index 01830839d6e1c393fad015d05f8c666052b0b39f..b5cd647daa524935f73ae99f6e42743771768eaa 100644 (file)
--- a/mm/ksm.c
+++ b/mm/ksm.c
@@ -475,7 +475,8 @@ static struct page *get_mergeable_page(struct rmap_item *rmap_item)
                flush_dcache_page(page);
        } else {
                put_page(page);
-out:           page = NULL;
+out:
+               page = NULL;
        }
        up_read(&mm->mmap_sem);
        return page;
@@ -1358,7 +1359,7 @@ struct rmap_item *unstable_tree_search_insert(struct rmap_item *rmap_item,
                cond_resched();
                tree_rmap_item = rb_entry(*new, struct rmap_item, node);
                tree_page = get_mergeable_page(tree_rmap_item);
-               if (IS_ERR_OR_NULL(tree_page))
+               if (!tree_page)
                        return NULL;
 
                /*