From f2844fae7fb53c175fa19fff7bfb4845b5fd2e52 Mon Sep 17 00:00:00 2001
From: Will McVicker <willmcvicker@google.com>
Date: Thu, 30 Mar 2023 09:51:18 -0700
Subject: [PATCH] ANDROID: Fix the KMI

The CRC for shmem_file_setup changed after
https://r.android.com/c/2512924/5 rebased on commit due to the bi-weekly
KMI update happening in tandem.

The KMI changes include:

function symbol 'struct file* shmem_file_setup(const char*,
loff_t, unsigned long)' changed
  CRC changed from 0x5979e157 to 0xe9ef458b

Also, abi_gki_protected_exports_aarch64 needed an update due to
the hashtag 'kmi-changes-for-2023-03-29'.

Bug: 273448633
Change-Id: Ie174f036ddfbac12e454bbaf927c4a15cf9020f0
Signed-off-by: Will McVicker <willmcvicker@google.com>
---
 android/abi_gki_aarch64.stg               | 6 +++---
 android/abi_gki_protected_exports_aarch64 | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/android/abi_gki_aarch64.stg b/android/abi_gki_aarch64.stg
index 4d9f738eeef1..469a7796c2cd 100644
--- a/android/abi_gki_aarch64.stg
+++ b/android/abi_gki_aarch64.stg
@@ -1,4 +1,4 @@
-root_id: 0x25a8b173
+root_id: 0x84ea5130
 void {
   id: 0x48b5725f
 }
@@ -354789,7 +354789,7 @@ elf_symbol {
   name: "shmem_file_setup"
   is_defined: true
   symbol_type: FUNCTION
-  crc: 0x5979e157
+  crc: 0xe9ef458b
   type_id: 0x4e848709
   full_name: "shmem_file_setup"
 }
@@ -364671,7 +364671,7 @@ elf_symbol {
   full_name: "zs_unmap_object"
 }
 symbols {
-  id: 0x25a8b173
+  id: 0x84ea5130
   symbol {
     key: "I_BDEV"
     value: 0x2dddbe52
diff --git a/android/abi_gki_protected_exports_aarch64 b/android/abi_gki_protected_exports_aarch64
index 0cfdef38622b..cc1bef8b6c0f 100644
--- a/android/abi_gki_protected_exports_aarch64
+++ b/android/abi_gki_protected_exports_aarch64
@@ -175,6 +175,7 @@ cfg80211_tx_mlme_mgmt
 cfg80211_unlink_bss
 cfg80211_unregister_wdev
 cfg80211_update_owe_info_event
+cfg80211_valid_disable_subchannel_bitmap
 cfg80211_vendor_cmd_get_sender
 cfg80211_vendor_cmd_reply
 close_candev