Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4E9B6C433F5 for ; Thu, 11 Nov 2021 02:44:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3C8F061108 for ; Thu, 11 Nov 2021 02:44:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234133AbhKKCqx (ORCPT ); Wed, 10 Nov 2021 21:46:53 -0500 Received: from mail.kernel.org ([198.145.29.99]:51996 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234032AbhKKCqx (ORCPT ); Wed, 10 Nov 2021 21:46:53 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8C8226103C; Thu, 11 Nov 2021 02:44:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1636598644; bh=2ztBNuG8th6nTGNrYwkKR9XlP6s0K/M84qLqRlP+S4s=; h=Date:From:To:Subject:From; b=Ist4nz/dY7eSwPZYd97X91ufrkhYzR0wAjpgaWKqePhwkyEIfIxuUPKiDWPTHbkeJ tlN6KZdH2uWP9N1r3/sQinOd+bEvIVTEn0VzKTg0/P2R3khcPiehM2bYLGIbLMX7vT TzqHsfuIX1UTH7/WdadsvPJzDbSLxdWJCUkXopLw= Date: Wed, 10 Nov 2021 18:44:04 -0800 From: akpm@linux-foundation.org To: dalias@libc.org, geert+renesas@glider.be, gonsolo@gmail.com, juri.lelli@redhat.com, matt@codeblueprint.co.uk, mgorman@suse.de, mingo@redhat.com, mm-commits@vger.kernel.org, peterz@infradead.org, vbabka@suse.cz, vincent.guittot@linaro.org, ysato@users.osdn.me Subject: [merged] mm-move-node_reclaim_distance-to-fix-numa-without-smp.patch removed from -mm tree Message-ID: <20211111024404.ohHaIY6Aj%akpm@linux-foundation.org> User-Agent: s-nail v14.8.16 Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The patch titled Subject: mm: move node_reclaim_distance to fix NUMA without SMP has been removed from the -mm tree. Its filename was mm-move-node_reclaim_distance-to-fix-numa-without-smp.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Geert Uytterhoeven Subject: mm: move node_reclaim_distance to fix NUMA without SMP Patch series "Fix NUMA without SMP". SuperH is the only architecture which still supports NUMA without SMP, for good reasons (various memories scattered around the address space, each with varying latencies). This series fixes two build errors due to variables and functions used by the NUMA code being provided by SMP-only source files or sections. This patch (of 2): If CONFIG_NUMA=y, but CONFIG_SMP=n (e.g. sh/migor_defconfig): sh4-linux-gnu-ld: mm/page_alloc.o: in function `get_page_from_freelist': page_alloc.c:(.text+0x2c24): undefined reference to `node_reclaim_distance' Fix this by moving the declaration of node_reclaim_distance from an SMP-only to a generic file. Link: https://lkml.kernel.org/r/cover.1631781495.git.geert+renesas@glider.be Link: https://lkml.kernel.org/r/6432666a648dde85635341e6c918cee97c97d264.1631781495.git.geert+renesas@glider.be Fixes: a55c7454a8c887b2 ("sched/topology: Improve load balancing on AMD EPYC systems") Signed-off-by: Geert Uytterhoeven Suggested-by: Matt Fleming Acked-by: Mel Gorman Cc: Peter Zijlstra Cc: Ingo Molnar Cc: Juri Lelli Cc: Vincent Guittot Cc: Vlastimil Babka Cc: Yoshinori Sato Cc: Rich Felker Cc: Gon Solo Cc: Geert Uytterhoeven Signed-off-by: Andrew Morton --- kernel/sched/topology.c | 1 - mm/page_alloc.c | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) --- a/kernel/sched/topology.c~mm-move-node_reclaim_distance-to-fix-numa-without-smp +++ a/kernel/sched/topology.c @@ -1481,7 +1481,6 @@ static int sched_domains_curr_level; int sched_max_numa_distance; static int *sched_domains_numa_distance; static struct cpumask ***sched_domains_numa_masks; -int __read_mostly node_reclaim_distance = RECLAIM_DISTANCE; static unsigned long __read_mostly *sched_numa_onlined_nodes; #endif --- a/mm/page_alloc.c~mm-move-node_reclaim_distance-to-fix-numa-without-smp +++ a/mm/page_alloc.c @@ -3960,6 +3960,8 @@ bool zone_watermark_ok_safe(struct zone } #ifdef CONFIG_NUMA +int __read_mostly node_reclaim_distance = RECLAIM_DISTANCE; + static bool zone_allows_reclaim(struct zone *local_zone, struct zone *zone) { return node_distance(zone_to_nid(local_zone), zone_to_nid(zone)) <= _ Patches currently in -mm which might be from geert+renesas@glider.be are