From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 33B1EC28CC1 for ; Sat, 1 Jun 2019 13:17:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0D2272569E for ; Sat, 1 Jun 2019 13:17:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559395074; bh=ozNdxPZMMldBMxTx2148v/sOELintvbGZMBdO0YDIDM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=zyIIMcjuBQ7154j5GWKmANqeHp6Uf3q97c36Dv0W7Smr/QcumxVoG3Ua7UM6MXjfE ccIvIyGCi3KLIcGMK06FpqKNq7xjY7ICATlHVNvvboJz6efwlGh7ThAE3T8Q6gYXoQ 471zhkp3cTNzS1NUf/qNgIaVbMc0GOmxUw0wsMvA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727591AbfFANRx (ORCPT ); Sat, 1 Jun 2019 09:17:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:44674 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727564AbfFANRu (ORCPT ); Sat, 1 Jun 2019 09:17:50 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6B6F72569E; Sat, 1 Jun 2019 13:17:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559395069; bh=ozNdxPZMMldBMxTx2148v/sOELintvbGZMBdO0YDIDM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IjPEdmaa5DkhPP6Ft/n3WzZ2irB/YgpdkR0LsbJUdkFf9GCkba/ySjwblc+IVaAjE 6Utdw7cEjtKDG8LZKdw1/XQ9JLhddWAFjqiyWSi8lQlZKpXokzFRRMNzA3qpEBFG02 dXsE9NY8n3FpBd0Tb6df8Tev0/5vl6F89LQ19Zz4= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Baoquan He , David Hildenbrand , Michal Hocko , Oscar Salvador , Wei Yang , Mike Rapoport , Andrew Morton , Linus Torvalds , Sasha Levin , linux-mm@kvack.org Subject: [PATCH AUTOSEL 5.1 018/186] mm/memory_hotplug.c: fix the wrong usage of N_HIGH_MEMORY Date: Sat, 1 Jun 2019 09:13:54 -0400 Message-Id: <20190601131653.24205-18-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190601131653.24205-1-sashal@kernel.org> References: <20190601131653.24205-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Baoquan He [ Upstream commit d3ba3ae19751e476b0840a0c9a673a5766fa3219 ] In node_states_check_changes_online(), N_HIGH_MEMORY is used to substitute ZONE_HIGHMEM directly. This is not right. N_HIGH_MEMORY is to mark the memory state of node. Here zone index is checked, which should be compared with 'ZONE_HIGHMEM' accordingly. Replace it with ZONE_HIGHMEM. This is a code cleanup - no known runtime effects. Link: http://lkml.kernel.org/r/20190320080732.14933-1-bhe@redhat.com Fixes: 8efe33f40f3e ("mm/memory_hotplug.c: simplify node_states_check_changes_online") Signed-off-by: Baoquan He Reviewed-by: David Hildenbrand Acked-by: Michal Hocko Reviewed-by: Oscar Salvador Cc: Wei Yang Cc: Mike Rapoport Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- mm/memory_hotplug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 28587f2901090..547e48addced1 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -700,7 +700,7 @@ static void node_states_check_changes_online(unsigned long nr_pages, if (zone_idx(zone) <= ZONE_NORMAL && !node_state(nid, N_NORMAL_MEMORY)) arg->status_change_nid_normal = nid; #ifdef CONFIG_HIGHMEM - if (zone_idx(zone) <= N_HIGH_MEMORY && !node_state(nid, N_HIGH_MEMORY)) + if (zone_idx(zone) <= ZONE_HIGHMEM && !node_state(nid, N_HIGH_MEMORY)) arg->status_change_nid_high = nid; #endif } -- 2.20.1