1 files changed, 14 insertions, 12 deletions

diff --git a/mm/ksm.c b/mm/ksm.c
index c059ca1c9356..0320327b8a6c 100644
--- a/mm/ksm.c
+++ b/mm/ksm.c
@@ -150,23 +150,25 @@ struct stable_node {
  * struct rmap_item - reverse mapping item for virtual addresses
  * @rmap_list: next rmap_item in mm_slot's singly-linked rmap_list
  * @anon_vma: pointer to anon_vma for this mm,address, when in stable tree
+ * @nid: NUMA node id of unstable tree in which linked (may not match page)
  * @mm: the memory structure this rmap_item is pointing into
  * @address: the virtual address this rmap_item tracks (+ flags in low bits)
  * @oldchecksum: previous checksum of the page at that virtual address
- * @nid: NUMA node id of unstable tree in which linked (may not match page)
  * @node: rb node of this rmap_item in the unstable tree
  * @head: pointer to stable_node heading this list in the stable tree
  * @hlist: link into hlist of rmap_items hanging off that stable_node
  */
 struct rmap_item {
         struct rmap_item *rmap_list;
-        struct anon_vma *anon_vma;      /* when stable */
+        union {
+                struct anon_vma *anon_vma;      /* when stable */
+#ifdef CONFIG_NUMA
+                int nid;                /* when node of unstable tree */
+#endif
+        };
         struct mm_struct *mm;
         unsigned long address;          /* + low bits used for flags below */
         unsigned int oldchecksum;       /* when unstable */
-#ifdef CONFIG_NUMA
-        int nid;
-#endif
         union {
                 struct rb_node node;    /* when node of unstable tree */
                 struct {                /* when listed from stable tree */
@@ -1094,6 +1096,9 @@ static int try_to_merge_with_ksm_page(struct rmap_item *rmap_item,
         if (err)
                 goto out;
 
+        /* Unstable nid is in union with stable anon_vma: remove first */
+        remove_rmap_item_from_tree(rmap_item);
+
         /* Must get reference to anon_vma while still holding mmap_sem */
         rmap_item->anon_vma = vma->anon_vma;
         get_anon_vma(vma->anon_vma);
@@ -1468,14 +1473,11 @@ static void cmp_and_merge_page(struct page *page, struct rmap_item *rmap_item)
                 kpage = try_to_merge_two_pages(rmap_item, page,
                                                 tree_rmap_item, tree_page);
                 put_page(tree_page);
-                /*
-                 * As soon as we merge this page, we want to remove the
-                 * rmap_item of the page we have merged with from the unstable
-                 * tree, and insert it instead as new node in the stable tree.
-                 */
                 if (kpage) {
-                        remove_rmap_item_from_tree(tree_rmap_item);
-
+                        /*
+                         * The pages were successfully merged: insert new
+                         * node in the stable tree and add both rmap_items.
+                         */
                         lock_page(kpage);
                         stable_node = stable_tree_insert(kpage);
                         if (stable_node) {