From d7156e9445d44216a1299bcc2bcbe3c41eccac0e Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@google.com>
Date: Thu, 12 Oct 2023 20:47:53 +0000
Subject: [PATCH] ANDROID: GKI: update .stg due to internal zswap and tracing
 changes

There are a number of internal-to-the-kernel changes in the recent set
of LTS releases that end up bleeding over into the public .stg file, yet
they are really anonymous pointers when it comes to external modules.
Update the .stg file with these changes as the tooling is being extra
careful, but these are not actual ABI changes so this is safe.

Full details are:

INFO: ABI DIFFERENCES HAVE BEEN DETECTED!
INFO: type 'struct trace_buffer' changed
  member 'atomic_t resizing' was added

type 'struct zs_pool' changed
  member 'spinlock_t lock' was added
  member 'atomic_t compaction_in_progress' was added
  member 'rwlock_t migrate_lock' was removed

type 'struct size_class' changed
  byte size changed from 136 to 128
  member 'spinlock_t lock' was removed
  6 members ('struct list_head fullness_list[4]' .. 'struct zs_size_stat stats') changed
    offset changed by -64

Bug: 161946584
Change-Id: Ib5bb4a55ef5463ed49f7cd2c90bf73e278fd51e4
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
---
 android/abi_gki_aarch64.stg | 82 +++++++++++++++++++++----------------
 1 file changed, 47 insertions(+), 35 deletions(-)

diff --git a/android/abi_gki_aarch64.stg b/android/abi_gki_aarch64.stg
index c22a52854e13..1907773740a3 100644
--- a/android/abi_gki_aarch64.stg
+++ b/android/abi_gki_aarch64.stg
@@ -62522,6 +62522,12 @@ member {
   type_id: 0x6720d32f
   offset: 11712
 }
+member {
+  id: 0x9ad71760
+  name: "compaction_in_progress"
+  type_id: 0x74d29cf1
+  offset: 17568
+}
 member {
   id: 0x583d51cc
   name: "companion_ports"
@@ -91948,10 +91954,9 @@ member {
   offset: 712
 }
 member {
-  id: 0xf667d80f
+  id: 0xf667dcee
   name: "fullness_list"
   type_id: 0xb8bf135c
-  offset: 64
 }
 member {
   id: 0xfeb50ea0
@@ -103779,12 +103784,6 @@ member {
   type_id: 0x4585663f
   offset: 320
 }
-member {
-  id: 0xad7c8a98
-  name: "index"
-  type_id: 0x4585663f
-  offset: 672
-}
 member {
   id: 0xad7c8ba4
   name: "index"
@@ -103797,6 +103796,12 @@ member {
   type_id: 0x4585663f
   offset: 480
 }
+member {
+  id: 0xad7c8d2b
+  name: "index"
+  type_id: 0x4585663f
+  offset: 608
+}
 member {
   id: 0xad7c8d72
   name: "index"
@@ -115578,6 +115583,12 @@ member {
   type_id: 0xf313e71a
   offset: 768
 }
+member {
+  id: 0x2d1fe43b
+  name: "lock"
+  type_id: 0xf313e71a
+  offset: 17536
+}
 member {
   id: 0x2d1fe44c
   name: "lock"
@@ -123438,12 +123449,6 @@ member {
   type_id: 0x2c8b0a9f
   offset: 768
 }
-member {
-  id: 0xdb33fcdf
-  name: "migrate_lock"
-  type_id: 0xf4933b90
-  offset: 17536
-}
 member {
   id: 0x8edaa968
   name: "migrate_page"
@@ -136400,10 +136405,10 @@ member {
   type_id: 0xad7c0a89
 }
 member {
-  id: 0x7a226550
+  id: 0x7a226b7d
   name: "objs_per_zspage"
   type_id: 0x6720d32f
-  offset: 608
+  offset: 544
 }
 member {
   id: 0x33953b25
@@ -141342,10 +141347,10 @@ member {
   bitsize: 1
 }
 member {
-  id: 0x338646f2
+  id: 0x338649f9
   name: "pages_per_zspage"
   type_id: 0x6720d32f
-  offset: 640
+  offset: 576
 }
 member {
   id: 0xf9521fd2
@@ -162158,6 +162163,12 @@ member {
   type_id: 0x03913382
   offset: 64
 }
+member {
+  id: 0x9a2ccf59
+  name: "resizing"
+  type_id: 0x74d29cf1
+  offset: 96
+}
 member {
   id: 0x7f319b20
   name: "resolution"
@@ -173982,18 +173993,18 @@ member {
   type_id: 0x6720d32f
   offset: 96
 }
-member {
-  id: 0xd91935d3
-  name: "size"
-  type_id: 0x6720d32f
-  offset: 576
-}
 member {
   id: 0xd9193607
   name: "size"
   type_id: 0x6720d32f
   offset: 896
 }
+member {
+  id: 0xd91937b9
+  name: "size"
+  type_id: 0x6720d32f
+  offset: 512
+}
 member {
   id: 0xd9193b66
   name: "size"
@@ -179931,10 +179942,10 @@ member {
   offset: 896
 }
 member {
-  id: 0xb91e0d04
+  id: 0xb91e0940
   name: "stats"
   type_id: 0x6b61371d
-  offset: 704
+  offset: 640
 }
 member {
   id: 0xb920e0d3
@@ -249070,14 +249081,13 @@ struct_union {
   kind: STRUCT
   name: "size_class"
   definition {
-    bytesize: 136
-    member_id: 0x2d1fec85
-    member_id: 0xf667d80f
-    member_id: 0xd91935d3
-    member_id: 0x7a226550
-    member_id: 0x338646f2
-    member_id: 0xad7c8a98
-    member_id: 0xb91e0d04
+    bytesize: 128
+    member_id: 0xf667dcee
+    member_id: 0xd91937b9
+    member_id: 0x7a226b7d
+    member_id: 0x338649f9
+    member_id: 0xad7c8d2b
+    member_id: 0xb91e0940
   }
 }
 struct_union {
@@ -255002,6 +255012,7 @@ struct_union {
     member_id: 0x2d2d0138
     member_id: 0xe7102ce7
     member_id: 0x9fc7d460
+    member_id: 0x9a2ccf59
     member_id: 0x3dac837e
     member_id: 0xaa1570ba
     member_id: 0xad8983a9
@@ -265101,7 +265112,8 @@ struct_union {
     member_id: 0xb9089225
     member_id: 0x868caa9e
     member_id: 0x8a67a9e5
-    member_id: 0xdb33fcdf
+    member_id: 0x2d1fe43b
+    member_id: 0x9ad71760
   }
 }
 struct_union {