[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <173054220502.3137.14229989700739302201.tip-bot2@tip-bot2>
Date: Sat, 02 Nov 2024 10:10:05 -0000
From:
tip-bot2 for Thomas Weißschuh <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: thomas.weissschuh@...utronix.de, Thomas Gleixner <tglx@...utronix.de>,
x86@...nel.org, linux-kernel@...r.kernel.org
Subject: [tip: timers/vdso] powerpc/pseries/lparcfg: Use num_possible_cpus()
for potential processors
The following commit has been merged into the timers/vdso branch of tip:
Commit-ID: fbedb416fcd6942354008ecbe9ad3a68be888839
Gitweb: https://git.kernel.org/tip/fbedb416fcd6942354008ecbe9ad3a68be888839
Author: Thomas Weißschuh <thomas.weissschuh@...utronix.de>
AuthorDate: Thu, 10 Oct 2024 09:01:26 +02:00
Committer: Thomas Gleixner <tglx@...utronix.de>
CommitterDate: Sat, 02 Nov 2024 11:05:15 +01:00
powerpc/pseries/lparcfg: Use num_possible_cpus() for potential processors
The systemcfg processorCount variable tracks currently online variables,
not possible ones, so the stored value is wrong.
The code preferably tries to use the ibm,lrdr-capacity field 4 which
"represents the maximum number of processors that the guest can have."
Switch from processorCount to the better matching num_possible_cpus().
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@...utronix.de>
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
Link: https://lore.kernel.org/all/20241010-vdso-generic-base-v1-24-b64f0842d512@linutronix.de
---
arch/powerpc/platforms/pseries/lparcfg.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/arch/powerpc/platforms/pseries/lparcfg.c b/arch/powerpc/platforms/pseries/lparcfg.c
index acc640f..cc22924 100644
--- a/arch/powerpc/platforms/pseries/lparcfg.c
+++ b/arch/powerpc/platforms/pseries/lparcfg.c
@@ -29,7 +29,6 @@
#include <asm/firmware.h>
#include <asm/rtas.h>
#include <asm/time.h>
-#include <asm/vdso_datapage.h>
#include <asm/vio.h>
#include <asm/mmu.h>
#include <asm/machdep.h>
@@ -530,7 +529,7 @@ static int pseries_lparcfg_data(struct seq_file *m, void *v)
lrdrp = of_get_property(rtas_node, "ibm,lrdr-capacity", NULL);
if (lrdrp == NULL) {
- partition_potential_processors = vdso_data->processorCount;
+ partition_potential_processors = num_possible_cpus();
} else {
partition_potential_processors = be32_to_cpup(lrdrp + 4);
}
Powered by blists - more mailing lists