From 4301901382bf140592f6fe37c67db1729cfd5e3c Mon Sep 17 00:00:00 2001
From: Elliot Berman <quic_eberman@quicinc.com>
Date: Tue, 26 Sep 2023 08:46:33 -0700
Subject: [PATCH] ANDROID: Update STG for ANDROID_KABI_USE(1, unsigned int
 saved_state)

Update STG for commit f5c2fe80d11f ("BACKPORT: FROMGIT: sched/core:
Remove ifdeffery for saved_state").

type 'struct task_struct' changed
  member 'union { unsigned int saved_state; struct { u64 android_kabi_reserved1; }; union { }; }' was added
  member 'u64 android_kabi_reserved1' was removed

Bug: 292064955
Change-Id: If3796ed8a5f7fb2be569c15b4f7c054ee786bc18
Signed-off-by: Elliot Berman <quic_eberman@quicinc.com>
---
 android/abi_gki_aarch64.stg | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/android/abi_gki_aarch64.stg b/android/abi_gki_aarch64.stg
index 8565da52be9f..dfb6d70cfbc4 100644
--- a/android/abi_gki_aarch64.stg
+++ b/android/abi_gki_aarch64.stg
@@ -38852,6 +38852,11 @@ member {
   type_id: 0x4f10779f
   offset: 192
 }
+member {
+  id: 0x3024ec51
+  type_id: 0x4fbdc803
+  offset: 28800
+}
 member {
   id: 0x302f914f
   type_id: 0x4f903dda
@@ -45949,12 +45954,6 @@ member {
   type_id: 0x92233392
   offset: 704
 }
-member {
-  id: 0x2d081767
-  name: "android_kabi_reserved1"
-  type_id: 0x92233392
-  offset: 28800
-}
 member {
   id: 0x2d0817b6
   name: "android_kabi_reserved1"
@@ -169956,6 +169955,11 @@ member {
   type_id: 0x92233392
   offset: 64
 }
+member {
+  id: 0x653b6170
+  name: "saved_state"
+  type_id: 0x4585663f
+}
 member {
   id: 0x72f4c281
   name: "saved_syn"
@@ -211891,6 +211895,16 @@ struct_union {
     member_id: 0xca60e328
   }
 }
+struct_union {
+  id: 0x4fbdc803
+  kind: UNION
+  definition {
+    bytesize: 8
+    member_id: 0x653b6170
+    member_id: 0x27000c61
+    member_id: 0x36752b74
+  }
+}
 struct_union {
   id: 0x4fd8e877
   kind: UNION
@@ -257161,7 +257175,7 @@ struct_union {
     member_id: 0xedf50137
     member_id: 0xd666cd53
     member_id: 0x9a3ad7bf
-    member_id: 0x2d081767
+    member_id: 0x3024ec51
     member_id: 0x63760531
     member_id: 0xac894e97
     member_id: 0xe0f63fac