shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 20:07:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

ANDROID: fix up struct task_struct ABI change in 5.10.162

Browse Source 
In commit 76050cdc5c ("UPSTREAM: 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.

Because of this preservation, the .xml file also is updated:

type 'struct task_struct' changed
  member 'union { void* pf_io_worker; struct { u64 android_kabi_reserved1; }; union { }; }' was added
  member 'u64 android_kabi_reserved1' was removed

Bug: 161946584
Bug: 268174392
Fixes: 76050cdc5c ("UPSTREAM: 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
parent 302ed29f66
commit bb12156ef5
2 changed files with 622 additions and 670 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1285
android/abi_gki_aarch64.xml
View File

File diff suppressed because it is too large Load Diff

7
include/linux/sched.h
View File

@@ -905,9 +905,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
@@ -1383,7 +1380,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);