Merge tag 'amd-drm-fixes-5.9-2020-08-20' of git://people.freedesktop.org/~agd5f/linux...

[linux-2.6-microblaze.git] / mm / shmem.c

diff --git a/mm/shmem.c b/mm/shmem.c
index eb6b36d..271548c 100644 (file)
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -1434,7 +1434,8 @@ static int shmem_writepage(struct page *page, struct writeback_control *wbc)
                list_add(&info->swaplist, &shmem_swaplist);
 
        if (add_to_swap_cache(page, swap,
-                       __GFP_HIGH | __GFP_NOMEMALLOC | __GFP_NOWARN) == 0) {
+                       __GFP_HIGH | __GFP_NOMEMALLOC | __GFP_NOWARN,
+                       NULL) == 0) {
                spin_lock_irq(&info->lock);
                shmem_recalc_inode(inode);
                info->swapped++;
@@ -1685,7 +1686,7 @@ static int shmem_replace_page(struct page **pagep, gfp_t gfp,
  * Swap in the page pointed to by *pagep.
  * Caller has to make sure that *pagep contains a valid swapped page.
  * Returns 0 and the page in pagep if success. On failure, returns the
- * the error code and NULL in *pagep.
+ * error code and NULL in *pagep.
  */
 static int shmem_swapin_page(struct inode *inode, pgoff_t index,
                             struct page **pagep, enum sgp_type sgp,