s390: add CPU field to struct thread_info

mainline inclusion
from mainline-v5.16-rc1
commit bd2e2632
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: NArd Biesheuvel <ardb@kernel.org>
Acked-by: NMark Rutland <mark.rutland@arm.com>
Acked-by: NHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: NGuan Jing <guanjing6@huawei.com>

Conflicts:
	arch/s390/include/asm/thread_info.h
Reviewed-by: NChen Hui <judy.chenhui@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>

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 */
 };
 
 /*