1 files changed, 4 insertions, 2 deletions

diff --git a/mm/swapfile.c b/mm/swapfile.c
index 8688ae65ef58..dbac1d49469d 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -2197,7 +2197,8 @@ int try_to_unuse(unsigned int type, bool frontswap,
                  */
                 if (PageSwapCache(page) &&
                     likely(page_private(page) == entry.val) &&
-                    !page_swapped(page))
+                    (!PageTransCompound(page) ||
+                     !swap_page_trans_huge_swapped(si, entry)))
                         delete_from_swap_cache(compound_head(page));
 
                 /*
@@ -2812,8 +2813,9 @@ static struct swap_info_struct *alloc_swap_info(void)
         struct swap_info_struct *p;
         unsigned int type;
         int i;
+        int size = sizeof(*p) + nr_node_ids * sizeof(struct plist_node);
 
-        p = kvzalloc(sizeof(*p), GFP_KERNEL);
+        p = kvzalloc(size, GFP_KERNEL);
         if (!p)
                 return ERR_PTR(-ENOMEM);