From: Oscar Salvador <osalva...@suse.de>

node_states_clear has the following if statements:

if ((N_MEMORY != N_NORMAL_MEMORY) &&
    (arg->status_change_nid_high >= 0))
        ...

if ((N_MEMORY != N_HIGH_MEMORY) &&
    (arg->status_change_nid >= 0))
        ...

N_MEMORY can never be equal to neither N_NORMAL_MEMORY nor
N_HIGH_MEMORY.
This is wrong, so let us get rid of it.

Signed-off-by: Oscar Salvador <osalva...@suse.de>
---
 mm/memory_hotplug.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index 0f2cf6941224..006a7b817724 100644
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -1564,12 +1564,10 @@ static void node_states_clear_node(int node, struct 
memory_notify *arg)
        if (arg->status_change_nid_normal >= 0)
                node_clear_state(node, N_NORMAL_MEMORY);
 
-       if ((N_MEMORY != N_NORMAL_MEMORY) &&
-           (arg->status_change_nid_high >= 0))
+       if (arg->status_change_nid_high >= 0)
                node_clear_state(node, N_HIGH_MEMORY);
 
-       if ((N_MEMORY != N_HIGH_MEMORY) &&
-           (arg->status_change_nid >= 0))
+       if (arg->status_change_nid >= 0)
                node_clear_state(node, N_MEMORY);
 }
 
-- 
2.13.6

Reply via email to