mm-make-arch_has_descending_max_zone_pfns-static.patch removed from -mm tree
The quilt patch titled
Subject: mm: make arch_has_descending_max_zone_pfns() static
has been removed from the -mm tree. Its filename was
mm-make-arch_has_descending_max_zone_pfns-static.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Arnd Bergmann <[email protected]>
Subject: mm: make arch_has_descending_max_zone_pfns() static
Date: Fri, 14 Apr 2023 10:03:53 +0200
clang produces a build failure on x86 for some randconfig builds after a change that moves around code to mm/mm_init.c:
Cannot find symbol for section 2: .text.mm/mm_init.o: failed
I have not been able to figure out why this happens, but the __weak annotation on arch_has_descending_max_zone_pfns() is the trigger here.
Removing the weak function in favor of an open-coded Kconfig option check avoids the problem and becomes clearer as well as better to optimize by the compiler.
---
arch/arc/mm/init.c | 5 ----- include/linux/mm.h | 1 - mm/mm_init.c | 4 ++-- 3 files changed, 2 insertions(+), 8 deletions(-)
arch/arc/mm/init.c renamed from arch/arc/mm/init.c~mm-make-arch_has_descending_max_zone_pfns-static +0 -5
@@ -74,11 +74,6 @@ void __init early_init_dt_add_memory_arc base, TO_MB(size), !in_use ? "Not used":""); } -bool arch_has_descending_max_zone_pfns (void ) -{ -return !IS_ENABLED (CONFIG_ARC_HAS_PAE40 ); -} -/* * First memory setup routine called from setup_arch() * 1. setup swapper's mm @init_mm
include/linux/mm.h renamed from include/linux/mm.h~mm-make-arch_has_descending_max_zone_pfns-static +0 -1
@@ -3035,7 +3035,6 @@ extern void setup_per_cpu_pageset(void);extern int min_free_kbytes;extern int watermark_boost_factor;extern int watermark_scale_factor; -extern bool arch_has_descending_max_zone_pfns (void );/* nommu.c */ extern atomic_long_t mmap_pages_allocated;
mm/mm_init.c renamed from mm/mm_init.c~mm-make-arch_has_descending_max_zone_pfns-static +2 -2
@@ -1752,9 +1752,9 @@ static void __init free_area_init_memory* Some architectures, e.g. ARC may have ZONE_HIGHMEM below ZONE_NORMAL. For * such cases we allow max_zone_pfn sorted in the descending order */ -bool __weak arch_has_descending_max_zone_pfns (void ) +static bool arch_has_descending_max_zone_pfns (void ) { -return false; +return IS_ENABLED (CONFIG_ARC ) && !IS_ENABLED (CONFIG_ARC_HAS_PAE40 ); }/**
_
Patches currently in -mm which might be from [email protected] are
kasan-remove-hwasan-kernel-mem-intrinsic-prefix=1-for-clang-14.patch ocfs2-reduce-ioctl-stack-usage.patch