mm-numa_memblks-make-several-functions-and-variables-static.patch removed from -mm tree
The quilt patch titled
Subject: mm: numa_memblks: make several functions and variables static
has been removed from the -mm tree. Its filename was
mm-numa_memblks-make-several-functions-and-variables-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: "Mike Rapoport (Microsoft)" <[email protected]>
Subject: mm: numa_memblks: make several functions and variables static
Date: Wed, 7 Aug 2024 09:41:05 +0300
Make functions and variables that are exclusively used by numa_memblks static.
Move numa_nodemask_from_meminfo() before its callers to avoid forward declaration.
---
include/linux/numa_memblks.h | 8 ------- mm/numa_memblks.c | 36 ++++++++++++++++----------------- 2 files changed, 18 insertions(+), 26 deletions(-)
include/linux/numa_memblks.h renamed from include/linux/numa_memblks.h~mm-numa_memblks-make-several-functions-and-variables-static +0 -8
@@ -7,7 +7,6 @@#define NR_NODE_MEMBLKS (MAX_NUMNODES * 2) -extern int numa_distance_cnt;void __init numa_set_distance (int from,int to,int distance);void __init numa_reset_distance (void );
@@ -22,17 +21,10 @@ struct numa_meminfo {struct numa_memblk blk[NR_NODE_MEMBLKS ]; }; -extern struct numa_meminfo numa_meminfo __initdata_or_meminfo; -extern struct numa_meminfo numa_reserved_meminfo __initdata_or_meminfo; -int __init numa_add_memblk (int nodeid,u64 start,u64 end);void __init numa_remove_memblk_from (int idx,struct numa_meminfo *mi);int __init numa_cleanup_meminfo (struct numa_meminfo *mi); -int __init numa_register_meminfo (struct numa_meminfo *mi); - -void __init numa_nodemask_from_meminfo (nodemask_t *nodemask, -const struct numa_meminfo *mi);int __init numa_memblks_init (int (*init_func)(void ),bool memblock_force_top_down);
mm/numa_memblks.c renamed from mm/numa_memblks.c~mm-numa_memblks-make-several-functions-and-variables-static +18 -18
@@ -7,13 +7,27 @@#include <linux/numa.h> #include <linux/numa_memblks.h> -int numa_distance_cnt; +static int numa_distance_cnt;static u8 *numa_distance;nodemask_t numa_nodes_parsed__initdata ; -struct numa_meminfo numa_meminfo __initdata_or_meminfo; -struct numa_meminfo numa_reserved_meminfo __initdata_or_meminfo; +static struct numa_meminfo numa_meminfo __initdata_or_meminfo; +static struct numa_meminfo numa_reserved_meminfo __initdata_or_meminfo; + +/* +* Set nodes, which have memory in @mi, in *@nodemask. +*/ +static void __init numa_nodemask_from_meminfo (nodemask_t *nodemask, +const struct numa_meminfo *mi) +{ +int i; + +for (i =0 ; i <ARRAY_SIZE (mi->blk); i++) +if (mi->blk[i].start != mi->blk[i].end && + mi->blk[i].nid !=NUMA_NO_NODE ) +node_set (mi->blk[i].nid, *nodemask); +}/** * numa_reset_distance - Reset NUMA distance table
@@ -291,20 +305,6 @@ int __init numa_cleanup_meminfo(struct n }/* -* Set nodes, which have memory in @mi, in *@nodemask. -*/ -void __init numa_nodemask_from_meminfo (nodemask_t *nodemask, -const struct numa_meminfo *mi) -{ -int i; - -for (i =0 ; i <ARRAY_SIZE (mi->blk); i++) -if (mi->blk[i].start != mi->blk[i].end && - mi->blk[i].nid !=NUMA_NO_NODE ) -node_set (mi->blk[i].nid, *nodemask); -} - -/* * Mark all currently memblock-reserved physical memory (which covers the * kernel's own memory ranges) as hot-unswappable. */
@@ -371,7 +371,7 @@ static void __init numa_clear_kernel_nod } } -int __init numa_register_meminfo (struct numa_meminfo *mi) +static int __init numa_register_meminfo (struct numa_meminfo *mi) {int i;
_
Patches currently in -mm which might be from [email protected] are