From 0c2020b73286abefee4fed0684fd7508688acac0 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@google.com>
Date: Mon, 13 Mar 2023 18:36:32 +0000
Subject: [PATCH] ANDROID: update abi definition due to io_uring changes.

Commit f09fb7ff2ab2 ("io_uring: Replace 0-length array with flexible
array") changed the struct io_uring_buf_ring to be safer when being
compiled by userspace code (it is in a uapi header file.)  In order to
do this properly, an "empty" structure was added to the structure so
that tools continue to work properly.  This updates the abi definitions
with those changes, as the tools rightfully catch that the signature
changed, yet there is no actualy functional or ABI change noticable by
any code.

function symbol 'bool hid_ignore(struct hid_device*)' changed
  CRC changed from 0x6472f954 to 0x60a463f6

type 'struct io_uring_buf_ring' changed
  member changed from 'union { struct { __u64 resv1; __u32 resv2; __u16 resv3; __u16 tail; }; struct io_uring_buf bufs[0]; }' to 'union { struct { __u64 resv1; __u32 resv2; __u16 resv3; __u16 tail; }; struct { struct { } __empty_bufs; struct io_uring_buf bufs[0]; }; }'
    type changed from 'union { struct { __u64 resv1; __u32 resv2; __u16 resv3; __u16 tail; }; struct io_uring_buf bufs[0]; }' to 'union { struct { __u64 resv1; __u32 resv2; __u16 resv3; __u16 tail; }; struct { struct { } __empty_bufs; struct io_uring_buf bufs[0]; }; }'
      member 'struct { struct { } __empty_bufs; struct io_uring_buf bufs[0]; }' was added
      member 'struct io_uring_buf bufs[0]' was removed

Fixes: f09fb7ff2ab2 ("io_uring: Replace 0-length array with flexible array")
Change-Id: I03723a9f86bd12ac738625e11b3f54ff9f3026f0
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
---
 android/abi_gki_aarch64.stg | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/android/abi_gki_aarch64.stg b/android/abi_gki_aarch64.stg
index e888b25982de..ba6d2115f9cc 100644
--- a/android/abi_gki_aarch64.stg
+++ b/android/abi_gki_aarch64.stg
@@ -36597,6 +36597,10 @@ member {
   id: 0x25ab4212
   type_id: 0x1983785b
 }
+member {
+  id: 0x2612b435
+  type_id: 0x1764a0c5
+}
 member {
   id: 0x2629d9f4
   type_id: 0x178917c0
@@ -37383,8 +37387,8 @@ member {
   offset: 96
 }
 member {
-  id: 0x34b145e5
-  type_id: 0x5deb6786
+  id: 0x34be27ed
+  type_id: 0x5dd6efa4
 }
 member {
   id: 0x34c421be
@@ -38795,6 +38799,11 @@ member {
   name: "__empty_array"
   type_id: 0x186c44db
 }
+member {
+  id: 0x3cf3a247
+  name: "__empty_bufs"
+  type_id: 0x186c44db
+}
 member {
   id: 0x2cf33eb6
   name: "__empty_data"
@@ -200464,6 +200473,14 @@ struct_union {
     member_id: 0x2df9c4da
   }
 }
+struct_union {
+  id: 0x1764a0c5
+  kind: STRUCT
+  definition {
+    member_id: 0x3cf3a247
+    member_id: 0xd0323df9
+  }
+}
 struct_union {
   id: 0x178917c0
   kind: STRUCT
@@ -204150,12 +204167,12 @@ struct_union {
   }
 }
 struct_union {
-  id: 0x5deb6786
+  id: 0x5dd6efa4
   kind: UNION
   definition {
     bytesize: 16
     member_id: 0x2c96db22
-    member_id: 0xd0323df9
+    member_id: 0x2612b435
   }
 }
 struct_union {
@@ -226261,7 +226278,7 @@ struct_union {
   name: "io_uring_buf_ring"
   definition {
     bytesize: 16
-    member_id: 0x34b145e5
+    member_id: 0x34be27ed
   }
 }
 struct_union {
@@ -333814,7 +333831,7 @@ elf_symbol {
   name: "hid_ignore"
   is_defined: true
   symbol_type: FUNCTION
-  crc: 0x6472f954
+  crc: 0x60a463f6
   type_id: 0xfddd6aa8
   full_name: "hid_ignore"
 }