From: Ard Biesheuvel <ardb@kernel.org> mainline inclusion from mainline-v5.16-rc1 commit bd2e2632556a464bd07cc8e21f60738611a934af category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I4Q94A CVE: NA ----------------------------- The CPU field will be moved back into thread_info even when THREAD_INFO_IN_TASK is enabled, so add it back to s390's definition of struct thread_info. Note that s390 always has CONFIG_SMP=y so there is no point in guarding the CPU field with an #ifdef. Signed-off-by: Ard Biesheuvel <ardb@kernel.org> Acked-by: Mark Rutland <mark.rutland@arm.com> Acked-by: Heiko Carstens <hca@linux.ibm.com> Signed-off-by: Guan Jing <guanjing6@huawei.com> Conflicts: arch/s390/include/asm/thread_info.h Reviewed-by: Chen Hui <judy.chenhui@huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com> --- arch/s390/include/asm/thread_info.h | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/s390/include/asm/thread_info.h b/arch/s390/include/asm/thread_info.h index 13a04fcf7762..97983e99ec27 100644 --- a/arch/s390/include/asm/thread_info.h +++ b/arch/s390/include/asm/thread_info.h @@ -36,6 +36,7 @@ */ struct thread_info { unsigned long flags; /* low level flags */ + unsigned int cpu; /* current CPU */ }; /* -- 2.20.1