forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

ANDROID: fix up struct task_struct ABI change in 5.10.162

Browse source 
In commit 788d082426 ("io_uring: import 5.15-stable io_uring"), a new
field was added to struct task_struct.  Move it to the proper location
and macro in order to preserve the kernel ABI.

Bug: 161946584
Fixes: 788d082426 ("io_uring: import 5.15-stable io_uring")
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ib2f65b7c1a973794b7ab525a9304f666ffebc9ee
This commit is contained in:
Greg Kroah-Hartman 2023-01-09 15:53:12 +00:00
commit 4c961b9302
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
include/linux/sched.h
View file

@ -901,9 +901,6 @@ struct task_struct {
/* CLONE_CHILD_CLEARTID: */
int __user *clear_child_tid;
/* PF_IO_WORKER */
void *pf_io_worker;
u64 utime;
u64 stime;
#ifdef CONFIG_ARCH_HAS_SCALED_CPUTIME
@ -1379,7 +1376,9 @@ struct task_struct {
ANDROID_VENDOR_DATA_ARRAY(1, 64);
ANDROID_OEM_DATA_ARRAY(1, 32);
ANDROID_KABI_RESERVE(1);
/* PF_IO_WORKER */
ANDROID_KABI_USE(1, void *pf_io_worker);
ANDROID_KABI_RESERVE(2);
ANDROID_KABI_RESERVE(3);
ANDROID_KABI_RESERVE(4);