| From e18533eb5c35d9665f07d257d3d6a061cd7a7765 Mon Sep 17 00:00:00 2001 |
| From: Alexander Gordeev <agordeev@linux.ibm.com> |
| Date: Mon, 16 Mar 2020 12:39:55 +0100 |
| Subject: [PATCH] s390/cpuinfo: fix wrong output when CPU0 is offline |
| |
| commit 872f27103874a73783aeff2aac2b41a489f67d7c upstream. |
| |
| /proc/cpuinfo should not print information about CPU 0 when it is offline. |
| |
| Fixes: 281eaa8cb67c ("s390/cpuinfo: simplify locking and skip offline cpus early") |
| Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com> |
| Reviewed-by: Heiko Carstens <heiko.carstens@de.ibm.com> |
| [heiko.carstens@de.ibm.com: shortened commit message] |
| Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> |
| Signed-off-by: Vasily Gorbik <gor@linux.ibm.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/arch/s390/kernel/processor.c b/arch/s390/kernel/processor.c |
| index 5de13307b703..28b6cddc7d07 100644 |
| --- a/arch/s390/kernel/processor.c |
| +++ b/arch/s390/kernel/processor.c |
| @@ -158,8 +158,9 @@ static void show_cpu_mhz(struct seq_file *m, unsigned long n) |
| static int show_cpuinfo(struct seq_file *m, void *v) |
| { |
| unsigned long n = (unsigned long) v - 1; |
| + unsigned long first = cpumask_first(cpu_online_mask); |
| |
| - if (!n) |
| + if (n == first) |
| show_cpu_summary(m, v); |
| if (!machine_has_cpu_mhz) |
| return 0; |
| @@ -172,6 +173,8 @@ static inline void *c_update(loff_t *pos) |
| { |
| if (*pos) |
| *pos = cpumask_next(*pos - 1, cpu_online_mask); |
| + else |
| + *pos = cpumask_first(cpu_online_mask); |
| return *pos < nr_cpu_ids ? (void *)*pos + 1 : NULL; |
| } |
| |
| -- |
| 2.7.4 |
| |
