| Message ID | 20210914121036.3975026-4-ardb@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Move task_struct::cpu back into thread_info | expand |
On Tue, 14 Sept 2021 at 14:11, Ard Biesheuvel <ardb@kernel.org> wrote: > > 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. > > Signed-off-by: Ard Biesheuvel <ardb@kernel.org> > --- > arch/s390/include/asm/thread_info.h | 1 + > 1 file changed, 1 insertion(+) > Heiko, Christian, Vasily, Do you have any objections to this change? If you don't, could you please ack it so it can be taken through another tree (or if that is problematic for you, could you please propose another way of merging these changes?) Thanks, Ard. > diff --git a/arch/s390/include/asm/thread_info.h b/arch/s390/include/asm/thread_info.h > index e6674796aa6f..b2ffcb4fe000 100644 > --- a/arch/s390/include/asm/thread_info.h > +++ b/arch/s390/include/asm/thread_info.h > @@ -37,6 +37,7 @@ > struct thread_info { > unsigned long flags; /* low level flags */ > unsigned long syscall_work; /* SYSCALL_WORK_ flags */ > + unsigned int cpu; /* current CPU */ > }; > > /* > -- > 2.30.2 >
diff --git a/arch/s390/include/asm/thread_info.h b/arch/s390/include/asm/thread_info.h index e6674796aa6f..b2ffcb4fe000 100644 --- a/arch/s390/include/asm/thread_info.h +++ b/arch/s390/include/asm/thread_info.h @@ -37,6 +37,7 @@ struct thread_info { unsigned long flags; /* low level flags */ unsigned long syscall_work; /* SYSCALL_WORK_ flags */ + unsigned int cpu; /* current CPU */ }; /*
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. Signed-off-by: Ard Biesheuvel <ardb@kernel.org> --- arch/s390/include/asm/thread_info.h | 1 + 1 file changed, 1 insertion(+)