1 files changed, 5 insertions, 10 deletions

diff --git a/mm/ksm.c b/mm/ksm.c
index ab2ba9ad3c59..85bfd4c16346 100644
--- a/mm/ksm.c
+++ b/mm/ksm.c
@@ -320,10 +320,9 @@ static inline void free_mm_slot(struct mm_slot *mm_slot)
 
 static struct mm_slot *get_mm_slot(struct mm_struct *mm)
 {
-        struct hlist_node *node;
         struct mm_slot *slot;
 
-        hash_for_each_possible(mm_slots_hash, slot, node, link, (unsigned long)mm)
+        hash_for_each_possible(mm_slots_hash, slot, link, (unsigned long)mm)
                 if (slot->mm == mm)
                         return slot;
 
@@ -496,9 +495,8 @@ static inline int get_kpfn_nid(unsigned long kpfn)
 static void remove_node_from_stable_tree(struct stable_node *stable_node)
 {
         struct rmap_item *rmap_item;
-        struct hlist_node *hlist;
 
-        hlist_for_each_entry(rmap_item, hlist, &stable_node->hlist, hlist) {
+        hlist_for_each_entry(rmap_item, &stable_node->hlist, hlist) {
                 if (rmap_item->hlist.next)
                         ksm_pages_sharing--;
                 else
@@ -1898,7 +1896,6 @@ int page_referenced_ksm(struct page *page, struct mem_cgroup *memcg,
 {
         struct stable_node *stable_node;
         struct rmap_item *rmap_item;
-        struct hlist_node *hlist;
         unsigned int mapcount = page_mapcount(page);
         int referenced = 0;
         int search_new_forks = 0;
@@ -1910,7 +1907,7 @@ int page_referenced_ksm(struct page *page, struct mem_cgroup *memcg,
         if (!stable_node)
                 return 0;
 again:
-        hlist_for_each_entry(rmap_item, hlist, &stable_node->hlist, hlist) {
+        hlist_for_each_entry(rmap_item, &stable_node->hlist, hlist) {
                 struct anon_vma *anon_vma = rmap_item->anon_vma;
                 struct anon_vma_chain *vmac;
                 struct vm_area_struct *vma;
@@ -1952,7 +1949,6 @@ out:
 int try_to_unmap_ksm(struct page *page, enum ttu_flags flags)
 {
         struct stable_node *stable_node;
-        struct hlist_node *hlist;
         struct rmap_item *rmap_item;
         int ret = SWAP_AGAIN;
         int search_new_forks = 0;
@@ -1964,7 +1960,7 @@ int try_to_unmap_ksm(struct page *page, enum ttu_flags flags)
         if (!stable_node)
                 return SWAP_FAIL;
 again:
-        hlist_for_each_entry(rmap_item, hlist, &stable_node->hlist, hlist) {
+        hlist_for_each_entry(rmap_item, &stable_node->hlist, hlist) {
                 struct anon_vma *anon_vma = rmap_item->anon_vma;
                 struct anon_vma_chain *vmac;
                 struct vm_area_struct *vma;
@@ -2005,7 +2001,6 @@ int rmap_walk_ksm(struct page *page, int (*rmap_one)(struct page *,
                   struct vm_area_struct *, unsigned long, void *), void *arg)
 {
         struct stable_node *stable_node;
-        struct hlist_node *hlist;
         struct rmap_item *rmap_item;
         int ret = SWAP_AGAIN;
         int search_new_forks = 0;
@@ -2017,7 +2012,7 @@ int rmap_walk_ksm(struct page *page, int (*rmap_one)(struct page *,
         if (!stable_node)
                 return ret;
 again:
-        hlist_for_each_entry(rmap_item, hlist, &stable_node->hlist, hlist) {
+        hlist_for_each_entry(rmap_item, &stable_node->hlist, hlist) {
                 struct anon_vma *anon_vma = rmap_item->anon_vma;
                 struct anon_vma_chain *vmac;
                 struct vm_area_struct *vma;