This is a note to let you know that I've just added the patch titled
genirq/affinity: Only build SMP-only helper functions on SMP kernels
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
genirq-affinity-only-build-smp-only-helper-functions-on-smp-kernels.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 188a569658584e93930ab60334c5a1079c0330d8 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@xxxxxxxxxx>
Date: Wed, 18 Jan 2023 12:14:01 +0100
Subject: genirq/affinity: Only build SMP-only helper functions on SMP kernels
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Ingo Molnar <mingo@xxxxxxxxxx>
commit 188a569658584e93930ab60334c5a1079c0330d8 upstream.
allnoconfig grew these new build warnings in lib/group_cpus.c:
lib/group_cpus.c:247:12: warning: ‘__group_cpus_evenly’ defined but not used [-Wunused-function]
lib/group_cpus.c:75:13: warning: ‘build_node_to_cpumask’ defined but not used [-Wunused-function]
lib/group_cpus.c:66:13: warning: ‘free_node_to_cpumask’ defined but not used [-Wunused-function]
lib/group_cpus.c:43:23: warning: ‘alloc_node_to_cpumask’ defined but not used [-Wunused-function]
Widen the #ifdef CONFIG_SMP block to not expose unused helpers on
non-SMP builds.
Also annotate the preprocessor branches for better readability.
Fixes: f7b3ea8cf72f ("genirq/affinity: Move group_cpus_evenly() into lib/")
Cc: Ming Lei <ming.lei@xxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Link: https://lore.kernel.org/r/20221227022905.352674-6-ming.lei@xxxxxxxxxx
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
lib/group_cpus.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
--- a/lib/group_cpus.c
+++ b/lib/group_cpus.c
@@ -9,6 +9,8 @@
#include <linux/sort.h>
#include <linux/group_cpus.h>
+#ifdef CONFIG_SMP
+
static void grp_spread_init_one(struct cpumask *irqmsk, struct cpumask *nmsk,
unsigned int cpus_per_grp)
{
@@ -327,7 +329,6 @@ static int __group_cpus_evenly(unsigned
return done;
}
-#ifdef CONFIG_SMP
/**
* group_cpus_evenly - Group all CPUs evenly per NUMA/CPU locality
* @numgrps: number of groups
@@ -422,7 +423,7 @@ struct cpumask *group_cpus_evenly(unsign
}
return masks;
}
-#else
+#else /* CONFIG_SMP */
struct cpumask *group_cpus_evenly(unsigned int numgrps)
{
struct cpumask *masks = kcalloc(numgrps, sizeof(*masks), GFP_KERNEL);
@@ -434,4 +435,4 @@ struct cpumask *group_cpus_evenly(unsign
cpumask_copy(&masks[0], cpu_possible_mask);
return masks;
}
-#endif
+#endif /* CONFIG_SMP */
Patches currently in stable-queue which might be from mingo@xxxxxxxxxx are
queue-6.1/genirq-affinity-only-build-smp-only-helper-functions-on-smp-kernels.patch
