aboutsummaryrefslogtreecommitdiffstats
diff options
-rw-r--r--queue-5.10/arm64-cpuinfo-only-show-one-cpu-s-info-in-c_show.patch168
-rw-r--r--queue-5.10/series1
-rw-r--r--queue-5.15/arm64-cpuinfo-only-show-one-cpu-s-info-in-c_show.patch168
-rw-r--r--queue-5.15/series1
-rw-r--r--queue-6.15/arm64-cpuinfo-only-show-one-cpu-s-info-in-c_show.patch166
-rw-r--r--queue-6.15/series1
6 files changed, 0 insertions, 505 deletions
diff --git a/queue-5.10/arm64-cpuinfo-only-show-one-cpu-s-info-in-c_show.patch b/queue-5.10/arm64-cpuinfo-only-show-one-cpu-s-info-in-c_show.patch
deleted file mode 100644
index 1a239bd7aa7..00000000000
--- a/queue-5.10/arm64-cpuinfo-only-show-one-cpu-s-info-in-c_show.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-From 85281cdf2e567542c4a04d930e8af9b2bfd246af Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 21 Apr 2025 14:29:47 +0800
-Subject: arm64/cpuinfo: only show one cpu's info in c_show()
-
-From: Ye Bin <yebin10@huawei.com>
-
-[ Upstream commit 7bb797757bf5720543f1c5115b40a8d646d5c1cc ]
-
-Currently, when ARM64 displays CPU information, every call to c_show()
-assembles all CPU information. However, as the number of CPUs increases,
-this can lead to insufficient buffer space due to excessive assembly in
-a single call, causing repeated expansion and multiple calls to c_show().
-
-To prevent this invalid c_show() call, only one CPU's information is
-assembled each time c_show() is called.
-
-Signed-off-by: Ye Bin <yebin10@huawei.com>
-Link: https://lore.kernel.org/r/20250421062947.4072855-1-yebin@huaweicloud.com
-Signed-off-by: Will Deacon <will@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/kernel/cpuinfo.c | 111 ++++++++++++++++++------------------
- 1 file changed, 55 insertions(+), 56 deletions(-)
-
-diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c
-index 4c0e72781f31b..81323ca443f59 100644
---- a/arch/arm64/kernel/cpuinfo.c
-+++ b/arch/arm64/kernel/cpuinfo.c
-@@ -138,80 +138,79 @@ static const char *const compat_hwcap2_str[] = {
-
- static int c_show(struct seq_file *m, void *v)
- {
-- int i, j;
-+ int j;
-+ int cpu = m->index;
- bool compat = personality(current->personality) == PER_LINUX32;
-+ struct cpuinfo_arm64 *cpuinfo = v;
-+ u32 midr = cpuinfo->reg_midr;
-
-- for_each_online_cpu(i) {
-- struct cpuinfo_arm64 *cpuinfo = &per_cpu(cpu_data, i);
-- u32 midr = cpuinfo->reg_midr;
--
-- /*
-- * glibc reads /proc/cpuinfo to determine the number of
-- * online processors, looking for lines beginning with
-- * "processor". Give glibc what it expects.
-- */
-- seq_printf(m, "processor\t: %d\n", i);
-- if (compat)
-- seq_printf(m, "model name\t: ARMv8 Processor rev %d (%s)\n",
-- MIDR_REVISION(midr), COMPAT_ELF_PLATFORM);
--
-- seq_printf(m, "BogoMIPS\t: %lu.%02lu\n",
-- loops_per_jiffy / (500000UL/HZ),
-- loops_per_jiffy / (5000UL/HZ) % 100);
--
-- /*
-- * Dump out the common processor features in a single line.
-- * Userspace should read the hwcaps with getauxval(AT_HWCAP)
-- * rather than attempting to parse this, but there's a body of
-- * software which does already (at least for 32-bit).
-- */
-- seq_puts(m, "Features\t:");
-- if (compat) {
-+ /*
-+ * glibc reads /proc/cpuinfo to determine the number of
-+ * online processors, looking for lines beginning with
-+ * "processor". Give glibc what it expects.
-+ */
-+ seq_printf(m, "processor\t: %d\n", cpu);
-+ if (compat)
-+ seq_printf(m, "model name\t: ARMv8 Processor rev %d (%s)\n",
-+ MIDR_REVISION(midr), COMPAT_ELF_PLATFORM);
-+
-+ seq_printf(m, "BogoMIPS\t: %lu.%02lu\n",
-+ loops_per_jiffy / (500000UL/HZ),
-+ loops_per_jiffy / (5000UL/HZ) % 100);
-+
-+ /*
-+ * Dump out the common processor features in a single line.
-+ * Userspace should read the hwcaps with getauxval(AT_HWCAP)
-+ * rather than attempting to parse this, but there's a body of
-+ * software which does already (at least for 32-bit).
-+ */
-+ seq_puts(m, "Features\t:");
-+ if (compat) {
- #ifdef CONFIG_COMPAT
-- for (j = 0; j < ARRAY_SIZE(compat_hwcap_str); j++) {
-- if (compat_elf_hwcap & (1 << j)) {
-- /*
-- * Warn once if any feature should not
-- * have been present on arm64 platform.
-- */
-- if (WARN_ON_ONCE(!compat_hwcap_str[j]))
-- continue;
--
-- seq_printf(m, " %s", compat_hwcap_str[j]);
-- }
-+ for (j = 0; j < ARRAY_SIZE(compat_hwcap_str); j++) {
-+ if (compat_elf_hwcap & (1 << j)) {
-+ /*
-+ * Warn once if any feature should not
-+ * have been present on arm64 platform.
-+ */
-+ if (WARN_ON_ONCE(!compat_hwcap_str[j]))
-+ continue;
-+
-+ seq_printf(m, " %s", compat_hwcap_str[j]);
- }
-+ }
-
-- for (j = 0; j < ARRAY_SIZE(compat_hwcap2_str); j++)
-- if (compat_elf_hwcap2 & (1 << j))
-- seq_printf(m, " %s", compat_hwcap2_str[j]);
-+ for (j = 0; j < ARRAY_SIZE(compat_hwcap2_str); j++)
-+ if (compat_elf_hwcap2 & (1 << j))
-+ seq_printf(m, " %s", compat_hwcap2_str[j]);
- #endif /* CONFIG_COMPAT */
-- } else {
-- for (j = 0; j < ARRAY_SIZE(hwcap_str); j++)
-- if (cpu_have_feature(j))
-- seq_printf(m, " %s", hwcap_str[j]);
-- }
-- seq_puts(m, "\n");
--
-- seq_printf(m, "CPU implementer\t: 0x%02x\n",
-- MIDR_IMPLEMENTOR(midr));
-- seq_printf(m, "CPU architecture: 8\n");
-- seq_printf(m, "CPU variant\t: 0x%x\n", MIDR_VARIANT(midr));
-- seq_printf(m, "CPU part\t: 0x%03x\n", MIDR_PARTNUM(midr));
-- seq_printf(m, "CPU revision\t: %d\n\n", MIDR_REVISION(midr));
-+ } else {
-+ for (j = 0; j < ARRAY_SIZE(hwcap_str); j++)
-+ if (cpu_have_feature(j))
-+ seq_printf(m, " %s", hwcap_str[j]);
- }
-+ seq_puts(m, "\n");
-+
-+ seq_printf(m, "CPU implementer\t: 0x%02x\n",
-+ MIDR_IMPLEMENTOR(midr));
-+ seq_puts(m, "CPU architecture: 8\n");
-+ seq_printf(m, "CPU variant\t: 0x%x\n", MIDR_VARIANT(midr));
-+ seq_printf(m, "CPU part\t: 0x%03x\n", MIDR_PARTNUM(midr));
-+ seq_printf(m, "CPU revision\t: %d\n\n", MIDR_REVISION(midr));
-
- return 0;
- }
-
- static void *c_start(struct seq_file *m, loff_t *pos)
- {
-- return *pos < 1 ? (void *)1 : NULL;
-+ *pos = cpumask_next(*pos - 1, cpu_online_mask);
-+ return *pos < nr_cpu_ids ? &per_cpu(cpu_data, *pos) : NULL;
- }
-
- static void *c_next(struct seq_file *m, void *v, loff_t *pos)
- {
- ++*pos;
-- return NULL;
-+ return c_start(m, pos);
- }
-
- static void c_stop(struct seq_file *m, void *v)
---
-2.39.5
-
diff --git a/queue-5.10/series b/queue-5.10/series
index eb575a5d316..04bb42f3924 100644
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -223,7 +223,6 @@ drm-amdgpu-gfx6-fix-csib-handling.patch
sunrpc-update-nextcheck-time-when-adding-new-cache-e.patch
drm-bridge-analogix_dp-add-irq-flag-irqf_no_autoen-i.patch
exfat-fix-double-free-in-delayed_free.patch
-arm64-cpuinfo-only-show-one-cpu-s-info-in-c_show.patch
drm-msm-hdmi-add-runtime-pm-calls-to-ddc-transfer-fu.patch
media-uapi-v4l-fix-v4l2_type_is_output-condition.patch
drm-amd-display-add-null-pointer-checks-in-dm_force_.patch
diff --git a/queue-5.15/arm64-cpuinfo-only-show-one-cpu-s-info-in-c_show.patch b/queue-5.15/arm64-cpuinfo-only-show-one-cpu-s-info-in-c_show.patch
deleted file mode 100644
index d4713f5e799..00000000000
--- a/queue-5.15/arm64-cpuinfo-only-show-one-cpu-s-info-in-c_show.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-From e9b2851f4a4a64e7d5903f968fdd4aea124615c9 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 21 Apr 2025 14:29:47 +0800
-Subject: arm64/cpuinfo: only show one cpu's info in c_show()
-
-From: Ye Bin <yebin10@huawei.com>
-
-[ Upstream commit 7bb797757bf5720543f1c5115b40a8d646d5c1cc ]
-
-Currently, when ARM64 displays CPU information, every call to c_show()
-assembles all CPU information. However, as the number of CPUs increases,
-this can lead to insufficient buffer space due to excessive assembly in
-a single call, causing repeated expansion and multiple calls to c_show().
-
-To prevent this invalid c_show() call, only one CPU's information is
-assembled each time c_show() is called.
-
-Signed-off-by: Ye Bin <yebin10@huawei.com>
-Link: https://lore.kernel.org/r/20250421062947.4072855-1-yebin@huaweicloud.com
-Signed-off-by: Will Deacon <will@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/kernel/cpuinfo.c | 111 ++++++++++++++++++------------------
- 1 file changed, 55 insertions(+), 56 deletions(-)
-
-diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c
-index 591c18a889a56..bed260961d606 100644
---- a/arch/arm64/kernel/cpuinfo.c
-+++ b/arch/arm64/kernel/cpuinfo.c
-@@ -138,80 +138,79 @@ static const char *const compat_hwcap2_str[] = {
-
- static int c_show(struct seq_file *m, void *v)
- {
-- int i, j;
-+ int j;
-+ int cpu = m->index;
- bool compat = personality(current->personality) == PER_LINUX32;
-+ struct cpuinfo_arm64 *cpuinfo = v;
-+ u32 midr = cpuinfo->reg_midr;
-
-- for_each_online_cpu(i) {
-- struct cpuinfo_arm64 *cpuinfo = &per_cpu(cpu_data, i);
-- u32 midr = cpuinfo->reg_midr;
--
-- /*
-- * glibc reads /proc/cpuinfo to determine the number of
-- * online processors, looking for lines beginning with
-- * "processor". Give glibc what it expects.
-- */
-- seq_printf(m, "processor\t: %d\n", i);
-- if (compat)
-- seq_printf(m, "model name\t: ARMv8 Processor rev %d (%s)\n",
-- MIDR_REVISION(midr), COMPAT_ELF_PLATFORM);
--
-- seq_printf(m, "BogoMIPS\t: %lu.%02lu\n",
-- loops_per_jiffy / (500000UL/HZ),
-- loops_per_jiffy / (5000UL/HZ) % 100);
--
-- /*
-- * Dump out the common processor features in a single line.
-- * Userspace should read the hwcaps with getauxval(AT_HWCAP)
-- * rather than attempting to parse this, but there's a body of
-- * software which does already (at least for 32-bit).
-- */
-- seq_puts(m, "Features\t:");
-- if (compat) {
-+ /*
-+ * glibc reads /proc/cpuinfo to determine the number of
-+ * online processors, looking for lines beginning with
-+ * "processor". Give glibc what it expects.
-+ */
-+ seq_printf(m, "processor\t: %d\n", cpu);
-+ if (compat)
-+ seq_printf(m, "model name\t: ARMv8 Processor rev %d (%s)\n",
-+ MIDR_REVISION(midr), COMPAT_ELF_PLATFORM);
-+
-+ seq_printf(m, "BogoMIPS\t: %lu.%02lu\n",
-+ loops_per_jiffy / (500000UL/HZ),
-+ loops_per_jiffy / (5000UL/HZ) % 100);
-+
-+ /*
-+ * Dump out the common processor features in a single line.
-+ * Userspace should read the hwcaps with getauxval(AT_HWCAP)
-+ * rather than attempting to parse this, but there's a body of
-+ * software which does already (at least for 32-bit).
-+ */
-+ seq_puts(m, "Features\t:");
-+ if (compat) {
- #ifdef CONFIG_COMPAT
-- for (j = 0; j < ARRAY_SIZE(compat_hwcap_str); j++) {
-- if (compat_elf_hwcap & (1 << j)) {
-- /*
-- * Warn once if any feature should not
-- * have been present on arm64 platform.
-- */
-- if (WARN_ON_ONCE(!compat_hwcap_str[j]))
-- continue;
--
-- seq_printf(m, " %s", compat_hwcap_str[j]);
-- }
-+ for (j = 0; j < ARRAY_SIZE(compat_hwcap_str); j++) {
-+ if (compat_elf_hwcap & (1 << j)) {
-+ /*
-+ * Warn once if any feature should not
-+ * have been present on arm64 platform.
-+ */
-+ if (WARN_ON_ONCE(!compat_hwcap_str[j]))
-+ continue;
-+
-+ seq_printf(m, " %s", compat_hwcap_str[j]);
- }
-+ }
-
-- for (j = 0; j < ARRAY_SIZE(compat_hwcap2_str); j++)
-- if (compat_elf_hwcap2 & (1 << j))
-- seq_printf(m, " %s", compat_hwcap2_str[j]);
-+ for (j = 0; j < ARRAY_SIZE(compat_hwcap2_str); j++)
-+ if (compat_elf_hwcap2 & (1 << j))
-+ seq_printf(m, " %s", compat_hwcap2_str[j]);
- #endif /* CONFIG_COMPAT */
-- } else {
-- for (j = 0; j < ARRAY_SIZE(hwcap_str); j++)
-- if (cpu_have_feature(j))
-- seq_printf(m, " %s", hwcap_str[j]);
-- }
-- seq_puts(m, "\n");
--
-- seq_printf(m, "CPU implementer\t: 0x%02x\n",
-- MIDR_IMPLEMENTOR(midr));
-- seq_printf(m, "CPU architecture: 8\n");
-- seq_printf(m, "CPU variant\t: 0x%x\n", MIDR_VARIANT(midr));
-- seq_printf(m, "CPU part\t: 0x%03x\n", MIDR_PARTNUM(midr));
-- seq_printf(m, "CPU revision\t: %d\n\n", MIDR_REVISION(midr));
-+ } else {
-+ for (j = 0; j < ARRAY_SIZE(hwcap_str); j++)
-+ if (cpu_have_feature(j))
-+ seq_printf(m, " %s", hwcap_str[j]);
- }
-+ seq_puts(m, "\n");
-+
-+ seq_printf(m, "CPU implementer\t: 0x%02x\n",
-+ MIDR_IMPLEMENTOR(midr));
-+ seq_puts(m, "CPU architecture: 8\n");
-+ seq_printf(m, "CPU variant\t: 0x%x\n", MIDR_VARIANT(midr));
-+ seq_printf(m, "CPU part\t: 0x%03x\n", MIDR_PARTNUM(midr));
-+ seq_printf(m, "CPU revision\t: %d\n\n", MIDR_REVISION(midr));
-
- return 0;
- }
-
- static void *c_start(struct seq_file *m, loff_t *pos)
- {
-- return *pos < 1 ? (void *)1 : NULL;
-+ *pos = cpumask_next(*pos - 1, cpu_online_mask);
-+ return *pos < nr_cpu_ids ? &per_cpu(cpu_data, *pos) : NULL;
- }
-
- static void *c_next(struct seq_file *m, void *v, loff_t *pos)
- {
- ++*pos;
-- return NULL;
-+ return c_start(m, pos);
- }
-
- static void c_stop(struct seq_file *m, void *v)
---
-2.39.5
-
diff --git a/queue-5.15/series b/queue-5.15/series
index e25ec77f874..ba4d5ace9da 100644
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -273,7 +273,6 @@ drm-amdgpu-gfx6-fix-csib-handling.patch
sunrpc-update-nextcheck-time-when-adding-new-cache-e.patch
drm-bridge-analogix_dp-add-irq-flag-irqf_no_autoen-i.patch
exfat-fix-double-free-in-delayed_free.patch
-arm64-cpuinfo-only-show-one-cpu-s-info-in-c_show.patch
drm-bridge-anx7625-change-the-gpiod_set_value-api.patch
media-i2c-imx334-enable-runtime-pm-before-sub-device.patch
drm-msm-hdmi-add-runtime-pm-calls-to-ddc-transfer-fu.patch
diff --git a/queue-6.15/arm64-cpuinfo-only-show-one-cpu-s-info-in-c_show.patch b/queue-6.15/arm64-cpuinfo-only-show-one-cpu-s-info-in-c_show.patch
deleted file mode 100644
index b9e2f3edbc9..00000000000
--- a/queue-6.15/arm64-cpuinfo-only-show-one-cpu-s-info-in-c_show.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-From 35779b793ca3675d56d0d659997b99b57803f5a0 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 21 Apr 2025 14:29:47 +0800
-Subject: arm64/cpuinfo: only show one cpu's info in c_show()
-
-From: Ye Bin <yebin10@huawei.com>
-
-[ Upstream commit 7bb797757bf5720543f1c5115b40a8d646d5c1cc ]
-
-Currently, when ARM64 displays CPU information, every call to c_show()
-assembles all CPU information. However, as the number of CPUs increases,
-this can lead to insufficient buffer space due to excessive assembly in
-a single call, causing repeated expansion and multiple calls to c_show().
-
-To prevent this invalid c_show() call, only one CPU's information is
-assembled each time c_show() is called.
-
-Signed-off-by: Ye Bin <yebin10@huawei.com>
-Link: https://lore.kernel.org/r/20250421062947.4072855-1-yebin@huaweicloud.com
-Signed-off-by: Will Deacon <will@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/kernel/cpuinfo.c | 107 ++++++++++++++++++------------------
- 1 file changed, 53 insertions(+), 54 deletions(-)
-
-diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c
-index 285d7d5383420..750864d0165bd 100644
---- a/arch/arm64/kernel/cpuinfo.c
-+++ b/arch/arm64/kernel/cpuinfo.c
-@@ -209,80 +209,79 @@ static const char *const compat_hwcap2_str[] = {
-
- static int c_show(struct seq_file *m, void *v)
- {
-- int i, j;
-+ int j;
-+ int cpu = m->index;
- bool compat = personality(current->personality) == PER_LINUX32;
-+ struct cpuinfo_arm64 *cpuinfo = v;
-+ u32 midr = cpuinfo->reg_midr;
-
-- for_each_online_cpu(i) {
-- struct cpuinfo_arm64 *cpuinfo = &per_cpu(cpu_data, i);
-- u32 midr = cpuinfo->reg_midr;
--
-- /*
-- * glibc reads /proc/cpuinfo to determine the number of
-- * online processors, looking for lines beginning with
-- * "processor". Give glibc what it expects.
-- */
-- seq_printf(m, "processor\t: %d\n", i);
-- if (compat)
-- seq_printf(m, "model name\t: ARMv8 Processor rev %d (%s)\n",
-- MIDR_REVISION(midr), COMPAT_ELF_PLATFORM);
-+ /*
-+ * glibc reads /proc/cpuinfo to determine the number of
-+ * online processors, looking for lines beginning with
-+ * "processor". Give glibc what it expects.
-+ */
-+ seq_printf(m, "processor\t: %d\n", cpu);
-+ if (compat)
-+ seq_printf(m, "model name\t: ARMv8 Processor rev %d (%s)\n",
-+ MIDR_REVISION(midr), COMPAT_ELF_PLATFORM);
-
-- seq_printf(m, "BogoMIPS\t: %lu.%02lu\n",
-- loops_per_jiffy / (500000UL/HZ),
-- loops_per_jiffy / (5000UL/HZ) % 100);
-+ seq_printf(m, "BogoMIPS\t: %lu.%02lu\n",
-+ loops_per_jiffy / (500000UL/HZ),
-+ loops_per_jiffy / (5000UL/HZ) % 100);
-
-- /*
-- * Dump out the common processor features in a single line.
-- * Userspace should read the hwcaps with getauxval(AT_HWCAP)
-- * rather than attempting to parse this, but there's a body of
-- * software which does already (at least for 32-bit).
-- */
-- seq_puts(m, "Features\t:");
-- if (compat) {
-+ /*
-+ * Dump out the common processor features in a single line.
-+ * Userspace should read the hwcaps with getauxval(AT_HWCAP)
-+ * rather than attempting to parse this, but there's a body of
-+ * software which does already (at least for 32-bit).
-+ */
-+ seq_puts(m, "Features\t:");
-+ if (compat) {
- #ifdef CONFIG_COMPAT
-- for (j = 0; j < ARRAY_SIZE(compat_hwcap_str); j++) {
-- if (compat_elf_hwcap & (1 << j)) {
-- /*
-- * Warn once if any feature should not
-- * have been present on arm64 platform.
-- */
-- if (WARN_ON_ONCE(!compat_hwcap_str[j]))
-- continue;
--
-- seq_printf(m, " %s", compat_hwcap_str[j]);
-- }
-+ for (j = 0; j < ARRAY_SIZE(compat_hwcap_str); j++) {
-+ if (compat_elf_hwcap & (1 << j)) {
-+ /*
-+ * Warn once if any feature should not
-+ * have been present on arm64 platform.
-+ */
-+ if (WARN_ON_ONCE(!compat_hwcap_str[j]))
-+ continue;
-+
-+ seq_printf(m, " %s", compat_hwcap_str[j]);
- }
-+ }
-
-- for (j = 0; j < ARRAY_SIZE(compat_hwcap2_str); j++)
-- if (compat_elf_hwcap2 & (1 << j))
-- seq_printf(m, " %s", compat_hwcap2_str[j]);
-+ for (j = 0; j < ARRAY_SIZE(compat_hwcap2_str); j++)
-+ if (compat_elf_hwcap2 & (1 << j))
-+ seq_printf(m, " %s", compat_hwcap2_str[j]);
- #endif /* CONFIG_COMPAT */
-- } else {
-- for (j = 0; j < ARRAY_SIZE(hwcap_str); j++)
-- if (cpu_have_feature(j))
-- seq_printf(m, " %s", hwcap_str[j]);
-- }
-- seq_puts(m, "\n");
--
-- seq_printf(m, "CPU implementer\t: 0x%02x\n",
-- MIDR_IMPLEMENTOR(midr));
-- seq_printf(m, "CPU architecture: 8\n");
-- seq_printf(m, "CPU variant\t: 0x%x\n", MIDR_VARIANT(midr));
-- seq_printf(m, "CPU part\t: 0x%03x\n", MIDR_PARTNUM(midr));
-- seq_printf(m, "CPU revision\t: %d\n\n", MIDR_REVISION(midr));
-+ } else {
-+ for (j = 0; j < ARRAY_SIZE(hwcap_str); j++)
-+ if (cpu_have_feature(j))
-+ seq_printf(m, " %s", hwcap_str[j]);
- }
-+ seq_puts(m, "\n");
-+
-+ seq_printf(m, "CPU implementer\t: 0x%02x\n",
-+ MIDR_IMPLEMENTOR(midr));
-+ seq_puts(m, "CPU architecture: 8\n");
-+ seq_printf(m, "CPU variant\t: 0x%x\n", MIDR_VARIANT(midr));
-+ seq_printf(m, "CPU part\t: 0x%03x\n", MIDR_PARTNUM(midr));
-+ seq_printf(m, "CPU revision\t: %d\n\n", MIDR_REVISION(midr));
-
- return 0;
- }
-
- static void *c_start(struct seq_file *m, loff_t *pos)
- {
-- return *pos < 1 ? (void *)1 : NULL;
-+ *pos = cpumask_next(*pos - 1, cpu_online_mask);
-+ return *pos < nr_cpu_ids ? &per_cpu(cpu_data, *pos) : NULL;
- }
-
- static void *c_next(struct seq_file *m, void *v, loff_t *pos)
- {
- ++*pos;
-- return NULL;
-+ return c_start(m, pos);
- }
-
- static void c_stop(struct seq_file *m, void *v)
---
-2.39.5
-
diff --git a/queue-6.15/series b/queue-6.15/series
index 8f8ad5e1d05..4df46f31690 100644
--- a/queue-6.15/series
+++ b/queue-6.15/series
@@ -246,7 +246,6 @@ workqueue-fix-race-condition-in-wq-stats-incrementat.patch
drm-panel-sharp-ls043t1le01-use-_multi-variants.patch
exfat-fix-double-free-in-delayed_free.patch
drm-bridge-anx7625-enable-hpd-interrupts.patch
-arm64-cpuinfo-only-show-one-cpu-s-info-in-c_show.patch
drm-panthor-don-t-update-mmu_int_mask-in-panthor_mmu.patch
drm-bridge-anx7625-change-the-gpiod_set_value-api.patch
exfat-do-not-clear-volume-dirty-flag-during-sync.patch