From bc6d3d83539512dbbd5e2fe8beca2ef614eb9336 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Mon, 10 Jan 2022 03:15:27 +0900 Subject: [PATCH 1/5] UPSTREAM: kbuild: rename cmd_{bzip2,lzma,lzo,lz4,xzkern,zstd22} GZIP-compressed files end with 4 byte data that represents the size of the original input. The decompressors (the self-extracting kernel) exploit it to know the vmlinux size beforehand. To mimic the GZIP's trailer, Kbuild provides cmd_{bzip2,lzma,lzo,lz4,xzkern,zstd22}. Unfortunately these macros are used everywhere despite the appended size data is only useful for the decompressors. There is no guarantee that such hand-crafted trailers are safely ignored. In fact, the kernel refuses compressed initramdfs with the garbage data. That is why usr/Makefile overrides size_append to make it no-op. To limit the use of such broken compressed files, this commit renames the existing macros as follows: cmd_bzip2 --> cmd_bzip2_with_size cmd_lzma --> cmd_lzma_with_size cmd_lzo --> cmd_lzo_with_size cmd_lz4 --> cmd_lz4_with_size cmd_xzkern --> cmd_xzkern_with_size cmd_zstd22 --> cmd_zstd22_with_size To keep the decompressors working, I updated the following Makefiles accordingly: arch/arm/boot/compressed/Makefile arch/h8300/boot/compressed/Makefile arch/mips/boot/compressed/Makefile arch/parisc/boot/compressed/Makefile arch/s390/boot/compressed/Makefile arch/sh/boot/compressed/Makefile arch/x86/boot/compressed/Makefile I reused the current macro names for the normal usecases; they produce the compressed data in the proper format. I did not touch the following: arch/arc/boot/Makefile arch/arm64/boot/Makefile arch/csky/boot/Makefile arch/mips/boot/Makefile arch/riscv/boot/Makefile arch/sh/boot/Makefile kernel/Makefile This means those Makefiles will stop appending the size data. I dropped the 'override size_append' hack from usr/Makefile. Signed-off-by: Masahiro Yamada Reviewed-by: Nicolas Schier Bug: 135791357 (cherry picked from commit 7ce7e984ab2b218d6e92d5165629022fe2daf9ee https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git master) Change-Id: I2efa0b2df75b31033e777618db6e12e38b0aa3f3 Signed-off-by: SzuWei Lin (cherry picked from commit 010f93525db5fd0abcf4779cb653563e68438322) --- arch/arm/boot/compressed/Makefile | 8 +++---- arch/h8300/boot/compressed/Makefile | 4 +++- arch/mips/boot/compressed/Makefile | 12 +++++------ arch/parisc/boot/compressed/Makefile | 10 ++++----- arch/s390/boot/compressed/Makefile | 12 +++++------ arch/sh/boot/compressed/Makefile | 8 +++---- arch/x86/boot/compressed/Makefile | 12 +++++------ scripts/Makefile.lib | 31 +++++++++++++++++++++------- usr/Makefile | 5 ----- 9 files changed, 58 insertions(+), 44 deletions(-) diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile index 91265e7ff672..adc0e318a1ea 100644 --- a/arch/arm/boot/compressed/Makefile +++ b/arch/arm/boot/compressed/Makefile @@ -77,10 +77,10 @@ CPPFLAGS_vmlinux.lds += -DTEXT_OFFSET="$(TEXT_OFFSET)" CPPFLAGS_vmlinux.lds += -DMALLOC_SIZE="$(MALLOC_SIZE)" compress-$(CONFIG_KERNEL_GZIP) = gzip -compress-$(CONFIG_KERNEL_LZO) = lzo -compress-$(CONFIG_KERNEL_LZMA) = lzma -compress-$(CONFIG_KERNEL_XZ) = xzkern -compress-$(CONFIG_KERNEL_LZ4) = lz4 +compress-$(CONFIG_KERNEL_LZO) = lzo_with_size +compress-$(CONFIG_KERNEL_LZMA) = lzma_with_size +compress-$(CONFIG_KERNEL_XZ) = xzkern_with_size +compress-$(CONFIG_KERNEL_LZ4) = lz4_with_size libfdt_objs := fdt_rw.o fdt_ro.o fdt_wip.o fdt.o diff --git a/arch/h8300/boot/compressed/Makefile b/arch/h8300/boot/compressed/Makefile index 5942793f77a0..6ab2fa5ba105 100644 --- a/arch/h8300/boot/compressed/Makefile +++ b/arch/h8300/boot/compressed/Makefile @@ -30,9 +30,11 @@ $(obj)/vmlinux.bin: vmlinux FORCE suffix-$(CONFIG_KERNEL_GZIP) := gzip suffix-$(CONFIG_KERNEL_LZO) := lzo +compress-$(CONFIG_KERNEL_GZIP) := gzip +compress-$(CONFIG_KERNEL_LZO) := lzo_with_size $(obj)/vmlinux.bin.$(suffix-y): $(obj)/vmlinux.bin FORCE - $(call if_changed,$(suffix-y)) + $(call if_changed,$(compress-y)) LDFLAGS_piggy.o := -r --format binary --oformat elf32-h8300-linux -T OBJCOPYFLAGS := -O binary diff --git a/arch/mips/boot/compressed/Makefile b/arch/mips/boot/compressed/Makefile index 705b9e7f8035..8cec6d70bc15 100644 --- a/arch/mips/boot/compressed/Makefile +++ b/arch/mips/boot/compressed/Makefile @@ -80,12 +80,12 @@ $(obj)/vmlinux.bin: $(KBUILD_IMAGE) FORCE $(call if_changed,objcopy) tool_$(CONFIG_KERNEL_GZIP) = gzip -tool_$(CONFIG_KERNEL_BZIP2) = bzip2 -tool_$(CONFIG_KERNEL_LZ4) = lz4 -tool_$(CONFIG_KERNEL_LZMA) = lzma -tool_$(CONFIG_KERNEL_LZO) = lzo -tool_$(CONFIG_KERNEL_XZ) = xzkern -tool_$(CONFIG_KERNEL_ZSTD) = zstd22 +tool_$(CONFIG_KERNEL_BZIP2) = bzip2_with_size +tool_$(CONFIG_KERNEL_LZ4) = lz4_with_size +tool_$(CONFIG_KERNEL_LZMA) = lzma_with_size +tool_$(CONFIG_KERNEL_LZO) = lzo_with_size +tool_$(CONFIG_KERNEL_XZ) = xzkern_with_size +tool_$(CONFIG_KERNEL_ZSTD) = zstd22_with_size targets += vmlinux.bin.z diff --git a/arch/parisc/boot/compressed/Makefile b/arch/parisc/boot/compressed/Makefile index 9fe54878167d..d2283f9fa891 100644 --- a/arch/parisc/boot/compressed/Makefile +++ b/arch/parisc/boot/compressed/Makefile @@ -73,15 +73,15 @@ suffix-$(CONFIG_KERNEL_XZ) := xz $(obj)/vmlinux.bin.gz: $(vmlinux.bin.all-y) FORCE $(call if_changed,gzip) $(obj)/vmlinux.bin.bz2: $(vmlinux.bin.all-y) FORCE - $(call if_changed,bzip2) + $(call if_changed,bzip2_with_size) $(obj)/vmlinux.bin.lz4: $(vmlinux.bin.all-y) FORCE - $(call if_changed,lz4) + $(call if_changed,lz4_with_size) $(obj)/vmlinux.bin.lzma: $(vmlinux.bin.all-y) FORCE - $(call if_changed,lzma) + $(call if_changed,lzma_with_size) $(obj)/vmlinux.bin.lzo: $(vmlinux.bin.all-y) FORCE - $(call if_changed,lzo) + $(call if_changed,lzo_with_size) $(obj)/vmlinux.bin.xz: $(vmlinux.bin.all-y) FORCE - $(call if_changed,xzkern) + $(call if_changed,xzkern_with_size) LDFLAGS_piggy.o := -r --format binary --oformat $(LD_BFD) -T $(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/vmlinux.bin.$(suffix-y) FORCE diff --git a/arch/s390/boot/compressed/Makefile b/arch/s390/boot/compressed/Makefile index 3b860061e84d..8ea880b7c3ec 100644 --- a/arch/s390/boot/compressed/Makefile +++ b/arch/s390/boot/compressed/Makefile @@ -71,17 +71,17 @@ suffix-$(CONFIG_KERNEL_ZSTD) := .zst $(obj)/vmlinux.bin.gz: $(vmlinux.bin.all-y) FORCE $(call if_changed,gzip) $(obj)/vmlinux.bin.bz2: $(vmlinux.bin.all-y) FORCE - $(call if_changed,bzip2) + $(call if_changed,bzip2_with_size) $(obj)/vmlinux.bin.lz4: $(vmlinux.bin.all-y) FORCE - $(call if_changed,lz4) + $(call if_changed,lz4_with_size) $(obj)/vmlinux.bin.lzma: $(vmlinux.bin.all-y) FORCE - $(call if_changed,lzma) + $(call if_changed,lzma_with_size) $(obj)/vmlinux.bin.lzo: $(vmlinux.bin.all-y) FORCE - $(call if_changed,lzo) + $(call if_changed,lzo_with_size) $(obj)/vmlinux.bin.xz: $(vmlinux.bin.all-y) FORCE - $(call if_changed,xzkern) + $(call if_changed,xzkern_with_size) $(obj)/vmlinux.bin.zst: $(vmlinux.bin.all-y) FORCE - $(call if_changed,zstd22) + $(call if_changed,zstd22_with_size) OBJCOPYFLAGS_piggy.o := -I binary -O elf64-s390 -B s390:64-bit --rename-section .data=.vmlinux.bin.compressed $(obj)/piggy.o: $(obj)/vmlinux.bin$(suffix-y) FORCE diff --git a/arch/sh/boot/compressed/Makefile b/arch/sh/boot/compressed/Makefile index 589d2d8a573d..0525d8abdf45 100644 --- a/arch/sh/boot/compressed/Makefile +++ b/arch/sh/boot/compressed/Makefile @@ -58,13 +58,13 @@ vmlinux.bin.all-y := $(obj)/vmlinux.bin $(obj)/vmlinux.bin.gz: $(vmlinux.bin.all-y) FORCE $(call if_changed,gzip) $(obj)/vmlinux.bin.bz2: $(vmlinux.bin.all-y) FORCE - $(call if_changed,bzip2) + $(call if_changed,bzip2_with_size) $(obj)/vmlinux.bin.lzma: $(vmlinux.bin.all-y) FORCE - $(call if_changed,lzma) + $(call if_changed,lzma_with_size) $(obj)/vmlinux.bin.xz: $(vmlinux.bin.all-y) FORCE - $(call if_changed,xzkern) + $(call if_changed,xzkern_with_size) $(obj)/vmlinux.bin.lzo: $(vmlinux.bin.all-y) FORCE - $(call if_changed,lzo) + $(call if_changed,lzo_with_size) OBJCOPYFLAGS += -R .empty_zero_page diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile index e11813646051..6115274fe10f 100644 --- a/arch/x86/boot/compressed/Makefile +++ b/arch/x86/boot/compressed/Makefile @@ -126,17 +126,17 @@ vmlinux.bin.all-$(CONFIG_X86_NEED_RELOCS) += $(obj)/vmlinux.relocs $(obj)/vmlinux.bin.gz: $(vmlinux.bin.all-y) FORCE $(call if_changed,gzip) $(obj)/vmlinux.bin.bz2: $(vmlinux.bin.all-y) FORCE - $(call if_changed,bzip2) + $(call if_changed,bzip2_with_size) $(obj)/vmlinux.bin.lzma: $(vmlinux.bin.all-y) FORCE - $(call if_changed,lzma) + $(call if_changed,lzma_with_size) $(obj)/vmlinux.bin.xz: $(vmlinux.bin.all-y) FORCE - $(call if_changed,xzkern) + $(call if_changed,xzkern_with_size) $(obj)/vmlinux.bin.lzo: $(vmlinux.bin.all-y) FORCE - $(call if_changed,lzo) + $(call if_changed,lzo_with_size) $(obj)/vmlinux.bin.lz4: $(vmlinux.bin.all-y) FORCE - $(call if_changed,lz4) + $(call if_changed,lz4_with_size) $(obj)/vmlinux.bin.zst: $(vmlinux.bin.all-y) FORCE - $(call if_changed,zstd22) + $(call if_changed,zstd22_with_size) suffix-$(CONFIG_KERNEL_GZIP) := gz suffix-$(CONFIG_KERNEL_BZIP2) := bz2 diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 8cb6e688ff84..c0d1d8facfaa 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -398,20 +398,31 @@ printf "%08x\n" $$dec_size | \ ) quiet_cmd_bzip2 = BZIP2 $@ - cmd_bzip2 = { cat $(real-prereqs) | $(KBZIP2) -9; $(size_append); } > $@ + cmd_bzip2 = cat $(real-prereqs) | $(KBZIP2) -9 > $@ + +quiet_cmd_bzip2_with_size = BZIP2 $@ + cmd_bzip2_with_size = { cat $(real-prereqs) | $(KBZIP2) -9; $(size_append); } > $@ # Lzma # --------------------------------------------------------------------------- quiet_cmd_lzma = LZMA $@ - cmd_lzma = { cat $(real-prereqs) | $(LZMA) -9; $(size_append); } > $@ + cmd_lzma = cat $(real-prereqs) | $(LZMA) -9 > $@ + +quiet_cmd_lzma_with_size = LZMA $@ + cmd_lzma_with_size = { cat $(real-prereqs) | $(LZMA) -9; $(size_append); } > $@ quiet_cmd_lzo = LZO $@ - cmd_lzo = { cat $(real-prereqs) | $(KLZOP) -9; $(size_append); } > $@ + cmd_lzo = cat $(real-prereqs) | $(KLZOP) -9 > $@ + +quiet_cmd_lzo_with_size = LZO $@ + cmd_lzo_with_size = { cat $(real-prereqs) | $(KLZOP) -9; $(size_append); } > $@ quiet_cmd_lz4 = LZ4 $@ - cmd_lz4 = { cat $(real-prereqs) | \ - $(LZ4) -l -12 --favor-decSpeed stdin stdout; \ + cmd_lz4 = cat $(real-prereqs) | $(LZ4) -l -12 --favor-decSpeed stdin stdout > $@ + +quiet_cmd_lz4_with_size = LZ4 $@ + cmd_lz4_with_size = { cat $(real-prereqs) | $(LZ4) -l -12 --favor-decSpeed stdin stdout; \ $(size_append); } > $@ # U-Boot mkimage @@ -454,7 +465,10 @@ quiet_cmd_uimage = UIMAGE $@ # big dictionary would increase the memory usage too much in the multi-call # decompression mode. A BCJ filter isn't used either. quiet_cmd_xzkern = XZKERN $@ - cmd_xzkern = { cat $(real-prereqs) | sh $(srctree)/scripts/xz_wrap.sh; \ + cmd_xzkern = cat $(real-prereqs) | sh $(srctree)/scripts/xz_wrap.sh > $@ + +quiet_cmd_xzkern_with_size = XZKERN $@ + cmd_xzkern_with_size = { cat $(real-prereqs) | sh $(srctree)/scripts/xz_wrap.sh; \ $(size_append); } > $@ quiet_cmd_xzmisc = XZMISC $@ @@ -480,7 +494,10 @@ quiet_cmd_zstd = ZSTD $@ cmd_zstd = { cat $(real-prereqs) | $(ZSTD) -19; $(size_append); } > $@ quiet_cmd_zstd22 = ZSTD22 $@ - cmd_zstd22 = { cat $(real-prereqs) | $(ZSTD) -22 --ultra; $(size_append); } > $@ + cmd_zstd22 = cat $(real-prereqs) | $(ZSTD) -22 --ultra > $@ + +quiet_cmd_zstd22_with_size = ZSTD22 $@ + cmd_zstd22_with_size = { cat $(real-prereqs) | $(ZSTD) -22 --ultra; $(size_append); } > $@ # ASM offsets # --------------------------------------------------------------------------- diff --git a/usr/Makefile b/usr/Makefile index b1a81a40eab1..7b89c0175a3a 100644 --- a/usr/Makefile +++ b/usr/Makefile @@ -3,11 +3,6 @@ # kbuild file for usr/ - including initramfs image # -# cmd_bzip2, cmd_lzma, cmd_lzo, cmd_lz4 from scripts/Makefile.lib appends the -# size at the end of the compressed file, which unfortunately does not work -# with unpack_to_rootfs(). Make size_append no-op. -override size_append := : - compress-y := shipped compress-$(CONFIG_INITRAMFS_COMPRESSION_GZIP) := gzip compress-$(CONFIG_INITRAMFS_COMPRESSION_BZIP2) := bzip2 From e43cacd520d177a41ff731138757bc2d32b40446 Mon Sep 17 00:00:00 2001 From: Vivek Kumar Date: Tue, 9 Aug 2022 22:06:15 +0530 Subject: [PATCH 2/5] ANDROID: gki_defconfig: Enable CONFIG_HIBERNATION flag Enable CONFIG_HIBERNATION to add support for hibernation. Bug: 228815136 Change-Id: Ibc7958afce9e2002616dc3e40b0524d98997a798 Signed-off-by: Vivek Kumar --- arch/arm64/configs/gki_defconfig | 1 + arch/x86/configs/gki_defconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index eee6544696be..c453469c328e 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -67,6 +67,7 @@ CONFIG_RANDOMIZE_BASE=y CONFIG_CMDLINE="stack_depot_disable=on kasan.stacktrace=off kvm-arm.mode=protected cgroup_disable=pressure" CONFIG_CMDLINE_EXTEND=y # CONFIG_DMI is not set +CONFIG_HIBERNATION=y CONFIG_PM_WAKELOCKS=y CONFIG_PM_WAKELOCKS_LIMIT=0 # CONFIG_PM_WAKELOCKS_GC is not set diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index a7516335b30b..9bf48a4af90c 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -61,6 +61,7 @@ CONFIG_NR_CPUS=32 CONFIG_EFI=y CONFIG_CMDLINE_BOOL=y CONFIG_CMDLINE="stack_depot_disable=on cgroup_disable=pressure" +CONFIG_HIBERNATION=y CONFIG_PM_WAKELOCKS=y CONFIG_PM_WAKELOCKS_LIMIT=0 # CONFIG_PM_WAKELOCKS_GC is not set From d3dc8c7590b019405572289208a27976309dccab Mon Sep 17 00:00:00 2001 From: Stephen Dickey Date: Wed, 17 Aug 2022 17:03:59 -0700 Subject: [PATCH 3/5] ANDROID: kernel/sched: rebuild_sched_domains export Vendor module needs to rebuild sched domains at boot, in the event that cpufreq initializes the energy model too late. Bug: 242898038 Change-Id: Ifaf1223366ac81c3f3c382dd0f61110fce9c1b20 Signed-off-by: Stephen Dickey --- kernel/cgroup/cpuset.c | 1 + 1 file changed, 1 insertion(+) diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c index a87ac8b62993..a6ba1d73d0e3 100644 --- a/kernel/cgroup/cpuset.c +++ b/kernel/cgroup/cpuset.c @@ -1074,6 +1074,7 @@ void rebuild_sched_domains(void) percpu_up_write(&cpuset_rwsem); cpus_read_unlock(); } +EXPORT_SYMBOL_GPL(rebuild_sched_domains); static int update_cpus_allowed(struct cpuset *cs, struct task_struct *p, const struct cpumask *new_mask) From 92871f1261c787da713804e29e0c982cca01b4c7 Mon Sep 17 00:00:00 2001 From: Stephen Dickey Date: Tue, 23 Aug 2022 09:42:03 -0700 Subject: [PATCH 4/5] ANDROID: GKI: Update Symbol List for Vendor 1 symbol(s) added 'void rebuild_sched_domains()' Bug: 242898038 Change-Id: I70117255e0d2417b9943207834728bc19df55d12 Signed-off-by: Stephen Dickey --- android/abi_gki_aarch64.xml | 230 ++++++++++++++++------------------- android/abi_gki_aarch64_qcom | 1 + 2 files changed, 108 insertions(+), 123 deletions(-) diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml index d0ae3206d2aa..5b357a3d033e 100644 --- a/android/abi_gki_aarch64.xml +++ b/android/abi_gki_aarch64.xml @@ -4243,6 +4243,7 @@ + @@ -6718,7 +6719,7 @@ - + @@ -7280,7 +7281,7 @@ - + @@ -13243,7 +13244,7 @@ - + @@ -13255,7 +13256,7 @@ - + @@ -13282,10 +13283,10 @@ - + - + @@ -14898,7 +14899,7 @@ - + @@ -15716,9 +15717,6 @@ - - - @@ -20031,7 +20029,7 @@ - + @@ -22776,7 +22774,7 @@ - + @@ -25403,7 +25401,7 @@ - + @@ -31482,7 +31480,7 @@ - + @@ -34035,7 +34033,7 @@ - + @@ -44242,7 +44240,7 @@ - + @@ -44916,7 +44914,7 @@ - + @@ -44934,7 +44932,7 @@ - + @@ -46762,7 +46760,7 @@ - + @@ -48532,7 +48530,7 @@ - + @@ -51050,7 +51048,7 @@ - + @@ -56949,7 +56947,7 @@ - + @@ -63038,7 +63036,7 @@ - + @@ -63461,17 +63459,7 @@ - - - - - - - - - - - + @@ -71497,10 +71485,10 @@ - + - + @@ -77126,7 +77114,35 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -77137,7 +77153,7 @@ - + @@ -77145,7 +77161,7 @@ - + @@ -77153,7 +77169,7 @@ - + @@ -77161,7 +77177,7 @@ - + @@ -77169,7 +77185,7 @@ - + @@ -77177,7 +77193,7 @@ - + @@ -77188,7 +77204,7 @@ - + @@ -77196,7 +77212,7 @@ - + @@ -77204,7 +77220,7 @@ - + @@ -77215,7 +77231,7 @@ - + @@ -77226,7 +77242,7 @@ - + @@ -77234,7 +77250,7 @@ - + @@ -77242,7 +77258,7 @@ - + @@ -77250,7 +77266,7 @@ - + @@ -77258,7 +77274,7 @@ - + @@ -77266,7 +77282,7 @@ - + @@ -77274,7 +77290,7 @@ - + @@ -77282,12 +77298,12 @@ - + - + @@ -77313,7 +77329,7 @@ - + @@ -77327,7 +77343,7 @@ - + @@ -77335,7 +77351,7 @@ - + @@ -77343,7 +77359,7 @@ - + @@ -77354,7 +77370,7 @@ - + @@ -77362,7 +77378,7 @@ - + @@ -77370,7 +77386,7 @@ - + @@ -77378,7 +77394,7 @@ - + @@ -77389,7 +77405,7 @@ - + @@ -77397,7 +77413,7 @@ - + @@ -77408,7 +77424,7 @@ - + @@ -77416,7 +77432,7 @@ - + @@ -77424,34 +77440,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -82212,7 +82200,7 @@ - + @@ -92713,7 +92701,7 @@ - + @@ -94613,7 +94601,7 @@ - + @@ -99546,7 +99534,7 @@ - + @@ -99730,10 +99718,10 @@ - + - + @@ -103433,14 +103421,7 @@ - - - - - - - - + @@ -107616,12 +107597,12 @@ - + - + @@ -107630,7 +107611,7 @@ - + @@ -107672,7 +107653,7 @@ - + @@ -107928,7 +107909,7 @@ - + @@ -111943,7 +111924,7 @@ - + @@ -114057,10 +114038,10 @@ - + - + @@ -126292,8 +126273,8 @@ - - + + @@ -126585,9 +126566,9 @@ - - - + + + @@ -142565,6 +142546,9 @@ + + + diff --git a/android/abi_gki_aarch64_qcom b/android/abi_gki_aarch64_qcom index 3fcaa6d865d0..6c4c7f97bafe 100644 --- a/android/abi_gki_aarch64_qcom +++ b/android/abi_gki_aarch64_qcom @@ -1623,6 +1623,7 @@ rcuwait_wake_up rdev_get_drvdata reboot_mode + rebuild_sched_domains reclaim_shmem_address_space refcount_dec_and_lock refcount_dec_not_one From 1f498ff0133c536fe674dc5550bf99bda43ad5dd Mon Sep 17 00:00:00 2001 From: Puneet Yatnal Date: Fri, 16 Sep 2022 15:57:36 +0530 Subject: [PATCH 5/5] ANDROID: abi_gki_aarch64_qcom: Add iio symbol list for qcom synchronize QCOM symbol list in android/abi_gki_aarch64_qcom. No changes happened to the abi_gki_aarch64.xml file. Bug: 247476075 Change-Id: I4eb77f4a048db565d2765256e6a30b64ad608410 Signed-off-by: Puneet Yatnal --- android/abi_gki_aarch64_qcom | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/android/abi_gki_aarch64_qcom b/android/abi_gki_aarch64_qcom index 6c4c7f97bafe..2859a4e0358e 100644 --- a/android/abi_gki_aarch64_qcom +++ b/android/abi_gki_aarch64_qcom @@ -865,8 +865,15 @@ idr_preload idr_remove idr_replace + iio_buffer_init + iio_buffer_put iio_channel_get iio_channel_release + iio_device_attach_buffer + iio_device_claim_direct_mode + iio_device_release_direct_mode + iio_push_event + iio_push_to_buffers iio_read_channel_processed iio_write_channel_raw import_iovec