From 2f29ec11e3f79f3929653c895e1de7655681df5b Mon Sep 17 00:00:00 2001
From: "Sivasri Kumar, Vanka" <quic_svanka@quicinc.com>
Date: Thu, 10 Nov 2022 00:03:05 +0530
Subject: [PATCH] ANDROID: abi_gki_aarch64_qcom: Add wait_on_page_bit

In commit fae05b2314b1 ("zsmalloc: fix races between asynchronous
zspage free and page migration"), wait_on_page_bit symbol was required
to fix the build of that target platform.

Functions changes summary: 0 Removed, 0 Changed , 1 Added functions
Variables changes summary: 0 Removed, 0 Changed , 0 Added variables

1 Added function:

  [A] 'function void wait_on_page_bit(page*, int)'

Bug: 258412729

Change-Id: Ic392d6789788e1e2a46f95726fb0a0cce05896e1
Signed-off-by: Sivasri Kumar, Vanka <quic_svanka@quicinc.com>
Signed-off-by: Bibek Kumar Patro <quic_bibekkum@quicinc.com>
---
 android/abi_gki_aarch64.xml  | 6 +++---
 android/abi_gki_aarch64_qcom | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml
index 47faef88fd20..1b91e08e38ce 100644
--- a/android/abi_gki_aarch64.xml
+++ b/android/abi_gki_aarch64.xml
@@ -148306,9 +148306,9 @@
         <parameter type-id='7359adad' name='offset' filepath='mm/util.c' line='556' column='1'/>
         <return type-id='7359adad'/>
       </function-decl>
-      <function-decl name='vm_munmap' mangled-name='vm_munmap' filepath='mm/mmap.c' line='3043' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='vm_munmap'>
-        <parameter type-id='7359adad' name='start' filepath='mm/mmap.c' line='3043' column='1'/>
-        <parameter type-id='b59d7dce' name='len' filepath='mm/mmap.c' line='3043' column='1'/>
+      <function-decl name='vm_munmap' mangled-name='vm_munmap' filepath='mm/mmap.c' line='3060' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='vm_munmap'>
+        <parameter type-id='7359adad' name='start' filepath='mm/mmap.c' line='3060' column='1'/>
+        <parameter type-id='b59d7dce' name='len' filepath='mm/mmap.c' line='3060' column='1'/>
         <return type-id='95e97e5e'/>
       </function-decl>
       <var-decl name='vm_node_stat' type-id='9dc2293d' mangled-name='vm_node_stat' visibility='default' filepath='mm/vmstat.c' line='165' column='1' elf-symbol-id='vm_node_stat'/>
diff --git a/android/abi_gki_aarch64_qcom b/android/abi_gki_aarch64_qcom
index 07b19dc38641..f3e65159f870 100644
--- a/android/abi_gki_aarch64_qcom
+++ b/android/abi_gki_aarch64_qcom
@@ -2583,7 +2583,6 @@
   __traceiter_android_vh_jiffies_update
   __traceiter_android_vh_logbuf
   __traceiter_android_vh_logbuf_pr_cont
-  __tracepoint_android_vh_madvise_cold_or_pageout
   __traceiter_android_vh_printk_hotplug
   __traceiter_android_vh_rproc_recovery
   __traceiter_android_vh_rproc_recovery_set
@@ -2705,6 +2704,7 @@
   __tracepoint_android_vh_jiffies_update
   __tracepoint_android_vh_logbuf
   __tracepoint_android_vh_logbuf_pr_cont
+  __tracepoint_android_vh_madvise_cold_or_pageout
   __tracepoint_android_vh_oom_check_panic
   __tracepoint_android_vh_printk_hotplug
   __tracepoint_android_vh_process_killed
@@ -3028,6 +3028,7 @@
   wait_for_completion_interruptible_timeout
   wait_for_completion_killable
   wait_for_completion_timeout
+  wait_on_page_bit
   __wait_rcu_gp
   wait_woken
   __wake_up