From 9b465a062d7e923a54433e81c251e6d15f97f8c3 Mon Sep 17 00:00:00 2001 From: Matthias Maennich Date: Thu, 1 Apr 2021 14:23:46 +0100 Subject: [PATCH 1/6] ANDROID: Add OWNERS files referring to the respective android-mainline OWNERS This was generated with $ build/synchronize_owners common-mainline/ android-mainline common11-5.4/ Bug: 184248201 Signed-off-by: Matthias Maennich Change-Id: I5e56eb34fcbb5a2a013dd03bc9dcc4f159fb90de --- Documentation/filesystems/OWNERS | 2 ++ OWNERS | 2 ++ arch/arm/OWNERS | 2 ++ arch/arm64/OWNERS | 2 ++ arch/x86/OWNERS | 2 ++ block/OWNERS | 2 ++ crypto/OWNERS | 2 ++ drivers/OWNERS | 2 ++ fs/OWNERS | 2 ++ fs/f2fs/OWNERS | 2 ++ fs/incfs/OWNERS | 2 ++ include/OWNERS | 2 ++ include/linux/OWNERS | 2 ++ include/trace/events/OWNERS | 2 ++ include/uapi/linux/OWNERS | 2 ++ kernel/sched/OWNERS | 2 ++ mm/OWNERS | 2 ++ net/OWNERS | 2 ++ tools/testing/selftests/filesystems/incfs/OWNERS | 2 ++ 19 files changed, 38 insertions(+) create mode 100644 Documentation/filesystems/OWNERS create mode 100644 OWNERS create mode 100644 arch/arm/OWNERS create mode 100644 arch/arm64/OWNERS create mode 100644 arch/x86/OWNERS create mode 100644 block/OWNERS create mode 100644 crypto/OWNERS create mode 100644 drivers/OWNERS create mode 100644 fs/OWNERS create mode 100644 fs/f2fs/OWNERS create mode 100644 fs/incfs/OWNERS create mode 100644 include/OWNERS create mode 100644 include/linux/OWNERS create mode 100644 include/trace/events/OWNERS create mode 100644 include/uapi/linux/OWNERS create mode 100644 kernel/sched/OWNERS create mode 100644 mm/OWNERS create mode 100644 net/OWNERS create mode 100644 tools/testing/selftests/filesystems/incfs/OWNERS diff --git a/Documentation/filesystems/OWNERS b/Documentation/filesystems/OWNERS new file mode 100644 index 000000000000..5b6ec532f1e2 --- /dev/null +++ b/Documentation/filesystems/OWNERS @@ -0,0 +1,2 @@ +# include OWNERS from the authoritative android-mainline branch +include kernel/common:android-mainline:/Documentation/filesystems/OWNERS diff --git a/OWNERS b/OWNERS new file mode 100644 index 000000000000..2b5ccceaf513 --- /dev/null +++ b/OWNERS @@ -0,0 +1,2 @@ +# include OWNERS from the authoritative android-mainline branch +include kernel/common:android-mainline:/OWNERS diff --git a/arch/arm/OWNERS b/arch/arm/OWNERS new file mode 100644 index 000000000000..1e390c75956e --- /dev/null +++ b/arch/arm/OWNERS @@ -0,0 +1,2 @@ +# include OWNERS from the authoritative android-mainline branch +include kernel/common:android-mainline:/arch/arm/OWNERS diff --git a/arch/arm64/OWNERS b/arch/arm64/OWNERS new file mode 100644 index 000000000000..257f4cf26809 --- /dev/null +++ b/arch/arm64/OWNERS @@ -0,0 +1,2 @@ +# include OWNERS from the authoritative android-mainline branch +include kernel/common:android-mainline:/arch/arm64/OWNERS diff --git a/arch/x86/OWNERS b/arch/x86/OWNERS new file mode 100644 index 000000000000..ae2c29f6c3b7 --- /dev/null +++ b/arch/x86/OWNERS @@ -0,0 +1,2 @@ +# include OWNERS from the authoritative android-mainline branch +include kernel/common:android-mainline:/arch/x86/OWNERS diff --git a/block/OWNERS b/block/OWNERS new file mode 100644 index 000000000000..7786d734d5c6 --- /dev/null +++ b/block/OWNERS @@ -0,0 +1,2 @@ +# include OWNERS from the authoritative android-mainline branch +include kernel/common:android-mainline:/block/OWNERS diff --git a/crypto/OWNERS b/crypto/OWNERS new file mode 100644 index 000000000000..f74b7ed228f7 --- /dev/null +++ b/crypto/OWNERS @@ -0,0 +1,2 @@ +# include OWNERS from the authoritative android-mainline branch +include kernel/common:android-mainline:/crypto/OWNERS diff --git a/drivers/OWNERS b/drivers/OWNERS new file mode 100644 index 000000000000..22c7eece228f --- /dev/null +++ b/drivers/OWNERS @@ -0,0 +1,2 @@ +# include OWNERS from the authoritative android-mainline branch +include kernel/common:android-mainline:/drivers/OWNERS diff --git a/fs/OWNERS b/fs/OWNERS new file mode 100644 index 000000000000..a838344a1137 --- /dev/null +++ b/fs/OWNERS @@ -0,0 +1,2 @@ +# include OWNERS from the authoritative android-mainline branch +include kernel/common:android-mainline:/fs/OWNERS diff --git a/fs/f2fs/OWNERS b/fs/f2fs/OWNERS new file mode 100644 index 000000000000..f981f44fbffd --- /dev/null +++ b/fs/f2fs/OWNERS @@ -0,0 +1,2 @@ +# include OWNERS from the authoritative android-mainline branch +include kernel/common:android-mainline:/fs/f2fs/OWNERS diff --git a/fs/incfs/OWNERS b/fs/incfs/OWNERS new file mode 100644 index 000000000000..17131f337364 --- /dev/null +++ b/fs/incfs/OWNERS @@ -0,0 +1,2 @@ +# include OWNERS from the authoritative android-mainline branch +include kernel/common:android-mainline:/fs/incfs/OWNERS diff --git a/include/OWNERS b/include/OWNERS new file mode 100644 index 000000000000..ab8142b271b4 --- /dev/null +++ b/include/OWNERS @@ -0,0 +1,2 @@ +# include OWNERS from the authoritative android-mainline branch +include kernel/common:android-mainline:/include/OWNERS diff --git a/include/linux/OWNERS b/include/linux/OWNERS new file mode 100644 index 000000000000..c88808c07797 --- /dev/null +++ b/include/linux/OWNERS @@ -0,0 +1,2 @@ +# include OWNERS from the authoritative android-mainline branch +include kernel/common:android-mainline:/include/linux/OWNERS diff --git a/include/trace/events/OWNERS b/include/trace/events/OWNERS new file mode 100644 index 000000000000..de3838b6df38 --- /dev/null +++ b/include/trace/events/OWNERS @@ -0,0 +1,2 @@ +# include OWNERS from the authoritative android-mainline branch +include kernel/common:android-mainline:/include/trace/events/OWNERS diff --git a/include/uapi/linux/OWNERS b/include/uapi/linux/OWNERS new file mode 100644 index 000000000000..113046844b1c --- /dev/null +++ b/include/uapi/linux/OWNERS @@ -0,0 +1,2 @@ +# include OWNERS from the authoritative android-mainline branch +include kernel/common:android-mainline:/include/uapi/linux/OWNERS diff --git a/kernel/sched/OWNERS b/kernel/sched/OWNERS new file mode 100644 index 000000000000..fc027b64b61b --- /dev/null +++ b/kernel/sched/OWNERS @@ -0,0 +1,2 @@ +# include OWNERS from the authoritative android-mainline branch +include kernel/common:android-mainline:/kernel/sched/OWNERS diff --git a/mm/OWNERS b/mm/OWNERS new file mode 100644 index 000000000000..f89766e706e0 --- /dev/null +++ b/mm/OWNERS @@ -0,0 +1,2 @@ +# include OWNERS from the authoritative android-mainline branch +include kernel/common:android-mainline:/mm/OWNERS diff --git a/net/OWNERS b/net/OWNERS new file mode 100644 index 000000000000..ddb7653770ec --- /dev/null +++ b/net/OWNERS @@ -0,0 +1,2 @@ +# include OWNERS from the authoritative android-mainline branch +include kernel/common:android-mainline:/net/OWNERS diff --git a/tools/testing/selftests/filesystems/incfs/OWNERS b/tools/testing/selftests/filesystems/incfs/OWNERS new file mode 100644 index 000000000000..5eb371e1a5a3 --- /dev/null +++ b/tools/testing/selftests/filesystems/incfs/OWNERS @@ -0,0 +1,2 @@ +# include OWNERS from the authoritative android-mainline branch +include kernel/common:android-mainline:/tools/testing/selftests/filesystems/incfs/OWNERS From 8aa2c72ddf14098886a9e6bbe91c970e37b41443 Mon Sep 17 00:00:00 2001 From: Matthias Maennich Date: Wed, 7 Apr 2021 10:18:01 +0100 Subject: [PATCH 2/6] ANDROID: android/OWNERS: drop gki-abi-approvers@ Group support is not implemented and this rather disturbes downstream merges. So, drop them. Fixes: 2fa0951b66b3 ("ANDROID: Initial Android 12 OWNERS for abi metafiles") Signed-off-by: Matthias Maennich Change-Id: I7d1462ff87b05eb678b1c97f5e0b89b97d4e91a5 --- android/OWNERS | 1 - 1 file changed, 1 deletion(-) diff --git a/android/OWNERS b/android/OWNERS index aefaeef7aee4..15daab5460ab 100644 --- a/android/OWNERS +++ b/android/OWNERS @@ -1,7 +1,6 @@ # If we ever add another OWNERS above this directory, it's likely to be # more permissive, so don't inherit from it set noparent -gki-abi-approvers@google.com adelva@google.com maennich@google.com saravanak@google.com From 91d8a13f43cda4e7e650161f232e508ecd60af11 Mon Sep 17 00:00:00 2001 From: "A. Cody Schuffelen" Date: Thu, 18 Mar 2021 13:04:19 -0700 Subject: [PATCH 3/6] FROMGIT: virt_wifi: Return micros for BSS TSF values cfg80211_inform_bss expects to receive a TSF value, but is given the time since boot in nanoseconds. TSF values are expected to be at microsecond scale rather than nanosecond scale. Bug: 181840234 Test: atest CtsWifiTestCases:android.net.wifi.cts.ScanResultTest#testScanResultTimeStamp -- --abi x86_64 Signed-off-by: A. Cody Schuffelen Link: https://lore.kernel.org/r/20210318200419.1421034-1-schuffelen@google.com Signed-off-by: Johannes Berg (cherry picked from commit b57aa17f07c9270e576ef7df09f142978b5a75f0 https: //git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git master) Change-Id: Icafc24ad303357926cbe955ffa12e28e0bf31e6f --- drivers/net/wireless/virt_wifi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/virt_wifi.c b/drivers/net/wireless/virt_wifi.c index b80f7de39aee..22890cca984b 100644 --- a/drivers/net/wireless/virt_wifi.c +++ b/drivers/net/wireless/virt_wifi.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include @@ -173,11 +174,11 @@ static void virt_wifi_scan_result(struct work_struct *work) scan_result.work); struct wiphy *wiphy = priv_to_wiphy(priv); struct cfg80211_scan_info scan_info = { .aborted = false }; + u64 tsf = div_u64(ktime_get_boottime_ns(), 1000); informed_bss = cfg80211_inform_bss(wiphy, &channel_5ghz, CFG80211_BSS_FTYPE_PRESP, - fake_router_bssid, - ktime_get_boottime_ns(), + fake_router_bssid, tsf, WLAN_CAPABILITY_ESS, 0, (void *)&ssid, sizeof(ssid), DBM_TO_MBM(-50), GFP_KERNEL); From 67e9dbddb51764f7395a43b6993f696362de551e Mon Sep 17 00:00:00 2001 From: Nick Desaulniers Date: Mon, 19 Apr 2021 12:33:25 -0700 Subject: [PATCH 4/6] ANDROID: clang: update to 12.0.5 Bug: 185804542 Signed-off-by: Nick Desaulniers Change-Id: If3d0c122472d8979b326d8a6fece30d8b2af962a --- build.config.common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.config.common b/build.config.common index 778e5a7d540a..bdfcee55a9b2 100644 --- a/build.config.common +++ b/build.config.common @@ -6,7 +6,7 @@ LD=ld.lld NM=llvm-nm OBJCOPY=llvm-objcopy DEPMOD=depmod -CLANG_PREBUILT_BIN=prebuilts-master/clang/host/linux-x86/clang-r416183/bin +CLANG_PREBUILT_BIN=prebuilts-master/clang/host/linux-x86/clang-r416183b/bin BUILDTOOLS_PREBUILT_BIN=build/build-tools/path/linux-x86 EXTRA_CMDS='' From b3f413063085159ac967eabe7f61e093c73edfd2 Mon Sep 17 00:00:00 2001 From: Jindong Yue Date: Wed, 21 Apr 2021 10:21:58 +0800 Subject: [PATCH 5/6] ANDROID: ABI: Update symbol list for imx Update imx symbol list according to below changes: - Replace imx_rproc with imx_rpmsg driver - Add two modules: snd-soc-rpmsg-pcm512x.ko and snd-soc-rpmsg-imx-pcm512x.ko Leaf changes summary: 4 artifacts changed (26 filtered out) Changed leaf types summary: 0 (26 filtered out) leaf types changed Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 4 Added functions Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable 4 Added functions: [A] 'function int snd_interval_ranges(snd_interval*, unsigned int, const snd_interval*, unsigned int)' [A] 'function int snd_pcm_hw_constraint_ratnums(snd_pcm_runtime*, unsigned int, snd_pcm_hw_param_t, const snd_pcm_hw_constraint_ratnums*)' [A] 'function int snd_soc_limit_volume(snd_soc_card*, const char*, int)' [A] 'function int snd_soc_params_to_frame_size(snd_pcm_hw_params*)' Bug: 159736148 Signed-off-by: Jindong Yue Change-Id: I04c696219cdfead30a00201000251bd989814ec5 --- android/abi_gki_aarch64.xml | 3138 ++++++++++++++++++----------------- android/abi_gki_aarch64_imx | 86 +- 2 files changed, 1693 insertions(+), 1531 deletions(-) diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml index 6aa47db183ed..52690283f0ea 100644 --- a/android/abi_gki_aarch64.xml +++ b/android/abi_gki_aarch64.xml @@ -2856,7 +2856,6 @@ - @@ -3406,7 +3405,6 @@ - @@ -3451,25 +3449,16 @@ - - - - - - - - - @@ -3798,6 +3787,7 @@ + @@ -3816,6 +3806,7 @@ + @@ -3902,6 +3893,7 @@ + @@ -3914,6 +3906,7 @@ + @@ -5032,16 +5025,16 @@ - + - + - + - + @@ -5894,13 +5887,13 @@ - + - + - + @@ -6143,15 +6136,15 @@ - + - + - + @@ -6383,21 +6376,21 @@ - + - + - + - + - + @@ -6611,13 +6604,13 @@ - + - + - + @@ -6864,13 +6857,13 @@ - + - + - + @@ -7173,10 +7166,10 @@ - + - + @@ -8161,10 +8154,10 @@ - + - + @@ -9249,26 +9242,26 @@ - + - + - + - + - + - + @@ -11050,29 +11043,29 @@ - + - + - + - + - + - + - + @@ -12563,42 +12556,42 @@ - + - + - + - + - + - + - + - + - + - + @@ -14732,74 +14725,74 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -17688,106 +17681,106 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -20367,78 +20360,78 @@ - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + @@ -20838,7 +20831,23 @@ - + + + + + + + + + + + + + + + + + @@ -23475,190 +23484,190 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - - + + - + - - + + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -23688,6 +23697,9 @@ + + + @@ -26167,174 +26179,174 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -27030,7 +27042,65 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -28193,6 +28263,14 @@ + + + + + + + + @@ -28508,59 +28586,59 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -30146,6 +30224,7 @@ + @@ -30202,26 +30281,34 @@ - + - + + + + + + + + + - + - + - - + + - + @@ -30407,6 +30494,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -31187,48 +31294,48 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -31933,21 +32040,21 @@ - + - + - + - + - + @@ -32483,21 +32590,21 @@ - + - + - - + + - + - + @@ -36836,16 +36943,16 @@ - + - + - + - + @@ -36895,10 +37002,10 @@ - + - + @@ -37009,10 +37116,10 @@ - + - + @@ -37281,13 +37388,13 @@ - + - + - + @@ -37303,10 +37410,10 @@ - + - + @@ -37322,28 +37429,28 @@ - + - + - + - + - + - + @@ -37357,10 +37464,10 @@ - + - + @@ -37375,26 +37482,26 @@ - + - + - + - + - + - + @@ -37767,7 +37874,7 @@ - + @@ -37783,13 +37890,13 @@ - + - + - + @@ -38004,10 +38111,10 @@ - + - + @@ -38111,10 +38218,10 @@ - + - + @@ -38894,13 +39001,13 @@ - + - + - + @@ -38965,28 +39072,28 @@ - + - + - + - + - + - + - + - + @@ -39231,16 +39338,16 @@ - + - + - + - + @@ -39366,10 +39473,10 @@ - + - + @@ -39480,10 +39587,10 @@ - + - + @@ -39524,10 +39631,10 @@ - + - + @@ -39543,13 +39650,13 @@ - + - + - + @@ -39608,10 +39715,10 @@ - + - + @@ -39863,10 +39970,10 @@ - + - + @@ -40645,10 +40752,10 @@ - + - + @@ -41135,13 +41242,13 @@ - + - + - + @@ -41186,10 +41293,10 @@ - + - + @@ -41541,27 +41648,27 @@ - + - + - + - + - + - + @@ -41583,10 +41690,10 @@ - + - + @@ -41627,10 +41734,10 @@ - + - + @@ -41674,10 +41781,10 @@ - + - + @@ -42079,18 +42186,18 @@ - + - + - + - + @@ -42115,25 +42222,25 @@ - + - + - + - + - + - + - + @@ -42162,10 +42269,10 @@ - + - + @@ -42207,13 +42314,13 @@ - + - + - + @@ -42263,10 +42370,10 @@ - + - + @@ -42309,10 +42416,10 @@ - + - + @@ -42668,16 +42775,16 @@ - + - + - + - + @@ -43258,26 +43365,26 @@ - + - + - + - + - + - + @@ -43517,13 +43624,13 @@ - + - + - + @@ -43569,19 +43676,19 @@ - + - + - + - + - + @@ -43591,10 +43698,10 @@ - + - + @@ -43607,21 +43714,21 @@ - + - + - + - + - + @@ -43750,13 +43857,13 @@ - + - + - + @@ -43931,10 +44038,10 @@ - + - + @@ -44019,13 +44126,13 @@ - + - + - + @@ -44209,13 +44316,13 @@ - + - + - + @@ -44444,16 +44551,16 @@ - + - + - + - + @@ -44638,10 +44745,10 @@ - + - + @@ -47746,13 +47853,13 @@ - + - + - + @@ -50215,7 +50322,23 @@ - + + + + + + + + + + + + + + + + + @@ -51324,48 +51447,48 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -51411,25 +51534,25 @@ - + - + - + - + - + - + - + @@ -51776,48 +51899,48 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -51848,16 +51971,16 @@ - + - + - + - + @@ -52085,10 +52208,10 @@ - + - + @@ -52226,16 +52349,16 @@ - + - + - + - + @@ -52887,46 +53010,46 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -53058,10 +53181,10 @@ - + - + @@ -53552,16 +53675,16 @@ - + - + - + - + @@ -55837,7 +55960,7 @@ - + @@ -56315,10 +56438,10 @@ - + - + @@ -56334,36 +56457,36 @@ - + - + - + - + - + - + - + - + - + - + @@ -56678,10 +56801,10 @@ - + - + @@ -57964,10 +58087,10 @@ - + - + @@ -60102,10 +60225,10 @@ - + - + @@ -67258,13 +67381,13 @@ - + - + - + @@ -67804,7 +67927,7 @@ - + @@ -67867,7 +67990,7 @@ - + @@ -68755,22 +68878,22 @@ - + - + - + - + - + - + @@ -70804,7 +70927,7 @@ - + @@ -72293,10 +72416,10 @@ - + - + @@ -73101,13 +73224,13 @@ - + - + - + @@ -73250,10 +73373,10 @@ - + - + @@ -75726,10 +75849,10 @@ - + - + @@ -76160,13 +76283,13 @@ - + - + - + @@ -77374,7 +77497,7 @@ - + @@ -79123,10 +79246,10 @@ - + - + @@ -79642,13 +79765,13 @@ - + - + - + @@ -79777,19 +79900,19 @@ - + - + - + - + - + @@ -80214,40 +80337,40 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -80779,10 +80902,10 @@ - + - + @@ -80851,19 +80974,19 @@ - + - + - + - + - + @@ -80924,10 +81047,10 @@ - + - + @@ -83171,10 +83294,10 @@ - + - + @@ -83243,19 +83366,19 @@ - + - + - + - + - + @@ -83288,10 +83411,10 @@ - + - + @@ -85244,10 +85367,10 @@ - + - + @@ -85817,10 +85940,10 @@ - + - + @@ -86290,13 +86413,13 @@ - + - + - + @@ -88366,19 +88489,19 @@ - + - + - + - + - + @@ -90674,16 +90797,16 @@ - + - + - + - + @@ -91208,16 +91331,16 @@ - + - + - + - + @@ -91259,10 +91382,10 @@ - + - + @@ -91285,10 +91408,10 @@ - + - + @@ -94224,13 +94347,13 @@ - + - + - + @@ -94323,10 +94446,10 @@ - + - + @@ -95056,13 +95179,13 @@ - + - + - + @@ -95340,7 +95463,7 @@ - + @@ -95761,52 +95884,52 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -96017,29 +96140,29 @@ - + - + - + - + - + - + - + @@ -96354,13 +96477,13 @@ - + - + - + @@ -96379,13 +96502,13 @@ - + - + - + @@ -96398,7 +96521,7 @@ - + @@ -96871,16 +96994,16 @@ - + - + - + - + @@ -97583,52 +97706,52 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -98480,18 +98603,18 @@ - + - + - + - + @@ -98843,13 +98966,13 @@ - + - + - + @@ -99186,22 +99309,22 @@ - + - + - + - + - + - + @@ -99302,10 +99425,10 @@ - + - + @@ -100184,10 +100307,10 @@ - + - + @@ -100697,10 +100820,10 @@ - + - + @@ -100821,16 +100944,16 @@ - + - + - + - + @@ -101330,28 +101453,28 @@ - + - + - + - + - + - + - + - + @@ -101394,10 +101517,10 @@ - + - + @@ -101451,10 +101574,10 @@ - + - + @@ -101590,16 +101713,16 @@ - + - + - + - + @@ -101621,21 +101744,21 @@ - + - + - + - + - + @@ -101891,7 +102014,7 @@ - + @@ -101910,25 +102033,25 @@ - + - + - + - + - + - + - + @@ -101947,10 +102070,10 @@ - + - + @@ -102071,7 +102194,7 @@ - + @@ -102092,13 +102215,13 @@ - + - + - + @@ -102129,13 +102252,13 @@ - + - + - + @@ -102223,10 +102346,10 @@ - + - + @@ -102282,10 +102405,10 @@ - + - + @@ -103657,52 +103780,52 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -104271,18 +104394,18 @@ - + - + - + - + @@ -104451,13 +104574,13 @@ - + - + - + @@ -104566,22 +104689,22 @@ - + - + - + - + - + - + @@ -104617,10 +104740,10 @@ - + - + @@ -105018,13 +105141,13 @@ - + - + - + @@ -106716,16 +106839,16 @@ - + - + - + - + @@ -108246,10 +108369,10 @@ - + - + @@ -108595,22 +108718,22 @@ - + - + - + - + - + - + @@ -108649,16 +108772,16 @@ - + - + - + - + @@ -111827,10 +111950,10 @@ - + - + @@ -111844,18 +111967,18 @@ - + - + - + - + @@ -111869,10 +111992,10 @@ - + - + @@ -112149,16 +112272,16 @@ - + - + - + - + @@ -112171,43 +112294,43 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -112473,10 +112596,10 @@ - + - + @@ -112503,18 +112626,18 @@ - + - + - + - + @@ -112663,13 +112786,13 @@ - + - + - + @@ -112939,10 +113062,10 @@ - + - + @@ -113191,16 +113314,16 @@ - + - + - + - + @@ -113260,22 +113383,22 @@ - + - + - + - + - + - + @@ -113374,10 +113497,10 @@ - + - + @@ -113530,10 +113653,10 @@ - + - + @@ -113544,10 +113667,10 @@ - + - + @@ -113572,10 +113695,10 @@ - + - + @@ -113760,10 +113883,10 @@ - + - + @@ -113839,10 +113962,10 @@ - + - + @@ -113888,10 +114011,10 @@ - + - + @@ -114179,13 +114302,13 @@ - + - + - + @@ -116132,10 +116255,6 @@ - - - - @@ -117679,7 +117798,7 @@ - + @@ -119529,11 +119648,11 @@ - - + + - + @@ -121914,44 +122033,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -121999,14 +122080,12 @@ - - @@ -122023,43 +122102,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -122109,11 +122156,6 @@ - - - - - @@ -122164,48 +122206,17 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -122458,10 +122469,10 @@ - + - + @@ -125975,18 +125986,18 @@ - + - + - + - + @@ -126882,16 +126893,16 @@ - + - + - + - + @@ -126938,10 +126949,10 @@ - + - + @@ -127595,10 +127606,10 @@ - + - + @@ -128378,10 +128389,10 @@ - + - + @@ -129044,13 +129055,13 @@ - + - + - + @@ -130700,10 +130711,10 @@ - + - + @@ -137224,13 +137235,13 @@ - + - + - + @@ -137399,10 +137410,10 @@ - + - + @@ -141289,10 +141300,10 @@ - + - + @@ -142427,10 +142438,10 @@ - + - + @@ -143015,22 +143026,22 @@ - + - + - + - + - + - + @@ -143083,10 +143094,10 @@ - + - + @@ -143765,16 +143776,16 @@ - + - + - + - + @@ -145074,13 +145085,13 @@ - + - + - + @@ -145354,10 +145365,10 @@ - + - + @@ -145367,13 +145378,13 @@ - + - + - + @@ -145741,10 +145752,10 @@ - + - + @@ -145992,44 +146003,44 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -146263,13 +146274,13 @@ - + - + - + @@ -146337,10 +146348,10 @@ - + - + @@ -147213,10 +147224,10 @@ - + - + @@ -148341,10 +148352,10 @@ - + - + @@ -148504,11 +148515,11 @@ - - + + - + @@ -149735,7 +149746,7 @@ - + @@ -150798,10 +150809,10 @@ - + - + @@ -153853,10 +153864,10 @@ - + - + @@ -154035,10 +154046,10 @@ - + - + @@ -154664,10 +154675,10 @@ - + - + @@ -154733,10 +154744,10 @@ - + - + @@ -154861,10 +154872,10 @@ - + - + @@ -155249,10 +155260,10 @@ - + - + @@ -156665,10 +156676,10 @@ - + - + @@ -156716,13 +156727,13 @@ - + - + - + @@ -157800,32 +157811,32 @@ - + - + - + - + - + - + - + - + @@ -157857,10 +157868,10 @@ - + - + @@ -159263,46 +159274,46 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -159348,22 +159359,22 @@ - + - + - + - + - + - + @@ -159589,10 +159600,10 @@ - + - + @@ -159635,10 +159646,10 @@ - + - + @@ -160141,13 +160152,13 @@ - + - + - + @@ -160529,10 +160540,10 @@ - + - + @@ -163472,10 +163483,10 @@ - + - + @@ -163832,10 +163843,10 @@ - + - + @@ -164361,18 +164372,18 @@ - + - + - + - + @@ -164733,18 +164744,18 @@ - + - + - + - + @@ -165408,10 +165419,10 @@ - + - + @@ -165458,10 +165469,10 @@ - + - + @@ -165828,9 +165839,20 @@ + + + + + + + + + + + @@ -165907,7 +165929,7 @@ - + @@ -165953,17 +165975,6 @@ - - - - - - - - - - - @@ -165974,7 +165985,6 @@ - @@ -167031,6 +167041,18 @@ + + + + + + + + + + + + @@ -167052,6 +167074,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -167674,10 +167725,10 @@ - + - + @@ -168390,10 +168441,10 @@ - + - + @@ -168600,10 +168651,10 @@ - + - + @@ -169136,10 +169187,10 @@ - + - + @@ -169336,10 +169387,10 @@ - + - + @@ -169846,10 +169897,10 @@ - + - + @@ -170327,16 +170378,16 @@ - + - + - + - + @@ -172594,22 +172645,22 @@ - + - + - + - + - + - + @@ -172758,13 +172809,13 @@ - + - + - + @@ -174232,19 +174283,19 @@ - + - + - + - + - + @@ -174266,10 +174317,10 @@ - + - + @@ -174606,65 +174657,65 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -174733,19 +174784,19 @@ - + - + - + - + - + @@ -174755,25 +174806,25 @@ - + - + - + - + - + - + - + @@ -174808,25 +174859,25 @@ - + - + - + - + - + - + - + @@ -174919,22 +174970,22 @@ - + - + - + - + - + - + @@ -175578,10 +175629,10 @@ - + - + @@ -175603,13 +175654,13 @@ - + - + - + @@ -175958,7 +176009,65 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -176046,10 +176155,10 @@ - + - + @@ -176335,10 +176444,10 @@ - + - + @@ -176433,10 +176542,10 @@ - + - + @@ -177071,7 +177180,218 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -177155,6 +177475,17 @@ + + + + + + + + + + + @@ -177244,7 +177575,6 @@ - @@ -177257,9 +177587,6 @@ - - - @@ -177291,13 +177618,6 @@ - - - - - - - @@ -177553,62 +177873,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -177967,139 +178231,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -180371,10 +180502,10 @@ - + - + @@ -181015,10 +181146,6 @@ - - - - @@ -181043,7 +181170,6 @@ - @@ -181131,13 +181257,7 @@ - - - - - - @@ -181193,13 +181313,6 @@ - - - - - - - @@ -181777,10 +181890,6 @@ - - - - @@ -182853,37 +182962,37 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -182973,55 +183082,55 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -183907,10 +184016,10 @@ - + - + @@ -184234,19 +184343,19 @@ - + - + - + - + - + @@ -184634,16 +184743,16 @@ - + - + - + - + @@ -184687,10 +184796,10 @@ - + - + @@ -184713,51 +184822,51 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -184777,10 +184886,10 @@ - + - + @@ -185591,6 +185700,28 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -185618,6 +185749,10 @@ + + + + @@ -185626,6 +185761,13 @@ + + + + + + + @@ -185633,6 +185775,13 @@ + + + + + + + @@ -185662,6 +185811,9 @@ + + + @@ -185786,10 +185938,10 @@ - + - + @@ -186835,10 +186987,10 @@ - + - + @@ -188126,10 +188278,10 @@ - + - + @@ -188214,10 +188366,10 @@ - + - + @@ -188236,13 +188388,13 @@ - + - + - + @@ -189083,10 +189235,10 @@ - + - + @@ -190259,6 +190411,12 @@ + + + + + + @@ -190323,6 +190481,10 @@ + + + + @@ -191020,6 +191182,6 @@ diff --git a/android/abi_gki_aarch64_imx b/android/abi_gki_aarch64_imx index ce8c8cb823f1..f5d9826fcde9 100644 --- a/android/abi_gki_aarch64_imx +++ b/android/abi_gki_aarch64_imx @@ -255,12 +255,14 @@ fwnode_graph_get_next_endpoint fwnode_handle_put fwnode_property_read_u32_array + gcd generic_handle_irq get_cpu_device __get_free_pages get_random_bytes get_unused_fd_flags gpiod_direction_output_raw + gpiod_set_raw_value gpiod_set_raw_value_cansleep gpiod_set_value_cansleep gpio_request @@ -272,6 +274,7 @@ i2c_add_adapter i2c_del_adapter i2c_del_driver + i2c_put_adapter i2c_register_driver i2c_transfer i2c_transfer_buffer_flags @@ -306,9 +309,9 @@ kmalloc_caches kmalloc_order_trace kmem_cache_alloc_trace - kmemdup kobject_create_and_add kobject_put + kstrtoull kthread_create_on_node kthread_should_stop ktime_get @@ -323,6 +326,7 @@ media_entity_remote_pad memcpy memset + __memset_io mipi_dsi_attach mipi_dsi_detach mipi_dsi_driver_register_full @@ -359,7 +363,6 @@ of_clk_get of_clk_get_by_name of_clk_src_onecell_get - of_count_phandle_with_args of_device_get_match_data of_device_is_available of_device_is_compatible @@ -394,6 +397,7 @@ of_property_read_string of_property_read_u32_index of_property_read_variable_u32_array + of_reserved_mem_device_init_by_idx of_reset_control_array_get param_array_ops param_ops_bool @@ -478,6 +482,7 @@ __register_chrdev register_netdev __register_rpmsg_driver + register_virtio_device register_virtio_driver regmap_attach_dev regmap_read @@ -547,7 +552,9 @@ snd_soc_info_volsw snd_soc_jack_add_gpios snd_soc_of_parse_audio_routing + snd_soc_of_parse_audio_simple_widgets snd_soc_of_parse_card_name + snd_soc_of_parse_daifmt snd_soc_params_to_bclk snd_soc_pm_ops snd_soc_put_enum_double @@ -665,6 +672,9 @@ vmalloc vmalloc_to_page vmemmap + vring_del_virtqueue + vring_interrupt + vring_new_virtqueue vsnprintf wait_for_completion_interruptible_timeout wait_for_completion_timeout @@ -777,7 +787,6 @@ drm_scdc_set_high_tmds_clock_ratio drm_scdc_set_scrambling drm_scdc_write - i2c_put_adapter of_get_i2c_adapter_by_node # required by dw_hdmi-imx.ko @@ -794,6 +803,7 @@ # required by dwc3-qcom.ko devm_extcon_register_notifier + kmemdup of_clk_get_parent_count # required by dwc3.ko @@ -845,7 +855,6 @@ of_mdiobus_register of_phy_connect of_phy_deregister_fixed_link - of_phy_find_device of_phy_is_fixed_link of_phy_register_fixed_link param_ops_byte @@ -977,7 +986,6 @@ clk_notifier_register clk_notifier_unregister dma_request_chan - gpiod_set_raw_value i2c_add_numbered_adapter i2c_generic_scl_recovery i2c_recover_bus @@ -1117,6 +1125,13 @@ # required by imx8mp-ldb.ko devm_of_phy_get +# required by imx_rpmsg.ko + mbox_free_channel + mbox_request_channel_byname + mbox_send_message + of_reserved_mem_device_release + vring_transport_features + # required by imx_rpmsg_tty.ko print_hex_dump put_tty_driver @@ -1132,30 +1147,6 @@ tty_std_termios tty_unregister_driver -# required by imx_rproc.ko - mbox_free_channel - mbox_request_channel_byname - mbox_send_message - of_phandle_iterator_init - of_phandle_iterator_next - of_reserved_mem_lookup - reset_control_status - rproc_add - rproc_add_carveout - rproc_alloc - rproc_coredump_add_segment - rproc_da_to_va - rproc_del - rproc_elf_find_loaded_rsc_table - rproc_elf_get_boot_addr - rproc_elf_load_rsc_table - rproc_elf_load_segments - rproc_elf_sanity_check - rproc_free - rproc_mem_entry_init - rproc_of_resm_mem_entry_init - rproc_vq_interrupt - # required by imxdrm.ko component_bind_all component_master_add_with_match @@ -1225,13 +1216,11 @@ match_token mutex_is_locked notify_change - override_creds pagecache_get_page path_get path_put __put_cred register_filesystem - revert_creds set_anon_super sget simple_getattr @@ -1276,6 +1265,9 @@ i2c_new_dummy regmap_bulk_read +# required by lpa_ctrl.ko + sysfs_create_groups + # required by moal.ko alloc_netdev_mqs __alloc_skb @@ -1626,7 +1618,7 @@ # required by snd-soc-fsl-dsp.ko dev_pm_domain_attach_by_id - __memset_io + of_count_phandle_with_args of_irq_get pm_system_wakeup sysfs_streq @@ -1634,7 +1626,6 @@ # required by snd-soc-fsl-easrc.ko completion_done - gcd snd_pcm_format_big_endian snd_pcm_format_linear snd_pcm_format_unsigned @@ -1643,7 +1634,6 @@ # required by snd-soc-fsl-micfil.ko kobject_uevent_env - kstrtoull snd_soc_get_volsw_sx snd_soc_info_volsw_sx snd_soc_put_volsw_sx @@ -1666,9 +1656,6 @@ snd_pcm_hw_constraint_eld snd_soc_jack_report -# required by snd-soc-imx-rpmsg.ko - of_reserved_mem_device_init_by_idx - # required by snd-soc-imx-wm8960.ko gpiod_get_raw_value_cansleep of_parse_phandle_with_fixed_args @@ -1684,6 +1671,22 @@ # required by snd-soc-rpmsg-cs42xx8.ko regcache_cache_bypass +# required by snd-soc-rpmsg-imx-pcm512x.ko + i2c_get_adapter + i2c_smbus_read_byte + snd_soc_dai_set_bclk_ratio + snd_soc_get_pcm_runtime + snd_soc_limit_volume + snd_soc_unregister_card + +# required by snd-soc-rpmsg-pcm512x.ko + devm_regulator_register_notifier + snd_ctl_boolean_stereo_info + snd_interval_ranges + snd_pcm_hw_constraint_ratnums + snd_pcm_hw_rule_add + snd_soc_params_to_frame_size + # required by snd-soc-simple-card-utils.ko devm_get_clk_from_child devm_kasprintf @@ -1692,14 +1695,15 @@ snd_soc_dapm_get_pin_switch snd_soc_dapm_info_pin_switch snd_soc_dapm_put_pin_switch - snd_soc_of_parse_audio_simple_widgets - snd_soc_of_parse_daifmt # required by snd-soc-simple-card.ko snd_soc_of_get_dai_name snd_soc_of_parse_node_prefix snd_soc_of_parse_tdm_slot +# required by snd-soc-tpa6130a2.ko + devm_gpio_request + # required by snvs_pwrkey.ko devm_input_allocate_device pm_relax @@ -1763,11 +1767,7 @@ panic_notifier_list # required by trusty-virtio.ko - register_virtio_device unregister_virtio_device - vring_del_virtqueue - vring_interrupt - vring_new_virtqueue # required by trusty.ko atomic_notifier_call_chain From ccdcd307cf7e5809dad02e7b5fd926681c3f8313 Mon Sep 17 00:00:00 2001 From: Howard Chen Date: Thu, 22 Apr 2021 11:29:27 +0800 Subject: [PATCH 6/6] ANDROID: Update the KMI for virtual platform modules Leaf changes summary: 1 artifact changed (26 filtered out) Changed leaf types summary: 0 (26 filtered out) leaf types changed Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 1 Added function Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable 1 Added function: [A] 'function void* vmemdup_user(void*, size_t)' Bug: 184721371 Test: \ BUILD_CONFIG=common/build.config.gki.aarch64 build/build.sh \ BUILD_CONFIG=common-modules/virtual-device/build.config.virtual_device.aarch64 build/build.sh \ BUILD_CONFIG=common-modules/virtual-device/build.config.virtual_device.aarch64 build/build_abi.sh --update-symbol-list \ BUILD_CONFIG=common/build.config.gki.aarch64 build/build_abi.sh --update --print-report Change-Id: Ib945211cb33806687eccdbe52533abf2db04abcf Signed-off-by: Howard Chen --- android/abi_gki_aarch64.xml | 888 ++++++++++++----------------- android/abi_gki_aarch64_cuttlefish | 4 +- 2 files changed, 363 insertions(+), 529 deletions(-) diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml index 52690283f0ea..c3d6fb4f3c40 100644 --- a/android/abi_gki_aarch64.xml +++ b/android/abi_gki_aarch64.xml @@ -4681,6 +4681,7 @@ + @@ -8153,7 +8154,7 @@ - + @@ -11061,7 +11062,7 @@ - + @@ -20410,7 +20411,7 @@ - + @@ -23283,7 +23284,7 @@ - + @@ -23302,7 +23303,7 @@ - + @@ -23579,7 +23580,7 @@ - + @@ -23587,7 +23588,7 @@ - + @@ -23603,7 +23604,7 @@ - + @@ -23611,7 +23612,7 @@ - + @@ -23619,7 +23620,7 @@ - + @@ -23647,7 +23648,7 @@ - + @@ -23655,7 +23656,7 @@ - + @@ -25858,7 +25859,7 @@ - + @@ -26237,7 +26238,7 @@ - + @@ -26261,7 +26262,7 @@ - + @@ -26269,7 +26270,7 @@ - + @@ -26288,7 +26289,7 @@ - + @@ -26304,7 +26305,7 @@ - + @@ -26331,7 +26332,7 @@ - + @@ -26342,7 +26343,7 @@ - + @@ -27042,65 +27043,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -28218,7 +28161,7 @@ - + @@ -28226,7 +28169,7 @@ - + @@ -28271,7 +28214,7 @@ - + @@ -28620,7 +28563,7 @@ - + @@ -30224,7 +30167,6 @@ - @@ -30288,14 +30230,6 @@ - - - - - - - - @@ -30494,26 +30428,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -31053,7 +30967,7 @@ - + @@ -31293,7 +31207,7 @@ - + @@ -31301,7 +31215,7 @@ - + @@ -31309,7 +31223,7 @@ - + @@ -32039,7 +31953,7 @@ - + @@ -32589,7 +32503,7 @@ - + @@ -32851,7 +32765,7 @@ - + @@ -51598,6 +51512,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -51898,44 +51850,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -108368,7 +108282,7 @@ - + @@ -108742,7 +108656,7 @@ - + @@ -108750,7 +108664,7 @@ - + @@ -108758,7 +108672,7 @@ - + @@ -108766,12 +108680,12 @@ - + - + @@ -111949,7 +111863,7 @@ - + @@ -111958,7 +111872,7 @@ - + @@ -111966,7 +111880,7 @@ - + @@ -111974,7 +111888,7 @@ - + @@ -111983,7 +111897,7 @@ - + @@ -111991,7 +111905,7 @@ - + @@ -112271,7 +112185,7 @@ - + @@ -112293,7 +112207,7 @@ - + @@ -112304,7 +112218,7 @@ - + @@ -112312,7 +112226,7 @@ - + @@ -112323,7 +112237,7 @@ - + @@ -112335,7 +112249,7 @@ - + @@ -112346,7 +112260,7 @@ - + @@ -112595,7 +112509,7 @@ - + @@ -112625,7 +112539,7 @@ - + @@ -112633,7 +112547,7 @@ - + @@ -112785,7 +112699,7 @@ - + @@ -113061,7 +112975,7 @@ - + @@ -113106,7 +113020,7 @@ - + @@ -113313,7 +113227,7 @@ - + @@ -113402,7 +113316,7 @@ - + @@ -113410,7 +113324,7 @@ - + @@ -113418,7 +113332,7 @@ - + @@ -113426,7 +113340,7 @@ - + @@ -113496,205 +113410,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -113882,7 +113598,7 @@ - + @@ -113961,7 +113677,7 @@ - + @@ -114010,7 +113726,7 @@ - + @@ -114186,6 +113902,204 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -114301,7 +114215,7 @@ - + @@ -114312,7 +114226,7 @@ - + @@ -114320,7 +114234,7 @@ - + @@ -114770,7 +114684,7 @@ - + @@ -165625,6 +165539,11 @@ + + + + + @@ -167074,35 +166993,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -167724,7 +167614,7 @@ - + @@ -167732,7 +167622,7 @@ - + @@ -167740,7 +167630,7 @@ - + @@ -170377,7 +170267,7 @@ - + @@ -176009,74 +175899,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - @@ -176130,42 +175956,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -176373,6 +176164,12 @@ + + + + + + @@ -176443,7 +176240,7 @@ - + @@ -176527,6 +176324,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -176541,7 +176370,7 @@ - + @@ -176603,6 +176432,9 @@ + + + diff --git a/android/abi_gki_aarch64_cuttlefish b/android/abi_gki_aarch64_cuttlefish index ed9d96a0557b..cce8b465f8a2 100644 --- a/android/abi_gki_aarch64_cuttlefish +++ b/android/abi_gki_aarch64_cuttlefish @@ -614,8 +614,8 @@ kmalloc_order_trace kvfree kvmalloc_node - memdup_user mutex_trylock + sg_alloc_table __sg_alloc_table_from_pages sg_free_table sg_next @@ -644,6 +644,8 @@ ttm_eu_fence_buffer_objects ttm_eu_reserve_buffers ttm_tt_init + vmalloc_to_page + vmemdup_user vmemmap ww_mutex_lock_interruptible ww_mutex_unlock