2 files changed, 2 insertions, 10 deletions

diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index c8f3b63fcacd..c7092bc3c01e 100644
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -291,13 +291,7 @@ static int __memory_block_change_state(struct memory_block *mem,
                 mem->state = MEM_GOING_OFFLINE;
 
         ret = memory_block_action(mem->start_section_nr, to_state, online_type);
-        if (ret) {
-                mem->state = from_state_req;
-        } else {
-                mem->state = to_state;
-                if (to_state == MEM_ONLINE)
-                        mem->last_online = online_type;
-        }
+        mem->state = ret ? from_state_req : to_state;
         return ret;
 }
 
@@ -310,7 +304,7 @@ static int memory_subsys_online(struct device *dev)
 
         ret = mem->state == MEM_ONLINE ? 0 :
                 __memory_block_change_state(mem, MEM_ONLINE, MEM_OFFLINE,
-                                            mem->last_online);
+                                            ONLINE_KEEP);
 
         mutex_unlock(&mem->state_mutex);
         return ret;
@@ -618,7 +612,6 @@ static int init_memory_block(struct memory_block **memory,
                         base_memory_block_id(scn_nr) * sections_per_block;
         mem->end_section_nr = mem->start_section_nr + sections_per_block - 1;
         mem->state = state;
-        mem->last_online = ONLINE_KEEP;
         mem->section_count++;
         mutex_init(&mem->state_mutex);
         start_pfn = section_nr_to_pfn(mem->start_section_nr);
diff --git a/include/linux/memory.h b/include/linux/memory.h
index 3d5346583022..85c31a8e2904 100644
--- a/include/linux/memory.h
+++ b/include/linux/memory.h
@@ -26,7 +26,6 @@ struct memory_block {
         unsigned long start_section_nr;
         unsigned long end_section_nr;
         unsigned long state;
-        int last_online;
         int section_count;
 
         /*