1 files changed, 4 insertions, 3 deletions

diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index df9d554bea30..9c12ae5e3695 100644
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -217,6 +217,10 @@ int online_pages(unsigned long pfn, unsigned long nr_pages)
         zone->zone_pgdat->node_present_pages += onlined_pages;
 
         setup_per_zone_pages_min();
+        if (onlined_pages) {
+                kswapd_run(zone_to_nid(zone));
+                node_set_state(zone_to_nid(zone), N_HIGH_MEMORY);
+        }
 
         if (need_zonelists_rebuild)
                 build_all_zonelists();
@@ -271,9 +275,6 @@ int add_memory(int nid, u64 start, u64 size)
                 if (!pgdat)
                         return -ENOMEM;
                 new_pgdat = 1;
-                ret = kswapd_run(nid);
-                if (ret)
-                        goto error;
         }
 
         /* call arch's memory hotadd */