From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: [merged] vmscan-use-n_memory-instead-n_high_memory.patch removed from -mm tree Date: Fri, 14 Dec 2012 15:28:44 -0800 Message-ID: <20121214232844.C1CCC100047@wpzn3.hot.corp.google.com> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from mail-gh0-f202.google.com ([209.85.160.202]:49876 "EHLO mail-gh0-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932567Ab2LNX2p (ORCPT ); Fri, 14 Dec 2012 18:28:45 -0500 Received: by mail-gh0-f202.google.com with SMTP id z10so409468ghb.1 for ; Fri, 14 Dec 2012 15:28:45 -0800 (PST) Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: laijs@cn.fujitsu.com, cl@linux.com, dhillf@gmail.com, linfeng@cn.fujitsu.com, rientjes@google.com, wency@cn.fujitsu.com, mm-commits@vger.kernel.org The patch titled Subject: vmscan: use N_MEMORY instead N_HIGH_MEMORY has been removed from the -mm tree. Its filename was vmscan-use-n_memory-instead-n_high_memory.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Lai Jiangshan Subject: vmscan: use N_MEMORY instead N_HIGH_MEMORY N_HIGH_MEMORY stands for the nodes that has normal or high memory. N_MEMORY stands for the nodes that has any memory. The code here need to handle with the nodes which have memory, we should use N_MEMORY instead. Signed-off-by: Lai Jiangshan Acked-by: Hillf Danton Signed-off-by: Wen Congyang Cc: Christoph Lameter Cc: Hillf Danton Cc: Lin Feng Cc: David Rientjes Signed-off-by: Andrew Morton --- mm/vmscan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN mm/vmscan.c~vmscan-use-n_memory-instead-n_high_memory mm/vmscan.c --- a/mm/vmscan.c~vmscan-use-n_memory-instead-n_high_memory +++ a/mm/vmscan.c @@ -3131,7 +3131,7 @@ static int __devinit cpu_callback(struct int nid; if (action == CPU_ONLINE || action == CPU_ONLINE_FROZEN) { - for_each_node_state(nid, N_HIGH_MEMORY) { + for_each_node_state(nid, N_MEMORY) { pg_data_t *pgdat = NODE_DATA(nid); const struct cpumask *mask; @@ -3187,7 +3187,7 @@ static int __init kswapd_init(void) int nid; swap_setup(); - for_each_node_state(nid, N_HIGH_MEMORY) + for_each_node_state(nid, N_MEMORY) kswapd_run(nid); hotcpu_notifier(cpu_callback, 0); return 0; _ Patches currently in -mm which might be from laijs@cn.fujitsu.com are origin.patch linux-next.patch