diff --git a/BUILD.bazel b/BUILD.bazel
index 786d7193b7f8..b148c002b107 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -1,9 +1,18 @@
 # SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2021 The Android Open Source Project
 
+load("@bazel_skylib//rules:write_file.bzl", "write_file")
 load("//build/bazel_common_rules/dist:dist.bzl", "copy_to_dist_dir")
-load("//build/kernel/kleaf:common_kernels.bzl", "define_common_kernels", "define_db845c")
-load("//build/kernel/kleaf:kernel.bzl", "ddk_headers", "kernel_build", "kernel_images", "kernel_modules_install")
+load("//build/kernel/kleaf:common_kernels.bzl", "define_common_kernels")
+load(
+    "//build/kernel/kleaf:kernel.bzl",
+    "ddk_headers",
+    "kernel_abi",
+    "kernel_build",
+    "kernel_images",
+    "kernel_modules_install",
+    "merged_kernel_uapi_headers",
+)
 load(":modules.bzl", "COMMON_GKI_MODULES_LIST")
 
 package(
@@ -31,12 +40,22 @@ _GKI_X86_64_MAKE_GOALS = [
     "modules",
 ]
 
+write_file(
+    name = "gki_system_dlkm_modules",
+    out = "android/gki_system_dlkm_modules",
+    content = COMMON_GKI_MODULES_LIST + [
+        # Ensure new line at the end.
+        "",
+    ],
+)
+
 filegroup(
     name = "aarch64_additional_kmi_symbol_lists",
     srcs = [
         # keep sorted
         "android/abi_gki_aarch64_db845c",
         "android/abi_gki_aarch64_exynos",
+        "android/abi_gki_aarch64_exynosauto",
         "android/abi_gki_aarch64_galaxy",
         "android/abi_gki_aarch64_honor",
         "android/abi_gki_aarch64_imx",
@@ -97,213 +116,345 @@ define_common_kernels(target_configs = {
     },
 })
 
-define_db845c(
-    name = "db845c",
+_DB845C_MODULE_OUTS = [
+    # keep sorted
+    "crypto/michael_mic.ko",
+    "drivers/base/regmap/regmap-sdw.ko",
+    "drivers/base/regmap/regmap-slimbus.ko",
+    "drivers/bus/mhi/host/mhi.ko",
+    "drivers/clk/qcom/clk-qcom.ko",
+    "drivers/clk/qcom/clk-rpmh.ko",
+    "drivers/clk/qcom/clk-spmi-pmic-div.ko",
+    "drivers/clk/qcom/dispcc-sdm845.ko",
+    "drivers/clk/qcom/dispcc-sm8250.ko",
+    "drivers/clk/qcom/gcc-sdm845.ko",
+    "drivers/clk/qcom/gcc-sm8250.ko",
+    "drivers/clk/qcom/gcc-sm8450.ko",
+    "drivers/clk/qcom/gpucc-sdm845.ko",
+    "drivers/clk/qcom/gpucc-sm8250.ko",
+    "drivers/clk/qcom/lpass-gfm-sm8250.ko",
+    "drivers/clk/qcom/videocc-sdm845.ko",
+    "drivers/clk/qcom/videocc-sm8250.ko",
+    "drivers/cpufreq/qcom-cpufreq-hw.ko",
+    "drivers/dma-buf/heaps/system_heap.ko",
+    "drivers/dma/qcom/bam_dma.ko",
+    "drivers/dma/qcom/gpi.ko",
+    "drivers/extcon/extcon-usb-gpio.ko",
+    "drivers/firmware/qcom-scm.ko",
+    "drivers/gpio/gpio-wcd934x.ko",
+    "drivers/gpu/drm/bridge/display-connector.ko",
+    "drivers/gpu/drm/bridge/lontium-lt9611.ko",
+    "drivers/gpu/drm/bridge/lontium-lt9611uxc.ko",
+    "drivers/gpu/drm/display/drm_display_helper.ko",
+    "drivers/gpu/drm/display/drm_dp_aux_bus.ko",
+    "drivers/gpu/drm/msm/msm.ko",
+    "drivers/gpu/drm/scheduler/gpu-sched.ko",
+    "drivers/hwspinlock/qcom_hwspinlock.ko",
+    "drivers/i2c/busses/i2c-designware-core.ko",
+    "drivers/i2c/busses/i2c-designware-platform.ko",
+    "drivers/i2c/busses/i2c-qcom-geni.ko",
+    "drivers/i2c/busses/i2c-qup.ko",
+    "drivers/i2c/busses/i2c-rk3x.ko",
+    "drivers/i2c/i2c-dev.ko",
+    "drivers/i2c/i2c-mux.ko",
+    "drivers/i2c/muxes/i2c-mux-pca954x.ko",
+    "drivers/iio/adc/qcom-spmi-adc5.ko",
+    "drivers/iio/adc/qcom-vadc-common.ko",
+    "drivers/input/misc/pm8941-pwrkey.ko",
+    "drivers/interconnect/qcom/icc-bcm-voter.ko",
+    "drivers/interconnect/qcom/icc-osm-l3.ko",
+    "drivers/interconnect/qcom/icc-rpmh.ko",
+    "drivers/interconnect/qcom/qnoc-sdm845.ko",
+    "drivers/interconnect/qcom/qnoc-sm8250.ko",
+    "drivers/interconnect/qcom/qnoc-sm8450.ko",
+    "drivers/iommu/arm/arm-smmu/arm_smmu.ko",
+    "drivers/irqchip/qcom-pdc.ko",
+    "drivers/leds/rgb/leds-qcom-lpg.ko",
+    "drivers/mailbox/qcom-apcs-ipc-mailbox.ko",
+    "drivers/mailbox/qcom-ipcc.ko",
+    "drivers/media/platform/qcom/venus/venus-core.ko",
+    "drivers/media/platform/qcom/venus/venus-dec.ko",
+    "drivers/media/platform/qcom/venus/venus-enc.ko",
+    "drivers/mfd/qcom-spmi-pmic.ko",
+    "drivers/mfd/wcd934x.ko",
+    "drivers/misc/fastrpc.ko",
+    "drivers/mmc/host/cqhci.ko",
+    "drivers/mmc/host/sdhci-msm.ko",
+    "drivers/net/can/spi/mcp251xfd/mcp251xfd.ko",
+    "drivers/net/wireless/ath/ath.ko",
+    "drivers/net/wireless/ath/ath10k/ath10k_core.ko",
+    "drivers/net/wireless/ath/ath10k/ath10k_pci.ko",
+    "drivers/net/wireless/ath/ath10k/ath10k_snoc.ko",
+    "drivers/net/wireless/ath/ath11k/ath11k.ko",
+    "drivers/net/wireless/ath/ath11k/ath11k_ahb.ko",
+    "drivers/net/wireless/ath/ath11k/ath11k_pci.ko",
+    "drivers/nvmem/nvmem_qfprom.ko",
+    "drivers/phy/qualcomm/phy-qcom-qmp-combo.ko",
+    "drivers/phy/qualcomm/phy-qcom-qmp-pcie.ko",
+    "drivers/phy/qualcomm/phy-qcom-qmp-pcie-msm8996.ko",
+    "drivers/phy/qualcomm/phy-qcom-qmp-ufs.ko",
+    "drivers/phy/qualcomm/phy-qcom-qmp-usb.ko",
+    "drivers/phy/qualcomm/phy-qcom-qusb2.ko",
+    "drivers/phy/qualcomm/phy-qcom-snps-femto-v2.ko",
+    "drivers/phy/qualcomm/phy-qcom-usb-hs.ko",
+    "drivers/pinctrl/qcom/pinctrl-lpass-lpi.ko",
+    "drivers/pinctrl/qcom/pinctrl-msm.ko",
+    "drivers/pinctrl/qcom/pinctrl-sdm845.ko",
+    "drivers/pinctrl/qcom/pinctrl-sm8250.ko",
+    "drivers/pinctrl/qcom/pinctrl-sm8250-lpass-lpi.ko",
+    "drivers/pinctrl/qcom/pinctrl-sm8450.ko",
+    "drivers/pinctrl/qcom/pinctrl-spmi-gpio.ko",
+    "drivers/pinctrl/qcom/pinctrl-spmi-mpp.ko",
+    "drivers/power/reset/qcom-pon.ko",
+    "drivers/power/reset/reboot-mode.ko",
+    "drivers/power/reset/syscon-reboot-mode.ko",
+    "drivers/regulator/gpio-regulator.ko",
+    "drivers/regulator/qcom-rpmh-regulator.ko",
+    "drivers/regulator/qcom_spmi-regulator.ko",
+    "drivers/regulator/qcom_usb_vbus-regulator.ko",
+    "drivers/remoteproc/qcom_common.ko",
+    "drivers/remoteproc/qcom_pil_info.ko",
+    "drivers/remoteproc/qcom_q6v5.ko",
+    "drivers/remoteproc/qcom_q6v5_adsp.ko",
+    "drivers/remoteproc/qcom_q6v5_mss.ko",
+    "drivers/remoteproc/qcom_q6v5_pas.ko",
+    "drivers/remoteproc/qcom_q6v5_wcss.ko",
+    "drivers/remoteproc/qcom_sysmon.ko",
+    "drivers/reset/reset-qcom-aoss.ko",
+    "drivers/reset/reset-qcom-pdc.ko",
+    "drivers/rpmsg/qcom_glink.ko",
+    "drivers/rpmsg/qcom_glink_rpm.ko",
+    "drivers/rpmsg/qcom_glink_smem.ko",
+    "drivers/rpmsg/qcom_smd.ko",
+    "drivers/rpmsg/rpmsg_ns.ko",
+    "drivers/rtc/rtc-pm8xxx.ko",
+    "drivers/slimbus/slim-qcom-ngd-ctrl.ko",
+    "drivers/slimbus/slimbus.ko",
+    "drivers/soc/qcom/apr.ko",
+    "drivers/soc/qcom/cmd-db.ko",
+    "drivers/soc/qcom/cpr.ko",
+    "drivers/soc/qcom/llcc-qcom.ko",
+    "drivers/soc/qcom/mdt_loader.ko",
+    "drivers/soc/qcom/pdr_interface.ko",
+    "drivers/soc/qcom/qcom_aoss.ko",
+    "drivers/soc/qcom/qcom_rpmh.ko",
+    "drivers/soc/qcom/qmi_helpers.ko",
+    "drivers/soc/qcom/rmtfs_mem.ko",
+    "drivers/soc/qcom/rpmhpd.ko",
+    "drivers/soc/qcom/smem.ko",
+    "drivers/soc/qcom/smp2p.ko",
+    "drivers/soc/qcom/smsm.ko",
+    "drivers/soc/qcom/socinfo.ko",
+    "drivers/soc/qcom/spm.ko",
+    "drivers/soundwire/soundwire-bus.ko",
+    "drivers/soundwire/soundwire-qcom.ko",
+    "drivers/spi/spi-geni-qcom.ko",
+    "drivers/spi/spi-pl022.ko",
+    "drivers/spi/spi-qcom-qspi.ko",
+    "drivers/spi/spi-qup.ko",
+    "drivers/spmi/spmi-pmic-arb.ko",
+    "drivers/thermal/qcom/lmh.ko",
+    "drivers/thermal/qcom/qcom-spmi-adc-tm5.ko",
+    "drivers/thermal/qcom/qcom-spmi-temp-alarm.ko",
+    "drivers/thermal/qcom/qcom_tsens.ko",
+    "drivers/tty/serial/msm_serial.ko",
+    "drivers/ufs/host/ufs_qcom.ko",
+    "drivers/usb/common/ulpi.ko",
+    "drivers/usb/host/ohci-hcd.ko",
+    "drivers/usb/host/ohci-pci.ko",
+    "drivers/usb/host/ohci-platform.ko",
+    "drivers/usb/typec/qcom-pmic-typec.ko",
+    "net/mac80211/mac80211.ko",
+    "net/qrtr/qrtr.ko",
+    "net/qrtr/qrtr-mhi.ko",
+    "net/qrtr/qrtr-smd.ko",
+    "net/qrtr/qrtr-tun.ko",
+    "net/wireless/cfg80211.ko",
+    "sound/soc/codecs/snd-soc-dmic.ko",
+    "sound/soc/codecs/snd-soc-hdmi-codec.ko",
+    "sound/soc/codecs/snd-soc-lpass-macro-common.ko",
+    "sound/soc/codecs/snd-soc-lpass-va-macro.ko",
+    "sound/soc/codecs/snd-soc-lpass-wsa-macro.ko",
+    "sound/soc/codecs/snd-soc-max98927.ko",
+    "sound/soc/codecs/snd-soc-rl6231.ko",
+    "sound/soc/codecs/snd-soc-rt5663.ko",
+    "sound/soc/codecs/snd-soc-wcd-mbhc.ko",
+    "sound/soc/codecs/snd-soc-wcd9335.ko",
+    "sound/soc/codecs/snd-soc-wcd934x.ko",
+    "sound/soc/codecs/snd-soc-wsa881x.ko",
+    "sound/soc/qcom/qdsp6/q6adm.ko",
+    "sound/soc/qcom/qdsp6/q6afe.ko",
+    "sound/soc/qcom/qdsp6/q6afe-clocks.ko",
+    "sound/soc/qcom/qdsp6/q6afe-dai.ko",
+    "sound/soc/qcom/qdsp6/q6apm-dai.ko",
+    "sound/soc/qcom/qdsp6/q6apm-lpass-dais.ko",
+    "sound/soc/qcom/qdsp6/q6asm.ko",
+    "sound/soc/qcom/qdsp6/q6asm-dai.ko",
+    "sound/soc/qcom/qdsp6/q6core.ko",
+    "sound/soc/qcom/qdsp6/q6prm.ko",
+    "sound/soc/qcom/qdsp6/q6prm-clocks.ko",
+    "sound/soc/qcom/qdsp6/q6routing.ko",
+    "sound/soc/qcom/qdsp6/snd-q6apm.ko",
+    "sound/soc/qcom/qdsp6/snd-q6dsp-common.ko",
+    "sound/soc/qcom/snd-soc-qcom-common.ko",
+    "sound/soc/qcom/snd-soc-qcom-sdw.ko",
+    "sound/soc/qcom/snd-soc-sdm845.ko",
+    "sound/soc/qcom/snd-soc-sm8250.ko",
+]
+
+_DB845C_WATCHDOG_MODULE_OUTS = [
+    "drivers/watchdog/pm8916_wdt.ko",
+    "drivers/watchdog/qcom-wdt.ko",
+]
+
+kernel_build(
+    name = "db845c_no_kgdb",
     outs = [
         "arch/arm64/boot/dts/qcom/qrb5165-rb5.dtb",
         "arch/arm64/boot/dts/qcom/sdm845-db845c.dtb",
         "arch/arm64/boot/dts/qcom/sm8450-qrd.dtb",
     ],
-    define_abi_targets = True,
-    kmi_symbol_list = "//common:android/abi_gki_aarch64_db845c",
+    # Enable mixed build.
+    base_kernel = ":kernel_aarch64",
+    build_config = "build.config.db845c",
+    collect_unstripped_modules = True,
+    kmi_symbol_list = "android/abi_gki_aarch64_db845c",
     make_goals = [
         "modules",
         "qcom/sdm845-db845c.dtb",
         "qcom/qrb5165-rb5.dtb",
         "qcom/sm8450-qrd.dtb",
     ],
-    module_outs = [
-        # keep sorted
-        "crypto/michael_mic.ko",
-        "drivers/base/regmap/regmap-sdw.ko",
-        "drivers/base/regmap/regmap-slimbus.ko",
-        "drivers/bus/mhi/host/mhi.ko",
-        "drivers/clk/qcom/clk-qcom.ko",
-        "drivers/clk/qcom/clk-rpmh.ko",
-        "drivers/clk/qcom/clk-spmi-pmic-div.ko",
-        "drivers/clk/qcom/dispcc-sdm845.ko",
-        "drivers/clk/qcom/dispcc-sm8250.ko",
-        "drivers/clk/qcom/gcc-sdm845.ko",
-        "drivers/clk/qcom/gcc-sm8250.ko",
-        "drivers/clk/qcom/gcc-sm8450.ko",
-        "drivers/clk/qcom/gpucc-sdm845.ko",
-        "drivers/clk/qcom/gpucc-sm8250.ko",
-        "drivers/clk/qcom/lpass-gfm-sm8250.ko",
-        "drivers/clk/qcom/videocc-sdm845.ko",
-        "drivers/clk/qcom/videocc-sm8250.ko",
-        "drivers/cpufreq/qcom-cpufreq-hw.ko",
-        "drivers/dma-buf/heaps/system_heap.ko",
-        "drivers/dma/qcom/bam_dma.ko",
-        "drivers/dma/qcom/gpi.ko",
-        "drivers/extcon/extcon-usb-gpio.ko",
-        "drivers/firmware/qcom-scm.ko",
-        "drivers/gpio/gpio-wcd934x.ko",
-        "drivers/gpu/drm/bridge/display-connector.ko",
-        "drivers/gpu/drm/bridge/lontium-lt9611.ko",
-        "drivers/gpu/drm/bridge/lontium-lt9611uxc.ko",
-        "drivers/gpu/drm/display/drm_display_helper.ko",
-        "drivers/gpu/drm/display/drm_dp_aux_bus.ko",
-        "drivers/gpu/drm/msm/msm.ko",
-        "drivers/gpu/drm/scheduler/gpu-sched.ko",
-        "drivers/hwspinlock/qcom_hwspinlock.ko",
-        "drivers/i2c/busses/i2c-designware-core.ko",
-        "drivers/i2c/busses/i2c-designware-platform.ko",
-        "drivers/i2c/busses/i2c-qcom-geni.ko",
-        "drivers/i2c/busses/i2c-qup.ko",
-        "drivers/i2c/busses/i2c-rk3x.ko",
-        "drivers/i2c/i2c-dev.ko",
-        "drivers/i2c/i2c-mux.ko",
-        "drivers/i2c/muxes/i2c-mux-pca954x.ko",
-        "drivers/iio/adc/qcom-spmi-adc5.ko",
-        "drivers/iio/adc/qcom-vadc-common.ko",
-        "drivers/input/misc/pm8941-pwrkey.ko",
-        "drivers/interconnect/qcom/icc-bcm-voter.ko",
-        "drivers/interconnect/qcom/icc-osm-l3.ko",
-        "drivers/interconnect/qcom/icc-rpmh.ko",
-        "drivers/interconnect/qcom/qnoc-sdm845.ko",
-        "drivers/interconnect/qcom/qnoc-sm8250.ko",
-        "drivers/interconnect/qcom/qnoc-sm8450.ko",
-        "drivers/iommu/arm/arm-smmu/arm_smmu.ko",
-        "drivers/irqchip/qcom-pdc.ko",
-        "drivers/leds/rgb/leds-qcom-lpg.ko",
-        "drivers/mailbox/qcom-apcs-ipc-mailbox.ko",
-        "drivers/mailbox/qcom-ipcc.ko",
-        "drivers/media/platform/qcom/venus/venus-core.ko",
-        "drivers/media/platform/qcom/venus/venus-dec.ko",
-        "drivers/media/platform/qcom/venus/venus-enc.ko",
-        "drivers/mfd/qcom-spmi-pmic.ko",
-        "drivers/mfd/wcd934x.ko",
-        "drivers/misc/fastrpc.ko",
-        "drivers/mmc/host/cqhci.ko",
-        "drivers/mmc/host/sdhci-msm.ko",
-        "drivers/net/can/spi/mcp251xfd/mcp251xfd.ko",
-        "drivers/net/wireless/ath/ath.ko",
-        "drivers/net/wireless/ath/ath10k/ath10k_core.ko",
-        "drivers/net/wireless/ath/ath10k/ath10k_pci.ko",
-        "drivers/net/wireless/ath/ath10k/ath10k_snoc.ko",
-        "drivers/net/wireless/ath/ath11k/ath11k.ko",
-        "drivers/net/wireless/ath/ath11k/ath11k_ahb.ko",
-        "drivers/net/wireless/ath/ath11k/ath11k_pci.ko",
-        "drivers/nvmem/nvmem_qfprom.ko",
-        "drivers/phy/qualcomm/phy-qcom-qmp-combo.ko",
-        "drivers/phy/qualcomm/phy-qcom-qmp-pcie.ko",
-        "drivers/phy/qualcomm/phy-qcom-qmp-pcie-msm8996.ko",
-        "drivers/phy/qualcomm/phy-qcom-qmp-ufs.ko",
-        "drivers/phy/qualcomm/phy-qcom-qmp-usb.ko",
-        "drivers/phy/qualcomm/phy-qcom-qusb2.ko",
-        "drivers/phy/qualcomm/phy-qcom-snps-femto-v2.ko",
-        "drivers/phy/qualcomm/phy-qcom-usb-hs.ko",
-        "drivers/pinctrl/qcom/pinctrl-lpass-lpi.ko",
-        "drivers/pinctrl/qcom/pinctrl-msm.ko",
-        "drivers/pinctrl/qcom/pinctrl-sdm845.ko",
-        "drivers/pinctrl/qcom/pinctrl-sm8250.ko",
-        "drivers/pinctrl/qcom/pinctrl-sm8250-lpass-lpi.ko",
-        "drivers/pinctrl/qcom/pinctrl-sm8450.ko",
-        "drivers/pinctrl/qcom/pinctrl-spmi-gpio.ko",
-        "drivers/pinctrl/qcom/pinctrl-spmi-mpp.ko",
-        "drivers/power/reset/qcom-pon.ko",
-        "drivers/power/reset/reboot-mode.ko",
-        "drivers/power/reset/syscon-reboot-mode.ko",
-        "drivers/regulator/gpio-regulator.ko",
-        "drivers/regulator/qcom-rpmh-regulator.ko",
-        "drivers/regulator/qcom_spmi-regulator.ko",
-        "drivers/regulator/qcom_usb_vbus-regulator.ko",
-        "drivers/remoteproc/qcom_common.ko",
-        "drivers/remoteproc/qcom_pil_info.ko",
-        "drivers/remoteproc/qcom_q6v5.ko",
-        "drivers/remoteproc/qcom_q6v5_adsp.ko",
-        "drivers/remoteproc/qcom_q6v5_mss.ko",
-        "drivers/remoteproc/qcom_q6v5_pas.ko",
-        "drivers/remoteproc/qcom_q6v5_wcss.ko",
-        "drivers/remoteproc/qcom_sysmon.ko",
-        "drivers/reset/reset-qcom-aoss.ko",
-        "drivers/reset/reset-qcom-pdc.ko",
-        "drivers/rpmsg/qcom_glink.ko",
-        "drivers/rpmsg/qcom_glink_rpm.ko",
-        "drivers/rpmsg/qcom_glink_smem.ko",
-        "drivers/rpmsg/qcom_smd.ko",
-        "drivers/rpmsg/rpmsg_ns.ko",
-        "drivers/rtc/rtc-pm8xxx.ko",
-        "drivers/slimbus/slim-qcom-ngd-ctrl.ko",
-        "drivers/slimbus/slimbus.ko",
-        "drivers/soc/qcom/apr.ko",
-        "drivers/soc/qcom/cmd-db.ko",
-        "drivers/soc/qcom/cpr.ko",
-        "drivers/soc/qcom/llcc-qcom.ko",
-        "drivers/soc/qcom/mdt_loader.ko",
-        "drivers/soc/qcom/pdr_interface.ko",
-        "drivers/soc/qcom/qcom_aoss.ko",
-        "drivers/soc/qcom/qcom_rpmh.ko",
-        "drivers/soc/qcom/qmi_helpers.ko",
-        "drivers/soc/qcom/rmtfs_mem.ko",
-        "drivers/soc/qcom/rpmhpd.ko",
-        "drivers/soc/qcom/smem.ko",
-        "drivers/soc/qcom/smp2p.ko",
-        "drivers/soc/qcom/smsm.ko",
-        "drivers/soc/qcom/socinfo.ko",
-        "drivers/soc/qcom/spm.ko",
-        "drivers/soundwire/soundwire-bus.ko",
-        "drivers/soundwire/soundwire-qcom.ko",
-        "drivers/spi/spi-geni-qcom.ko",
-        "drivers/spi/spi-pl022.ko",
-        "drivers/spi/spi-qcom-qspi.ko",
-        "drivers/spi/spi-qup.ko",
-        "drivers/spmi/spmi-pmic-arb.ko",
-        "drivers/thermal/qcom/lmh.ko",
-        "drivers/thermal/qcom/qcom-spmi-adc-tm5.ko",
-        "drivers/thermal/qcom/qcom-spmi-temp-alarm.ko",
-        "drivers/thermal/qcom/qcom_tsens.ko",
-        "drivers/tty/serial/msm_serial.ko",
-        "drivers/ufs/host/ufs_qcom.ko",
-        "drivers/usb/common/ulpi.ko",
-        "drivers/usb/host/ohci-hcd.ko",
-        "drivers/usb/host/ohci-pci.ko",
-        "drivers/usb/host/ohci-platform.ko",
-        "drivers/usb/typec/qcom-pmic-typec.ko",
-        "drivers/watchdog/pm8916_wdt.ko",
-        "drivers/watchdog/qcom-wdt.ko",
-        "net/mac80211/mac80211.ko",
-        "net/qrtr/qrtr.ko",
-        "net/qrtr/qrtr-mhi.ko",
-        "net/qrtr/qrtr-smd.ko",
-        "net/qrtr/qrtr-tun.ko",
-        "net/wireless/cfg80211.ko",
-        "sound/soc/codecs/snd-soc-dmic.ko",
-        "sound/soc/codecs/snd-soc-hdmi-codec.ko",
-        "sound/soc/codecs/snd-soc-lpass-macro-common.ko",
-        "sound/soc/codecs/snd-soc-lpass-va-macro.ko",
-        "sound/soc/codecs/snd-soc-lpass-wsa-macro.ko",
-        "sound/soc/codecs/snd-soc-max98927.ko",
-        "sound/soc/codecs/snd-soc-rl6231.ko",
-        "sound/soc/codecs/snd-soc-rt5663.ko",
-        "sound/soc/codecs/snd-soc-wcd-mbhc.ko",
-        "sound/soc/codecs/snd-soc-wcd9335.ko",
-        "sound/soc/codecs/snd-soc-wcd934x.ko",
-        "sound/soc/codecs/snd-soc-wsa881x.ko",
-        "sound/soc/qcom/qdsp6/q6adm.ko",
-        "sound/soc/qcom/qdsp6/q6afe.ko",
-        "sound/soc/qcom/qdsp6/q6afe-clocks.ko",
-        "sound/soc/qcom/qdsp6/q6afe-dai.ko",
-        "sound/soc/qcom/qdsp6/q6apm-dai.ko",
-        "sound/soc/qcom/qdsp6/q6apm-lpass-dais.ko",
-        "sound/soc/qcom/qdsp6/q6asm.ko",
-        "sound/soc/qcom/qdsp6/q6asm-dai.ko",
-        "sound/soc/qcom/qdsp6/q6core.ko",
-        "sound/soc/qcom/qdsp6/q6prm.ko",
-        "sound/soc/qcom/qdsp6/q6prm-clocks.ko",
-        "sound/soc/qcom/qdsp6/q6routing.ko",
-        "sound/soc/qcom/qdsp6/snd-q6apm.ko",
-        "sound/soc/qcom/qdsp6/snd-q6dsp-common.ko",
-        "sound/soc/qcom/snd-soc-qcom-common.ko",
-        "sound/soc/qcom/snd-soc-qcom-sdw.ko",
-        "sound/soc/qcom/snd-soc-sdm845.ko",
-        "sound/soc/qcom/snd-soc-sm8250.ko",
-    ],
+    module_outs = _DB845C_MODULE_OUTS + _DB845C_WATCHDOG_MODULE_OUTS,
+    strip_modules = True,
 )
 
+kernel_build(
+    name = "db845c_with_kgdb",
+    outs = [
+        "arch/arm64/boot/dts/qcom/qrb5165-rb5.dtb",
+        "arch/arm64/boot/dts/qcom/sdm845-db845c.dtb",
+        "arch/arm64/boot/dts/qcom/sm8450-qrd.dtb",
+    ],
+    # Enable mixed build.
+    base_kernel = ":kernel_aarch64",
+    build_config = "build.config.db845c",
+    make_goals = [
+        "modules",
+        "qcom/sdm845-db845c.dtb",
+        "qcom/qrb5165-rb5.dtb",
+        "qcom/sm8450-qrd.dtb",
+    ],
+    module_outs = _DB845C_MODULE_OUTS,
+    strip_modules = True,
+)
+
+alias(
+    name = "db845c",
+    actual = select({
+        "//build/kernel/kleaf:kgdb_is_true": "db845c_with_kgdb",
+        "//conditions:default": "db845c_no_kgdb",
+    }),
+)
+
+kernel_abi(
+    name = "db845c_abi",
+    kernel_build = ":db845c",
+    kmi_symbol_list_add_only = True,
+)
+
+kernel_modules_install(
+    name = "db845c_modules_install",
+    kernel_build = ":db845c",
+)
+
+merged_kernel_uapi_headers(
+    name = "db845c_merged_kernel_uapi_headers",
+    kernel_build = ":db845c",
+)
+
+kernel_images(
+    name = "db845c_images",
+    build_initramfs = True,
+    kernel_build = ":db845c",
+    kernel_modules_install = ":db845c_modules_install",
+)
+
+copy_to_dist_dir(
+    name = "db845c_dist",
+    data = [
+        ":db845c",
+        ":db845c_images",
+        ":db845c_modules_install",
+        ":db845c_merged_kernel_uapi_headers",
+        # Mixed build: Additional GKI artifacts.
+        ":kernel_aarch64",
+        ":kernel_aarch64_modules",
+        ":kernel_aarch64_additional_artifacts",
+    ],
+    dist_dir = "out/db845/dist",
+    flat = True,
+    log = "info",
+)
+
+_ROCKPI4_MODULE_OUTS = [
+    # keep sorted
+    "drivers/block/virtio_blk.ko",
+    "drivers/char/hw_random/virtio-rng.ko",
+    "drivers/clk/clk-rk808.ko",
+    "drivers/cpufreq/cpufreq-dt.ko",
+    "drivers/dma/pl330.ko",
+    "drivers/gpu/drm/bridge/analogix/analogix_dp.ko",
+    "drivers/gpu/drm/bridge/synopsys/dw-hdmi.ko",
+    "drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.ko",
+    "drivers/gpu/drm/display/drm_display_helper.ko",
+    "drivers/gpu/drm/drm_dma_helper.ko",
+    "drivers/gpu/drm/rockchip/rockchipdrm.ko",
+    "drivers/i2c/busses/i2c-rk3x.ko",
+    "drivers/iio/adc/rockchip_saradc.ko",
+    "drivers/iio/buffer/industrialio-triggered-buffer.ko",
+    "drivers/iio/buffer/kfifo_buf.ko",
+    "drivers/mfd/rk808.ko",
+    "drivers/mmc/core/pwrseq_simple.ko",
+    "drivers/mmc/host/cqhci.ko",
+    "drivers/mmc/host/dw_mmc.ko",
+    "drivers/mmc/host/dw_mmc-pltfm.ko",
+    "drivers/mmc/host/dw_mmc-rockchip.ko",
+    "drivers/mmc/host/sdhci-of-arasan.ko",
+    "drivers/net/ethernet/stmicro/stmmac/dwmac-rk.ko",
+    "drivers/net/ethernet/stmicro/stmmac/stmmac.ko",
+    "drivers/net/ethernet/stmicro/stmmac/stmmac-platform.ko",
+    "drivers/net/net_failover.ko",
+    "drivers/net/pcs/pcs_xpcs.ko",
+    "drivers/net/virtio_net.ko",
+    "drivers/pci/controller/pcie-rockchip-host.ko",
+    "drivers/phy/rockchip/phy-rockchip-emmc.ko",
+    "drivers/phy/rockchip/phy-rockchip-inno-usb2.ko",
+    "drivers/phy/rockchip/phy-rockchip-pcie.ko",
+    "drivers/phy/rockchip/phy-rockchip-typec.ko",
+    "drivers/pwm/pwm-rockchip.ko",
+    "drivers/regulator/fan53555.ko",
+    "drivers/regulator/pwm-regulator.ko",
+    "drivers/regulator/rk808-regulator.ko",
+    "drivers/rtc/rtc-rk808.ko",
+    "drivers/soc/rockchip/io-domain.ko",
+    "drivers/thermal/rockchip_thermal.ko",
+    "drivers/usb/host/ohci-hcd.ko",
+    "drivers/usb/host/ohci-platform.ko",
+    "drivers/virtio/virtio_pci.ko",
+    "drivers/virtio/virtio_pci_legacy_dev.ko",
+    "drivers/virtio/virtio_pci_modern_dev.ko",
+    "net/core/failover.ko",
+]
+
+_ROCKPI4_WATCHDOG_MODULE_OUTS = [
+    # keep sorted
+    "drivers/watchdog/dw_wdt.ko",
+]
+
 # TODO(b/258259749): Convert rockpi4 to mixed build
 kernel_build(
-    name = "rockpi4",
+    name = "rockpi4_no_kgdb",
     outs = [
         "Image",
         "System.map",
@@ -320,68 +471,51 @@ kernel_build(
         "modules",
         "rk3399-rock-pi-4b.dtb",
     ],
-    module_outs = COMMON_GKI_MODULES_LIST + [
-        # keep sorted
-        "drivers/block/virtio_blk.ko",
-        "drivers/char/hw_random/virtio-rng.ko",
-        "drivers/clk/clk-rk808.ko",
-        "drivers/cpufreq/cpufreq-dt.ko",
-        "drivers/dma/pl330.ko",
-        "drivers/gpu/drm/bridge/analogix/analogix_dp.ko",
-        "drivers/gpu/drm/bridge/synopsys/dw-hdmi.ko",
-        "drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.ko",
-        "drivers/gpu/drm/display/drm_display_helper.ko",
-        "drivers/gpu/drm/drm_dma_helper.ko",
-        "drivers/gpu/drm/rockchip/rockchipdrm.ko",
-        "drivers/i2c/busses/i2c-rk3x.ko",
-        "drivers/iio/adc/rockchip_saradc.ko",
-        "drivers/iio/buffer/industrialio-triggered-buffer.ko",
-        "drivers/iio/buffer/kfifo_buf.ko",
-        "drivers/mfd/rk808.ko",
-        "drivers/mmc/core/pwrseq_simple.ko",
-        "drivers/mmc/host/cqhci.ko",
-        "drivers/mmc/host/dw_mmc.ko",
-        "drivers/mmc/host/dw_mmc-pltfm.ko",
-        "drivers/mmc/host/dw_mmc-rockchip.ko",
-        "drivers/mmc/host/sdhci-of-arasan.ko",
-        "drivers/net/ethernet/stmicro/stmmac/dwmac-rk.ko",
-        "drivers/net/ethernet/stmicro/stmmac/stmmac.ko",
-        "drivers/net/ethernet/stmicro/stmmac/stmmac-platform.ko",
-        "drivers/net/net_failover.ko",
-        "drivers/net/pcs/pcs_xpcs.ko",
-        "drivers/net/virtio_net.ko",
-        "drivers/pci/controller/pcie-rockchip-host.ko",
-        "drivers/phy/rockchip/phy-rockchip-emmc.ko",
-        "drivers/phy/rockchip/phy-rockchip-inno-usb2.ko",
-        "drivers/phy/rockchip/phy-rockchip-pcie.ko",
-        "drivers/phy/rockchip/phy-rockchip-typec.ko",
-        "drivers/pwm/pwm-rockchip.ko",
-        "drivers/regulator/fan53555.ko",
-        "drivers/regulator/pwm-regulator.ko",
-        "drivers/regulator/rk808-regulator.ko",
-        "drivers/rtc/rtc-rk808.ko",
-        "drivers/soc/rockchip/io-domain.ko",
-        "drivers/thermal/rockchip_thermal.ko",
-        "drivers/usb/host/ohci-hcd.ko",
-        "drivers/usb/host/ohci-platform.ko",
-        "drivers/virtio/virtio_pci.ko",
-        "drivers/virtio/virtio_pci_legacy_dev.ko",
-        "drivers/virtio/virtio_pci_modern_dev.ko",
-        "drivers/watchdog/dw_wdt.ko",
-        "net/core/failover.ko",
+    module_outs = COMMON_GKI_MODULES_LIST + _ROCKPI4_MODULE_OUTS + _ROCKPI4_WATCHDOG_MODULE_OUTS,
+    visibility = ["//visibility:private"],
+)
+
+# TODO(b/258259749): Convert rockpi4 to mixed build
+kernel_build(
+    name = "rockpi4_with_kgdb",
+    outs = [
+        "Image",
+        "System.map",
+        "modules.builtin",
+        "modules.builtin.modinfo",
+        "rk3399-rock-pi-4b.dtb",
+        "vmlinux",
+        "vmlinux.symvers",
     ],
+    build_config = "build.config.rockpi4",
+    dtstree = "//common-modules/virtual-device:rockpi4_dts",
+    make_goals = [
+        "Image",
+        "modules",
+        "rk3399-rock-pi-4b.dtb",
+    ],
+    module_outs = COMMON_GKI_MODULES_LIST + _ROCKPI4_MODULE_OUTS,
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "rockpi4",
+    actual = select({
+        "//build/kernel/kleaf:kgdb_is_true": "rockpi4_with_kgdb",
+        "//conditions:default": "rockpi4_no_kgdb",
+    }),
 )
 
 kernel_modules_install(
     name = "rockpi4_modules_install",
-    kernel_build = "//common:rockpi4",
+    kernel_build = ":rockpi4",
 )
 
 kernel_images(
     name = "rockpi4_images",
     build_initramfs = True,
-    kernel_build = "//common:rockpi4",
-    kernel_modules_install = "//common:rockpi4_modules_install",
+    kernel_build = ":rockpi4",
+    kernel_modules_install = ":rockpi4_modules_install",
 )
 
 copy_to_dist_dir(
@@ -434,6 +568,7 @@ kernel_build(
     # Hack to actually check the build.
     # Otherwise, Bazel thinks that there are no output files, and skip building.
     outs = [".config"],
+    arch = "x86_64",
     build_config = "build.config.allmodconfig.x86_64",
     visibility = ["//visibility:private"],
 )
@@ -444,6 +579,7 @@ kernel_build(
     # Hack to actually check the build.
     # Otherwise, Bazel thinks that there are no output files, and skip building.
     outs = [".config"],
+    arch = "arm",
     build_config = "build.config.allmodconfig.arm",
     visibility = ["//visibility:private"],
 )
diff --git a/android/abi_gki_aarch64.stg b/android/abi_gki_aarch64.stg
index 2476e2318697..41f0eecb2f04 100644
--- a/android/abi_gki_aarch64.stg
+++ b/android/abi_gki_aarch64.stg
@@ -96,11 +96,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x2abdbda9
 }
-pointer_reference {
-  id: 0x004b03fc
-  kind: POINTER
-  pointee_type_id: 0x2b6ce96f
-}
 pointer_reference {
   id: 0x004d68b7
   kind: POINTER
@@ -266,11 +261,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x2e029f76
 }
-pointer_reference {
-  id: 0x0110ab48
-  kind: POINTER
-  pointee_type_id: 0x2e024bbc
-}
 pointer_reference {
   id: 0x0113dde3
   kind: POINTER
@@ -561,11 +551,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x2259084f
 }
-pointer_reference {
-  id: 0x02067bf4
-  kind: POINTER
-  pointee_type_id: 0x2259094e
-}
 pointer_reference {
   id: 0x0206e690
   kind: POINTER
@@ -711,6 +696,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x201aebe0
 }
+pointer_reference {
+  id: 0x0297eaff
+  kind: POINTER
+  pointee_type_id: 0x201f4d61
+}
 pointer_reference {
   id: 0x029d7f27
   kind: POINTER
@@ -961,6 +951,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x24777eaf
 }
+pointer_reference {
+  id: 0x03942c7a
+  kind: POINTER
+  pointee_type_id: 0x24105774
+}
 pointer_reference {
   id: 0x03965d61
   kind: POINTER
@@ -1356,11 +1351,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x39a49b1e
 }
-pointer_reference {
-  id: 0x04fb8f54
-  kind: POINTER
-  pointee_type_id: 0x39aedbce
-}
 pointer_reference {
   id: 0x05003835
   kind: POINTER
@@ -1466,11 +1456,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x3f3d7e85
 }
-pointer_reference {
-  id: 0x0561578b
-  kind: POINTER
-  pointee_type_id: 0x3fc5b8b3
-}
 pointer_reference {
   id: 0x0562c566
   kind: POINTER
@@ -1561,11 +1546,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x3c2755a3
 }
-pointer_reference {
-  id: 0x05a52bb0
-  kind: POINTER
-  pointee_type_id: 0x3cd4485f
-}
 pointer_reference {
   id: 0x05a5cdba
   kind: POINTER
@@ -1766,11 +1746,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x33d83070
 }
-pointer_reference {
-  id: 0x0669d6b3
-  kind: POINTER
-  pointee_type_id: 0x33e7bc51
-}
 pointer_reference {
   id: 0x066af716
   kind: POINTER
@@ -1942,9 +1917,9 @@ pointer_reference {
   pointee_type_id: 0x36f1d1fd
 }
 pointer_reference {
-  id: 0x073894f9
+  id: 0x072e5f93
   kind: POINTER
-  pointee_type_id: 0x36a2b57a
+  pointee_type_id: 0x36f998d3
 }
 pointer_reference {
   id: 0x0742e5b4
@@ -2351,11 +2326,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x0942f1ca
 }
-pointer_reference {
-  id: 0x08dcfb76
-  kind: POINTER
-  pointee_type_id: 0x09330b45
-}
 pointer_reference {
   id: 0x08e43718
   kind: POINTER
@@ -2556,11 +2526,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x0cfb4b7c
 }
-pointer_reference {
-  id: 0x09af8dc9
-  kind: POINTER
-  pointee_type_id: 0x0cfed1bb
-}
 pointer_reference {
   id: 0x09bb9b7e
   kind: POINTER
@@ -3006,11 +2971,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x07a79f04
 }
-pointer_reference {
-  id: 0x0b7a0b83
-  kind: POINTER
-  pointee_type_id: 0x07a8c893
-}
 pointer_reference {
   id: 0x0b7c4f67
   kind: POINTER
@@ -3186,11 +3146,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x1a770e0b
 }
-pointer_reference {
-  id: 0x0c0e84bd
-  kind: POINTER
-  pointee_type_id: 0x1a7af469
-}
 pointer_reference {
   id: 0x0c0edcf8
   kind: POINTER
@@ -3211,26 +3166,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x1a1051a0
 }
-pointer_reference {
-  id: 0x0c15b27a
-  kind: POINTER
-  pointee_type_id: 0x1a162f77
-}
 pointer_reference {
   id: 0x0c1663ae
   kind: POINTER
   pointee_type_id: 0x1a196826
 }
-pointer_reference {
-  id: 0x0c166597
-  kind: POINTER
-  pointee_type_id: 0x1a1970c3
-}
-pointer_reference {
-  id: 0x0c16b659
-  kind: POINTER
-  pointee_type_id: 0x1a1a3ffb
-}
 pointer_reference {
   id: 0x0c17a1e0
   kind: POINTER
@@ -3276,11 +3216,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x1ad37d09
 }
-pointer_reference {
-  id: 0x0c252e30
-  kind: POINTER
-  pointee_type_id: 0x1ad45e5f
-}
 pointer_reference {
   id: 0x0c254fa0
   kind: POINTER
@@ -3346,11 +3281,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x1a9663f9
 }
-pointer_reference {
-  id: 0x0c397826
-  kind: POINTER
-  pointee_type_id: 0x1aa50604
-}
 pointer_reference {
   id: 0x0c3ac0b1
   kind: POINTER
@@ -3441,11 +3371,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x1b5d6044
 }
-pointer_reference {
-  id: 0x0c47e7d1
-  kind: POINTER
-  pointee_type_id: 0x1b5f79d9
-}
 pointer_reference {
   id: 0x0c485c36
   kind: POINTER
@@ -3541,11 +3466,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x1b3b0652
 }
-pointer_reference {
-  id: 0x0c5f174a
-  kind: POINTER
-  pointee_type_id: 0x1b3cbbb4
-}
 pointer_reference {
   id: 0x0c5f67dd
   kind: POINTER
@@ -4151,11 +4071,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x19b6a09f
 }
-pointer_reference {
-  id: 0x0cfed1bb
-  kind: POINTER
-  pointee_type_id: 0x19bba071
-}
 pointer_reference {
   id: 0x0cffb85e
   kind: POINTER
@@ -4816,11 +4731,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x1c5ac86a
 }
-pointer_reference {
-  id: 0x0d879e14
-  kind: POINTER
-  pointee_type_id: 0x1c5e9ece
-}
 pointer_reference {
   id: 0x0d881d5f
   kind: POINTER
@@ -4901,11 +4811,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x1c0e7d0f
 }
-pointer_reference {
-  id: 0x0d947d59
-  kind: POINTER
-  pointee_type_id: 0x1c1113fb
-}
 pointer_reference {
   id: 0x0d956bfc
   kind: POINTER
@@ -4916,11 +4821,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x1c155f01
 }
-pointer_reference {
-  id: 0x0d97a2b2
-  kind: POINTER
-  pointee_type_id: 0x1c1e6c54
-}
 pointer_reference {
   id: 0x0d97a54b
   kind: POINTER
@@ -5316,11 +5216,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x1dde0ec8
 }
-pointer_reference {
-  id: 0x0de80fb7
-  kind: POINTER
-  pointee_type_id: 0x1de0d842
-}
 pointer_reference {
   id: 0x0de8f5e2
   kind: POINTER
@@ -5551,11 +5446,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x12d14004
 }
-pointer_reference {
-  id: 0x0e24c2f6
-  kind: POINTER
-  pointee_type_id: 0x12d3ed44
-}
 pointer_reference {
   id: 0x0e2521ae
   kind: POINTER
@@ -6441,11 +6331,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x11c092fa
 }
-pointer_reference {
-  id: 0x0ee038bb
-  kind: POINTER
-  pointee_type_id: 0x11c00471
-}
 pointer_reference {
   id: 0x0ee0d5d1
   kind: POINTER
@@ -7176,11 +7061,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x17b5cc93
 }
-pointer_reference {
-  id: 0x0f7dbeee
-  kind: POINTER
-  pointee_type_id: 0x17b61d24
-}
 pointer_reference {
   id: 0x0f7dcc52
   kind: POINTER
@@ -7306,6 +7186,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x1439657e
 }
+pointer_reference {
+  id: 0x0f9e7cc3
+  kind: POINTER
+  pointee_type_id: 0x14391590
+}
 pointer_reference {
   id: 0x0fa01494
   kind: POINTER
@@ -7361,6 +7246,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x14e1f000
 }
+pointer_reference {
+  id: 0x0faaab57
+  kind: POINTER
+  pointee_type_id: 0x14ea4bc0
+}
 pointer_reference {
   id: 0x0fab66ce
   kind: POINTER
@@ -7371,6 +7261,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x14ee5a71
 }
+pointer_reference {
+  id: 0x0fac28fc
+  kind: POINTER
+  pointee_type_id: 0x14f0456f
+}
 pointer_reference {
   id: 0x0fac5cb3
   kind: POINTER
@@ -7416,6 +7311,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x14b4088f
 }
+pointer_reference {
+  id: 0x0fbe0b29
+  kind: POINTER
+  pointee_type_id: 0x14b8ca3b
+}
 pointer_reference {
   id: 0x0fbe677e
   kind: POINTER
@@ -7611,11 +7511,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x15a2be6d
 }
-pointer_reference {
-  id: 0x0ff8ee0d
-  kind: POINTER
-  pointee_type_id: 0x15a35eaa
-}
 pointer_reference {
   id: 0x0ff8f9af
   kind: POINTER
@@ -7771,11 +7666,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x6b98fc5d
 }
-pointer_reference {
-  id: 0x1076c35e
-  kind: POINTER
-  pointee_type_id: 0x6b9bebe6
-}
 pointer_reference {
   id: 0x1077b920
   kind: POINTER
@@ -7896,11 +7786,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x6f66da8d
 }
-pointer_reference {
-  id: 0x114e61a5
-  kind: POINTER
-  pointee_type_id: 0x6f796009
-}
 pointer_reference {
   id: 0x11575246
   kind: POINTER
@@ -7926,11 +7811,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x6fe4eb19
 }
-pointer_reference {
-  id: 0x116d36b8
-  kind: POINTER
-  pointee_type_id: 0x6ff43c7f
-}
 pointer_reference {
   id: 0x117a8adb
   kind: POINTER
@@ -9616,11 +9496,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x4215681c
 }
-pointer_reference {
-  id: 0x1a1575dd
-  kind: POINTER
-  pointee_type_id: 0x421531e8
-}
 pointer_reference {
   id: 0x1a29773f
   kind: POINTER
@@ -10151,11 +10026,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x590737f8
 }
-pointer_reference {
-  id: 0x1cd322d1
-  kind: POINTER
-  pointee_type_id: 0x590c6dd8
-}
 pointer_reference {
   id: 0x1cdba504
   kind: POINTER
@@ -10341,11 +10211,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x5fd666ab
 }
-pointer_reference {
-  id: 0x1d65d221
-  kind: POINTER
-  pointee_type_id: 0x5fd7ae1b
-}
 pointer_reference {
   id: 0x1d6e33e5
   kind: POINTER
@@ -10726,16 +10591,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x509cd61e
 }
-pointer_reference {
-  id: 0x1eba2d88
-  kind: POINTER
-  pointee_type_id: 0x50a850bc
-}
-pointer_reference {
-  id: 0x1ebe4388
-  kind: POINTER
-  pointee_type_id: 0x50b9e8bd
-}
 pointer_reference {
   id: 0x1ed6200d
   kind: POINTER
@@ -11041,11 +10896,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xaab0d999
 }
-pointer_reference {
-  id: 0x203cd5eb
-  kind: POINTER
-  pointee_type_id: 0xaab3b130
-}
 pointer_reference {
   id: 0x203e14bb
   kind: POINTER
@@ -11081,6 +10931,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xabc38a13
 }
+pointer_reference {
+  id: 0x20699068
+  kind: POINTER
+  pointee_type_id: 0xabe6a73e
+}
 pointer_reference {
   id: 0x206bf782
   kind: POINTER
@@ -11166,11 +11021,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xae401000
 }
-pointer_reference {
-  id: 0x2101ca02
-  kind: POINTER
-  pointee_type_id: 0xae47ce96
-}
 pointer_reference {
   id: 0x2105ad7e
   kind: POINTER
@@ -11281,11 +11131,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xaf54cd38
 }
-pointer_reference {
-  id: 0x2145f7aa
-  kind: POINTER
-  pointee_type_id: 0xaf573835
-}
 pointer_reference {
   id: 0x214fd672
   kind: POINTER
@@ -11476,6 +11321,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xa3652854
 }
+pointer_reference {
+  id: 0x22561ecb
+  kind: POINTER
+  pointee_type_id: 0xa3189db3
+}
 pointer_reference {
   id: 0x2259084f
   kind: POINTER
@@ -11511,6 +11361,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xa3adbe6c
 }
+pointer_reference {
+  id: 0x228954ca
+  kind: POINTER
+  pointee_type_id: 0xa065b5b5
+}
 pointer_reference {
   id: 0x228d1fdb
   kind: POINTER
@@ -12411,6 +12266,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xb60a3d7a
 }
+pointer_reference {
+  id: 0x2718fd24
+  kind: POINTER
+  pointee_type_id: 0xb623120e
+}
 pointer_reference {
   id: 0x2731dd86
   kind: POINTER
@@ -12676,11 +12536,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x89378254
 }
-pointer_reference {
-  id: 0x28e1a5ae
-  kind: POINTER
-  pointee_type_id: 0x89c67026
-}
 pointer_reference {
   id: 0x28e1b8de
   kind: POINTER
@@ -13236,11 +13091,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x8448d7e4
 }
-pointer_reference {
-  id: 0x2b8a97e8
-  kind: POINTER
-  pointee_type_id: 0x846ab93f
-}
 pointer_reference {
   id: 0x2b8cd86f
   kind: POINTER
@@ -13726,11 +13576,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x9aacb204
 }
-pointer_reference {
-  id: 0x2c3b9241
-  kind: POINTER
-  pointee_type_id: 0x9aaeaf98
-}
 pointer_reference {
   id: 0x2c3be0fd
   kind: POINTER
@@ -15146,6 +14991,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x982f20ff
 }
+pointer_reference {
+  id: 0x2c9dd50a
+  kind: POINTER
+  pointee_type_id: 0x9837b2b4
+}
 pointer_reference {
   id: 0x2c9f2c07
   kind: POINTER
@@ -15531,6 +15381,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x9917165a
 }
+pointer_reference {
+  id: 0x2cd8506c
+  kind: POINTER
+  pointee_type_id: 0x9921a72c
+}
 pointer_reference {
   id: 0x2cda29dd
   kind: POINTER
@@ -15701,11 +15556,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x99f3f8f0
 }
-pointer_reference {
-  id: 0x2ced036e
-  kind: POINTER
-  pointee_type_id: 0x99f4eb25
-}
 pointer_reference {
   id: 0x2ced2dfa
   kind: POINTER
@@ -16146,6 +15996,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x9e3f1247
 }
+pointer_reference {
+  id: 0x2d2076df
+  kind: POINTER
+  pointee_type_id: 0x9ec13de2
+}
 pointer_reference {
   id: 0x2d214d35
   kind: POINTER
@@ -16681,11 +16536,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x9fc9e6ec
 }
-pointer_reference {
-  id: 0x2d62ee59
-  kind: POINTER
-  pointee_type_id: 0x9fcb5ff8
-}
 pointer_reference {
   id: 0x2d630d01
   kind: POINTER
@@ -16876,16 +16726,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x9fa3b723
 }
-pointer_reference {
-  id: 0x2d797d9d
-  kind: POINTER
-  pointee_type_id: 0x9fa510e8
-}
-pointer_reference {
-  id: 0x2d797f87
-  kind: POINTER
-  pointee_type_id: 0x9fa51880
-}
 pointer_reference {
   id: 0x2d7ae3a5
   kind: POINTER
@@ -17411,6 +17251,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x9c8d1a40
 }
+pointer_reference {
+  id: 0x2db6fcd8
+  kind: POINTER
+  pointee_type_id: 0x9c9b15ff
+}
 pointer_reference {
   id: 0x2db71389
   kind: POINTER
@@ -17576,6 +17421,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x9d4e4357
 }
+pointer_reference {
+  id: 0x2dc3d72e
+  kind: POINTER
+  pointee_type_id: 0x9d4fba25
+}
 pointer_reference {
   id: 0x2dc3dd18
   kind: POINTER
@@ -18376,6 +18226,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x92233392
 }
+pointer_reference {
+  id: 0x2e19617e
+  kind: POINTER
+  pointee_type_id: 0x92256367
+}
 pointer_reference {
   id: 0x2e19d469
   kind: POINTER
@@ -18396,11 +18251,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x922dbdf3
 }
-pointer_reference {
-  id: 0x2e1b59dd
-  kind: POINTER
-  pointee_type_id: 0x922d81eb
-}
 pointer_reference {
   id: 0x2e1d1da3
   kind: POINTER
@@ -18831,11 +18681,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x93e8e7b0
 }
-pointer_reference {
-  id: 0x2e6ac856
-  kind: POINTER
-  pointee_type_id: 0x93ebc7c6
-}
 pointer_reference {
   id: 0x2e6c8788
   kind: POINTER
@@ -19156,11 +19001,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x90f57fd0
 }
-pointer_reference {
-  id: 0x2eae2318
-  kind: POINTER
-  pointee_type_id: 0x90f86afe
-}
 pointer_reference {
   id: 0x2eaed94d
   kind: POINTER
@@ -19236,11 +19076,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x90adbc21
 }
-pointer_reference {
-  id: 0x2ebb6897
-  kind: POINTER
-  pointee_type_id: 0x90ad44c2
-}
 pointer_reference {
   id: 0x2ebb9477
   kind: POINTER
@@ -19566,11 +19401,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x912037b8
 }
-pointer_reference {
-  id: 0x2ed842b7
-  kind: POINTER
-  pointee_type_id: 0x9121ec42
-}
 pointer_reference {
   id: 0x2ed870a7
   kind: POINTER
@@ -19776,11 +19606,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x91e36693
 }
-pointer_reference {
-  id: 0x2ee94408
-  kind: POINTER
-  pointee_type_id: 0x91e5f6bf
-}
 pointer_reference {
   id: 0x2ee95f08
   kind: POINTER
@@ -20471,16 +20296,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x97012809
 }
-pointer_reference {
-  id: 0x2f509af6
-  kind: POINTER
-  pointee_type_id: 0x97028d47
-}
-pointer_reference {
-  id: 0x2f50a983
-  kind: POINTER
-  pointee_type_id: 0x97024092
-}
 pointer_reference {
   id: 0x2f515c44
   kind: POINTER
@@ -20721,11 +20536,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x97b2b8d0
 }
-pointer_reference {
-  id: 0x2f7f5489
-  kind: POINTER
-  pointee_type_id: 0x97bdb4b8
-}
 pointer_reference {
   id: 0x2f805571
   kind: POINTER
@@ -20741,6 +20551,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x9445ee80
 }
+pointer_reference {
+  id: 0x2f815de7
+  kind: POINTER
+  pointee_type_id: 0x94459100
+}
 pointer_reference {
   id: 0x2f81f017
   kind: POINTER
@@ -22206,11 +22021,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xed640f62
 }
-pointer_reference {
-  id: 0x31cb364e
-  kind: POINTER
-  pointee_type_id: 0xed6c3fa4
-}
 pointer_reference {
   id: 0x31cbe3b8
   kind: POINTER
@@ -22352,9 +22162,9 @@ pointer_reference {
   pointee_type_id: 0xe2cebd77
 }
 pointer_reference {
-  id: 0x322509a0
+  id: 0x3225ac75
   kind: POINTER
-  pointee_type_id: 0xe2d4c01c
+  pointee_type_id: 0xe2d6574a
 }
 pointer_reference {
   id: 0x322c8c4b
@@ -22756,21 +22566,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xe62af112
 }
-pointer_reference {
-  id: 0x331b3d77
-  kind: POINTER
-  pointee_type_id: 0xe62c1341
-}
 pointer_reference {
   id: 0x331b9666
   kind: POINTER
   pointee_type_id: 0xe62ebf07
 }
-pointer_reference {
-  id: 0x331e2c82
-  kind: POINTER
-  pointee_type_id: 0xe6385497
-}
 pointer_reference {
   id: 0x331fc64d
   kind: POINTER
@@ -22886,11 +22686,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xe7643c7c
 }
-pointer_reference {
-  id: 0x334b2254
-  kind: POINTER
-  pointee_type_id: 0xe76c6fcf
-}
 pointer_reference {
   id: 0x334c0532
   kind: POINTER
@@ -22921,6 +22716,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xe70e9a5b
 }
+pointer_reference {
+  id: 0x33558def
+  kind: POINTER
+  pointee_type_id: 0xe716d120
+}
 pointer_reference {
   id: 0x335d253d
   kind: POINTER
@@ -23231,6 +23031,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xfa774e1b
 }
+pointer_reference {
+  id: 0x34104e47
+  kind: POINTER
+  pointee_type_id: 0xfa01df81
+}
 pointer_reference {
   id: 0x3411dbb1
   kind: POINTER
@@ -23281,6 +23086,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xfaeafe16
 }
+pointer_reference {
+  id: 0x3431098c
+  kind: POINTER
+  pointee_type_id: 0xfa84c0ac
+}
 pointer_reference {
   id: 0x34334e6d
   kind: POINTER
@@ -23401,6 +23211,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xfbdf50fc
 }
+pointer_reference {
+  id: 0x346c7967
+  kind: POINTER
+  pointee_type_id: 0xfbf10300
+}
 pointer_reference {
   id: 0x346d8a0d
   kind: POINTER
@@ -23786,11 +23601,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xfe81d85b
 }
-pointer_reference {
-  id: 0x35324dc4
-  kind: POINTER
-  pointee_type_id: 0xfe89d18d
-}
 pointer_reference {
   id: 0x3536f126
   kind: POINTER
@@ -24046,11 +23856,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xfd600427
 }
-pointer_reference {
-  id: 0x35cc4540
-  kind: POINTER
-  pointee_type_id: 0xfd71f39d
-}
 pointer_reference {
   id: 0x35d0c5ee
   kind: POINTER
@@ -24251,11 +24056,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xf2a3d079
 }
-pointer_reference {
-  id: 0x363b9249
-  kind: POINTER
-  pointee_type_id: 0xf2aeafb9
-}
 pointer_reference {
   id: 0x363f43e7
   kind: POINTER
@@ -24391,11 +24191,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xf03663da
 }
-pointer_reference {
-  id: 0x36a2b57a
-  kind: POINTER
-  pointee_type_id: 0xf0ca3374
-}
 pointer_reference {
   id: 0x36a41f54
   kind: POINTER
@@ -24551,11 +24346,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xf18067ea
 }
-pointer_reference {
-  id: 0x36f0529f
-  kind: POINTER
-  pointee_type_id: 0xf181ace2
-}
 pointer_reference {
   id: 0x36f0c7ee
   kind: POINTER
@@ -24986,11 +24776,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xf5228665
 }
-pointer_reference {
-  id: 0x37d96371
-  kind: POINTER
-  pointee_type_id: 0xf5256b58
-}
 pointer_reference {
   id: 0x37dafd0a
   kind: POINTER
@@ -25086,11 +24871,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xf5b0198f
 }
-pointer_reference {
-  id: 0x37fc9b61
-  kind: POINTER
-  pointee_type_id: 0xf5b28b19
-}
 pointer_reference {
   id: 0x37fdbcb1
   kind: POINTER
@@ -25506,11 +25286,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xc9cc379b
 }
-pointer_reference {
-  id: 0x38e86333
-  kind: POINTER
-  pointee_type_id: 0xc9e16a53
-}
 pointer_reference {
   id: 0x38ec2eab
   kind: POINTER
@@ -26347,9 +26122,9 @@ pointer_reference {
   pointee_type_id: 0xc60bc51e
 }
 pointer_reference {
-  id: 0x3b15fe1d
+  id: 0x3b19594b
   kind: POINTER
-  pointee_type_id: 0xc6171ee9
+  pointee_type_id: 0xc62583b0
 }
 pointer_reference {
   id: 0x3b19ae48
@@ -26616,16 +26391,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xc48494d4
 }
-pointer_reference {
-  id: 0x3bc2a7f0
-  kind: POINTER
-  pointee_type_id: 0xc54a795e
-}
-pointer_reference {
-  id: 0x3bc62241
-  kind: POINTER
-  pointee_type_id: 0xc5586f9b
-}
 pointer_reference {
   id: 0x3bc90e1f
   kind: POINTER
@@ -26636,11 +26401,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xc5640d2a
 }
-pointer_reference {
-  id: 0x3bcbf8c5
-  kind: POINTER
-  pointee_type_id: 0xc56f0588
-}
 pointer_reference {
   id: 0x3bccaec1
   kind: POINTER
@@ -26901,11 +26661,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xdbcfcd34
 }
-pointer_reference {
-  id: 0x3c6958c4
-  kind: POINTER
-  pointee_type_id: 0xdbe5858f
-}
 pointer_reference {
   id: 0x3c6a6bbc
   kind: POINTER
@@ -26936,11 +26691,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xd84f47eb
 }
-pointer_reference {
-  id: 0x3c88afe7
-  kind: POINTER
-  pointee_type_id: 0xd8625902
-}
 pointer_reference {
   id: 0x3c88bbfa
   kind: POINTER
@@ -27046,6 +26796,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xd96df1ac
 }
+pointer_reference {
+  id: 0x3ccb45d9
+  kind: POINTER
+  pointee_type_id: 0xd96df1fa
+}
 pointer_reference {
   id: 0x3ccbbab7
   kind: POINTER
@@ -27166,11 +26921,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xdf713fb7
 }
-pointer_reference {
-  id: 0x3d5133eb
-  kind: POINTER
-  pointee_type_id: 0xdf042930
-}
 pointer_reference {
   id: 0x3d551c03
   kind: POINTER
@@ -27316,11 +27066,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xdcc24511
 }
-pointer_reference {
-  id: 0x3da548f2
-  kind: POINTER
-  pointee_type_id: 0xdcd5c554
-}
 pointer_reference {
   id: 0x3da9f5e9
   kind: POINTER
@@ -27616,11 +27361,6 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xd298e888
 }
-pointer_reference {
-  id: 0x3e3a4a9e
-  kind: POINTER
-  pointee_type_id: 0xd2a9cce7
-}
 pointer_reference {
   id: 0x3e44cfd7
   kind: POINTER
@@ -27882,9 +27622,9 @@ pointer_reference {
   pointee_type_id: 0xd1f5399e
 }
 pointer_reference {
-  id: 0x3ef473d4
+  id: 0x3eee6a0e
   kind: POINTER
-  pointee_type_id: 0xd19129ce
+  pointee_type_id: 0xd1f94ea7
 }
 pointer_reference {
   id: 0x3ef55b88
@@ -27931,6 +27671,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xd649efa3
 }
+pointer_reference {
+  id: 0x3f055728
+  kind: POINTER
+  pointee_type_id: 0xd655ba3d
+}
 pointer_reference {
   id: 0x3f063da2
   kind: POINTER
@@ -28186,6 +27931,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xd50238af
 }
+pointer_reference {
+  id: 0x3fd547b8
+  kind: POINTER
+  pointee_type_id: 0xd515f87f
+}
 pointer_reference {
   id: 0x3fdb8740
   kind: POINTER
@@ -28996,11 +28746,6 @@ typedef {
   name: "gid_t"
   referred_type_id: 0x012a99e5
 }
-typedef {
-  id: 0x1b4ba19a
-  name: "gpa_t"
-  referred_type_id: 0x92233392
-}
 typedef {
   id: 0xa98dedee
   name: "gro_result_t"
@@ -29201,16 +28946,6 @@ typedef {
   name: "kvm_pfn_t"
   referred_type_id: 0x5db53aa1
 }
-typedef {
-  id: 0x7eadb465
-  name: "kvm_pgtable_force_pte_cb_t"
-  referred_type_id: 0x3c88afe7
-}
-typedef {
-  id: 0xf2ecf779
-  name: "kvm_pgtable_pte_is_counted_cb_t"
-  referred_type_id: 0x331e2c82
-}
 typedef {
   id: 0x6ee0bcff
   name: "kvm_pte_t"
@@ -29461,11 +29196,6 @@ typedef {
   name: "pid_t"
   referred_type_id: 0x763389c7
 }
-typedef {
-  id: 0x16864222
-  name: "pkvm_handle_t"
-  referred_type_id: 0x4585663f
-}
 typedef {
   id: 0xf017819f
   name: "pm_message_t"
@@ -30541,21 +30271,11 @@ qualified {
   qualifier: CONST
   qualified_type_id: 0x64a438fc
 }
-qualified {
-  id: 0xc54a795e
-  qualifier: CONST
-  qualified_type_id: 0x656e53f1
-}
 qualified {
   id: 0xc5640d2a
   qualifier: CONST
   qualified_type_id: 0x65d78220
 }
-qualified {
-  id: 0xc56f0588
-  qualifier: CONST
-  qualified_type_id: 0x65fba0a9
-}
 qualified {
   id: 0xc5725d9a
   qualifier: CONST
@@ -30591,6 +30311,11 @@ qualified {
   qualifier: CONST
   qualified_type_id: 0x6798ba36
 }
+qualified {
+  id: 0xc62583b0
+  qualifier: CONST
+  qualified_type_id: 0x68d1b84a
+}
 qualified {
   id: 0xc6265fbd
   qualifier: CONST
@@ -31281,11 +31006,6 @@ qualified {
   qualifier: CONST
   qualified_type_id: 0x399c459b
 }
-qualified {
-  id: 0xd2a9cce7
-  qualifier: CONST
-  qualified_type_id: 0x3ae08515
-}
 qualified {
   id: 0xd2d7132a
   qualifier: CONST
@@ -31401,6 +31121,11 @@ qualified {
   qualifier: CONST
   qualified_type_id: 0x244f5434
 }
+qualified {
+  id: 0xd515f87f
+  qualifier: CONST
+  qualified_type_id: 0x24105774
+}
 qualified {
   id: 0xd52ecd52
   qualifier: CONST
@@ -32696,11 +32421,6 @@ qualified {
   qualifier: CONST
   qualified_type_id: 0xc5d78b03
 }
-qualified {
-  id: 0xed6c3fa4
-  qualifier: CONST
-  qualified_type_id: 0xc5f74818
-}
 qualified {
   id: 0xed856aa8
   qualifier: CONST
@@ -33006,11 +32726,6 @@ qualified {
   qualifier: CONST
   qualified_type_id: 0xa4cdaf1d
 }
-qualified {
-  id: 0xf5256b58
-  qualifier: CONST
-  qualified_type_id: 0xa4d21be9
-}
 qualified {
   id: 0xf52b12b6
   qualifier: CONST
@@ -33061,11 +32776,6 @@ qualified {
   qualifier: CONST
   qualified_type_id: 0xa687d0b4
 }
-qualified {
-  id: 0xf5b28b19
-  qualifier: CONST
-  qualified_type_id: 0xa68d9aed
-}
 qualified {
   id: 0xf5d07691
   qualifier: CONST
@@ -33396,6 +33106,11 @@ qualified {
   qualifier: CONST
   qualified_type_id: 0x9f3af57a
 }
+qualified {
+  id: 0xfbf10300
+  qualifier: CONST
+  qualified_type_id: 0x9f83ba8a
+}
 qualified {
   id: 0xfbf6cea8
   qualifier: CONST
@@ -33695,11 +33410,6 @@ array {
   number_of_elements: 56
   element_type_id: 0x384f7d7c
 }
-array {
-  id: 0x01e90d51
-  number_of_elements: 64
-  element_type_id: 0xc9082b19
-}
 array {
   id: 0x01ef5f77
   number_of_elements: 80
@@ -34450,11 +34160,6 @@ array {
   number_of_elements: 7
   element_type_id: 0xb3e7bac9
 }
-array {
-  id: 0x4449c48b
-  number_of_elements: 32
-  element_type_id: 0x421531e8
-}
 array {
   id: 0x4472656b
   number_of_elements: 16
@@ -34470,11 +34175,6 @@ array {
   number_of_elements: 2
   element_type_id: 0xa047de54
 }
-array {
-  id: 0x44c5e79a
-  number_of_elements: 32
-  element_type_id: 0x4025bdaf
-}
 array {
   id: 0x44ef98e3
   number_of_elements: 16
@@ -34550,11 +34250,6 @@ array {
   number_of_elements: 2
   element_type_id: 0x99300838
 }
-array {
-  id: 0x4b27ac3d
-  number_of_elements: 16
-  element_type_id: 0x1c51bab0
-}
 array {
   id: 0x4b395ad9
   number_of_elements: 256
@@ -34590,11 +34285,6 @@ array {
   number_of_elements: 256
   element_type_id: 0xc9082b19
 }
-array {
-  id: 0x4c3e1687
-  number_of_elements: 2
-  element_type_id: 0x825d5993
-}
 array {
   id: 0x4c4654d5
   number_of_elements: 7
@@ -34725,11 +34415,6 @@ array {
   number_of_elements: 10
   element_type_id: 0x92233392
 }
-array {
-  id: 0x53bf0b06
-  number_of_elements: 32
-  element_type_id: 0x1dce0fdd
-}
 array {
   id: 0x5408a5f2
   number_of_elements: 2
@@ -34875,11 +34560,6 @@ array {
   number_of_elements: 32
   element_type_id: 0x21069feb
 }
-array {
-  id: 0x5d2762c3
-  number_of_elements: 2
-  element_type_id: 0xc6388883
-}
 array {
   id: 0x5e18785f
   number_of_elements: 16
@@ -35155,11 +34835,6 @@ array {
   number_of_elements: 2
   element_type_id: 0x064d6086
 }
-array {
-  id: 0x6d4372c7
-  number_of_elements: 2
-  element_type_id: 0x07a8c893
-}
 array {
   id: 0x6d472730
   number_of_elements: 32
@@ -35215,21 +34890,11 @@ array {
   number_of_elements: 7
   element_type_id: 0x1e18ac15
 }
-array {
-  id: 0x6fb0151f
-  number_of_elements: 32
-  element_type_id: 0xedf277ba
-}
 array {
   id: 0x6fde7229
   number_of_elements: 2
   element_type_id: 0x0ddccb29
 }
-array {
-  id: 0x70444415
-  number_of_elements: 32
-  element_type_id: 0x92233392
-}
 array {
   id: 0x70bb96a6
   number_of_elements: 7
@@ -35335,11 +35000,6 @@ array {
   number_of_elements: 2
   element_type_id: 0x6bc0e8a0
 }
-array {
-  id: 0x774f5f7f
-  number_of_elements: 16
-  element_type_id: 0xedf277ba
-}
 array {
   id: 0x77f6971e
   number_of_elements: 2
@@ -35545,6 +35205,11 @@ array {
   number_of_elements: 31
   element_type_id: 0x3fcbf304
 }
+array {
+  id: 0x8483d98a
+  number_of_elements: 6
+  element_type_id: 0x948a2888
+}
 array {
   id: 0x84f80ecf
   number_of_elements: 6
@@ -35725,11 +35390,6 @@ array {
   number_of_elements: 4
   element_type_id: 0x0ab21434
 }
-array {
-  id: 0x8f5ceaee
-  number_of_elements: 4
-  element_type_id: 0x0c47e7d1
-}
 array {
   id: 0x8fc9368a
   number_of_elements: 1
@@ -35740,11 +35400,6 @@ array {
   number_of_elements: 4
   element_type_id: 0x0ee0f933
 }
-array {
-  id: 0x904f12e1
-  number_of_elements: 9
-  element_type_id: 0xedf277ba
-}
 array {
   id: 0x91412a6e
   number_of_elements: 1
@@ -35810,11 +35465,6 @@ array {
   number_of_elements: 6
   element_type_id: 0xdce3c92e
 }
-array {
-  id: 0x9819cf84
-  number_of_elements: 1
-  element_type_id: 0xb740a439
-}
 array {
   id: 0x982afc69
   number_of_elements: 6
@@ -35835,11 +35485,6 @@ array {
   number_of_elements: 31
   element_type_id: 0x58757be8
 }
-array {
-  id: 0x9addce46
-  number_of_elements: 6
-  element_type_id: 0xedf277ba
-}
 array {
   id: 0x9b2d4673
   number_of_elements: 4
@@ -36100,11 +35745,6 @@ array {
   number_of_elements: 2048
   element_type_id: 0xb3e7bac9
 }
-array {
-  id: 0xae993a3b
-  number_of_elements: 1
-  element_type_id: 0x6d4372c7
-}
 array {
   id: 0xaf023c73
   number_of_elements: 1
@@ -36200,11 +35840,6 @@ array {
   number_of_elements: 6
   element_type_id: 0x5d8155a5
 }
-array {
-  id: 0xb717646a
-  number_of_elements: 1
-  element_type_id: 0x0b7a0b83
-}
 array {
   id: 0xb7237aa3
   number_of_elements: 1
@@ -36215,11 +35850,6 @@ array {
   number_of_elements: 4
   element_type_id: 0xedf277ba
 }
-array {
-  id: 0xb740a439
-  number_of_elements: 988
-  element_type_id: 0x6720d32f
-}
 array {
   id: 0xb77dc255
   number_of_elements: 31
@@ -36664,10 +36294,6 @@ array {
   number_of_elements: 14
   element_type_id: 0x384f7d7c
 }
-array {
-  id: 0xd2fe57e5
-  element_type_id: 0x5b1f6457
-}
 array {
   id: 0xd3067a59
   number_of_elements: 8
@@ -36681,10 +36307,6 @@ array {
   id: 0xd359db99
   element_type_id: 0x5d8155a5
 }
-array {
-  id: 0xd39aff0d
-  element_type_id: 0x5e8dc7f4
-}
 array {
   id: 0xd3d96d30
   number_of_elements: 8
@@ -36751,11 +36373,6 @@ array {
   id: 0xd9c2196b
   element_type_id: 0x77ee5e6d
 }
-array {
-  id: 0xda277458
-  number_of_elements: 15
-  element_type_id: 0xb3e7bac9
-}
 array {
   id: 0xda50e95d
   number_of_elements: 42
@@ -37263,10 +36880,6 @@ array {
   number_of_elements: 5
   element_type_id: 0x5a38311c
 }
-array {
-  id: 0xffdb6969
-  element_type_id: 0xef8b9e67
-}
 member {
   id: 0x205fa3df
   type_id: 0x0e50ff6f
@@ -37346,10 +36959,6 @@ member {
   id: 0x22b4d212
   type_id: 0x05fd3859
 }
-member {
-  id: 0x22c0fbbc
-  type_id: 0x042d9ee3
-}
 member {
   id: 0x22ce0593
   type_id: 0x0416665f
@@ -37362,10 +36971,6 @@ member {
   id: 0x230f36dc
   type_id: 0x0312ab60
 }
-member {
-  id: 0x233f54d1
-  type_id: 0x03d32356
-}
 member {
   id: 0x2380a48f
   type_id: 0x012ce22f
@@ -37653,10 +37258,6 @@ member {
   id: 0x2d400d39
   type_id: 0x3a2e44f7
 }
-member {
-  id: 0x2d6cb85c
-  type_id: 0x3a9c9162
-}
 member {
   id: 0x2d71506c
   type_id: 0x3aeb31a3
@@ -37813,11 +37414,6 @@ member {
   type_id: 0x4db29c07
   offset: 3584
 }
-member {
-  id: 0x30c18aff
-  type_id: 0x4c287de0
-  offset: 96
-}
 member {
   id: 0x30d0761f
   type_id: 0x4c6fa86e
@@ -37976,11 +37572,6 @@ member {
   type_id: 0x44e0bbd2
   offset: 512
 }
-member {
-  id: 0x32f872a3
-  type_id: 0x44cf9d95
-  offset: 128
-}
 member {
   id: 0x32f92d43
   type_id: 0x44cad962
@@ -38171,11 +37762,6 @@ member {
   type_id: 0x5e68e6b1
   offset: 64
 }
-member {
-  id: 0x345b10fd
-  type_id: 0x5e422cfb
-  offset: 320
-}
 member {
   id: 0x345b12e5
   type_id: 0x5e4227fb
@@ -38228,11 +37814,6 @@ member {
   id: 0x34a07297
   type_id: 0x5dafba4f
 }
-member {
-  id: 0x34a3e933
-  type_id: 0x5da1f3d6
-  offset: 128
-}
 member {
   id: 0x34a73897
   type_id: 0x5db28e31
@@ -38295,21 +37876,6 @@ member {
   id: 0x3522cd70
   type_id: 0x5ba545d0
 }
-member {
-  id: 0x353b064f
-  type_id: 0x5bc27631
-  offset: 320
-}
-member {
-  id: 0x353d48f5
-  type_id: 0x5bdb70e0
-  offset: 192
-}
-member {
-  id: 0x3551435a
-  type_id: 0x5a6b6efc
-  offset: 64
-}
 member {
   id: 0x3568359b
   type_id: 0x5a8e8177
@@ -38432,16 +37998,6 @@ member {
   type_id: 0x54b76778
   offset: 64
 }
-member {
-  id: 0x36fb8f0a
-  type_id: 0x54c04e96
-  offset: 256
-}
-member {
-  id: 0x371515be
-  type_id: 0x537a3f0f
-  offset: 640
-}
 member {
   id: 0x3726cc57
   type_id: 0x53b5414d
@@ -38492,11 +38048,6 @@ member {
   id: 0x37f149da
   type_id: 0x50eb577a
 }
-member {
-  id: 0x37f52c8e
-  type_id: 0x50fafc25
-  offset: 66880
-}
 member {
   id: 0x3801ddd5
   type_id: 0x6f2909ad
@@ -38578,11 +38129,6 @@ member {
   type_id: 0x69066ca6
   offset: 64
 }
-member {
-  id: 0x398b7926
-  type_id: 0x6903870d
-  offset: 64
-}
 member {
   id: 0x39a6859a
   type_id: 0x69b475fe
@@ -38687,10 +38233,6 @@ member {
   type_id: 0x63db5ef9
   offset: 64
 }
-member {
-  id: 0x3b3d55bb
-  type_id: 0x63db26fc
-}
 member {
   id: 0x3b65917c
   type_id: 0x62b835e0
@@ -39025,11 +38567,6 @@ member {
   type_id: 0x74c3ae4c
   offset: 1024
 }
-member {
-  id: 0x3f0e6b4d
-  type_id: 0x7317df8a
-  offset: 256
-}
 member {
   id: 0x3f155004
   type_id: 0x737b0daa
@@ -39142,10 +38679,6 @@ member {
   id: 0x3fd6133e
   type_id: 0x70763ce9
 }
-member {
-  id: 0x3fee6444
-  type_id: 0x7097e100
-}
 member {
   id: 0x3ff2757d
   type_id: 0x70e783e8
@@ -39562,12 +39095,6 @@ member {
   name: "_80"
   type_id: 0x312fa971
 }
-member {
-  id: 0xfc4129b1
-  name: "____srcu_idx"
-  type_id: 0x6720d32f
-  offset: 352
-}
 member {
   id: 0x36aedf4a
   name: "__align"
@@ -39719,9 +39246,9 @@ member {
   offset: 576
 }
 member {
-  id: 0x983c1d18
+  id: 0x982c7c86
   name: "__hyp_running_vcpu"
-  type_id: 0x08dcfb76
+  type_id: 0x18bd6530
   offset: 14528
 }
 member {
@@ -39757,12 +39284,6 @@ member {
   type_id: 0x1892e9b4
   offset: 8
 }
-member {
-  id: 0xf0778c7b
-  name: "__memslots"
-  type_id: 0xae993a3b
-  offset: 960
-}
 member {
   id: 0x12f2249e
   name: "__multicast"
@@ -40782,12 +40303,6 @@ member {
   type_id: 0x0baa70a7
   offset: 32
 }
-member {
-  id: 0xb41bc738
-  name: "abi_rev"
-  type_id: 0xc9082b19
-  offset: 1152
-}
 member {
   id: 0x370a3acc
   name: "abort"
@@ -41242,12 +40757,6 @@ member {
   type_id: 0x4585663f
   offset: 384
 }
-member {
-  id: 0xcb7a7a49
-  name: "access_flags"
-  type_id: 0x4585663f
-  offset: 96
-}
 member {
   id: 0x4d798a84
   name: "access_memory"
@@ -41510,12 +41019,6 @@ member {
   type_id: 0xe62ebf07
   offset: 128
 }
-member {
-  id: 0x1cafacfd
-  name: "acpi_cpuid"
-  type_id: 0x33756485
-  offset: 4416
-}
 member {
   id: 0x4ff7664a
   name: "acpi_match"
@@ -41814,12 +41317,6 @@ member {
   name: "active"
   type_id: 0x6d7f5ff6
 }
-member {
-  id: 0x224f240b
-  name: "active"
-  type_id: 0x6d7f5ff6
-  offset: 496
-}
 member {
   id: 0x224f2849
   name: "active"
@@ -42111,12 +41608,6 @@ member {
   type_id: 0x33756485
   offset: 128
 }
-member {
-  id: 0x8f0fcc44
-  name: "active_source"
-  type_id: 0x295c7202
-  offset: 680
-}
 member {
   id: 0xfa0d6c00
   name: "active_spin_lock"
@@ -42442,11 +41933,6 @@ member {
   type_id: 0x18bd6530
   offset: 192
 }
-member {
-  id: 0x243694c7
-  name: "addr"
-  type_id: 0x1b4ba19a
-}
 member {
   id: 0x2440fa86
   name: "addr"
@@ -43684,6 +43170,12 @@ member {
   type_id: 0x1fe7f40f
   offset: 64
 }
+member {
+  id: 0x3f6534a2
+  name: "alloc_container_ctx"
+  type_id: 0x0fac28fc
+  offset: 576
+}
 member {
   id: 0x21677719
   name: "alloc_contig"
@@ -43696,6 +43188,12 @@ member {
   type_id: 0x914dbfdc
   offset: 256
 }
+member {
+  id: 0x50156eb5
+  name: "alloc_dcbaa"
+  type_id: 0x3f055728
+  offset: 192
+}
 member {
   id: 0xfd6395d5
   name: "alloc_desc_sz"
@@ -43791,12 +43289,6 @@ member {
   type_id: 0x1a12b190
   offset: 320
 }
-member {
-  id: 0xaf409590
-  name: "alloc_notifier"
-  type_id: 0x004b03fc
-  offset: 512
-}
 member {
   id: 0x75fd54b0
   name: "alloc_pages"
@@ -43833,6 +43325,12 @@ member {
   type_id: 0x92233392
   offset: 768
 }
+member {
+  id: 0xb2953bfa
+  name: "alloc_transfer_ring"
+  type_id: 0x20699068
+  offset: 320
+}
 member {
   id: 0x7fa1c349
   name: "allocate"
@@ -45516,6 +45014,12 @@ member {
   type_id: 0x92233392
   offset: 5184
 }
+member {
+  id: 0x63760909
+  name: "android_kabi_reserved2"
+  type_id: 0x92233392
+  offset: 256
+}
 member {
   id: 0x6376090e
   name: "android_kabi_reserved2"
@@ -45845,12 +45349,6 @@ member {
   type_id: 0x92233392
   offset: 8896
 }
-member {
-  id: 0xac8941f8
-  name: "android_kabi_reserved3"
-  type_id: 0x92233392
-  offset: 768
-}
 member {
   id: 0xac894244
   name: "android_kabi_reserved3"
@@ -46115,6 +45613,12 @@ member {
   type_id: 0x92233392
   offset: 1728
 }
+member {
+  id: 0xac894e91
+  name: "android_kabi_reserved3"
+  type_id: 0x92233392
+  offset: 320
+}
 member {
   id: 0xac894e97
   name: "android_kabi_reserved3"
@@ -46277,6 +45781,12 @@ member {
   type_id: 0x92233392
   offset: 4672
 }
+member {
+  id: 0xe0f635d9
+  name: "android_kabi_reserved4"
+  type_id: 0x92233392
+  offset: 384
+}
 member {
   id: 0xe0f635ee
   name: "android_kabi_reserved4"
@@ -46307,12 +45817,6 @@ member {
   type_id: 0x92233392
   offset: 1664
 }
-member {
-  id: 0xe0f637f1
-  name: "android_kabi_reserved4"
-  type_id: 0x92233392
-  offset: 832
-}
 member {
   id: 0xe0f6381a
   name: "android_kabi_reserved4"
@@ -46960,24 +46464,6 @@ member {
   name: "ap_addr"
   type_id: 0xf90dfce8
 }
-member {
-  id: 0xd96ad022
-  name: "ap_list"
-  type_id: 0xd3c80119
-  offset: 192
-}
-member {
-  id: 0x18b67de8
-  name: "ap_list_head"
-  type_id: 0xd3c80119
-  offset: 31232
-}
-member {
-  id: 0xc8f35c78
-  name: "ap_list_lock"
-  type_id: 0xc8b17aa7
-  offset: 31168
-}
 member {
   id: 0x6892c863
   name: "ap_sme_capa"
@@ -47057,12 +46543,6 @@ member {
   type_id: 0xe93b4eda
   offset: 128
 }
-member {
-  id: 0x5ba521f2
-  name: "apic_base"
-  type_id: 0xedf277ba
-  offset: 192
-}
 member {
   id: 0x5581205d
   name: "apoll"
@@ -47163,53 +46643,24 @@ member {
   offset: 1730
   bitsize: 1
 }
-member {
-  id: 0x4a120f63
-  name: "ar"
-  type_id: 0xb3e7bac9
-  offset: 64
-}
 member {
   id: 0xa86038b6
   name: "arbitration_lost"
   type_id: 0xe62ebf07
   offset: 128
 }
-member {
-  id: 0xb81bb253
-  name: "arch"
-  type_id: 0xb16454d0
-  offset: 2048
-}
-member {
-  id: 0xb81eae99
-  name: "arch"
-  type_id: 0xb47f1c0e
-}
 member {
   id: 0xb83316b3
   name: "arch"
   type_id: 0x99ce8ef3
   offset: 1600
 }
-member {
-  id: 0xb857a998
-  name: "arch"
-  type_id: 0xfd71f39d
-  offset: 20672
-}
 member {
   id: 0xb864f388
   name: "arch"
   type_id: 0xce25286b
   offset: 1728
 }
-member {
-  id: 0xb89f1d6b
-  name: "arch"
-  type_id: 0x35cc4540
-  offset: 256
-}
 member {
   id: 0xb8cdfbab
   name: "arch"
@@ -47498,18 +46949,6 @@ member {
   type_id: 0x4b3cad07
   offset: 96
 }
-member {
-  id: 0x3496cf62
-  name: "args"
-  type_id: 0xad7c0a89
-  offset: 128
-}
-member {
-  id: 0x34a16385
-  name: "args"
-  type_id: 0x9addce46
-  offset: 64
-}
 member {
   id: 0x34a5187e
   name: "args"
@@ -47521,12 +46960,6 @@ member {
   type_id: 0x9ea2d4c7
   offset: 64
 }
-member {
-  id: 0x34abfc7a
-  name: "args"
-  type_id: 0x904f12e1
-  offset: 128
-}
 member {
   id: 0x34fb052c
   name: "args"
@@ -47601,17 +47034,6 @@ member {
   name: "arm_mali_lpae_cfg"
   type_id: 0x34992343
 }
-member {
-  id: 0xdabb1c55
-  name: "arm_nisv"
-  type_id: 0x102e0991
-}
-member {
-  id: 0xce7b08c8
-  name: "arm_pmu"
-  type_id: 0x331b3d77
-  offset: 3008
-}
 member {
   id: 0xc71d2276
   name: "arm_v7s_cfg"
@@ -48751,12 +48173,6 @@ member {
   type_id: 0xdcbf4c2a
   offset: 64
 }
-member {
-  id: 0x8ce95ca0
-  name: "attr"
-  type_id: 0xedf277ba
-  offset: 64
-}
 member {
   id: 0xa59eb82e
   name: "attr_g"
@@ -48775,12 +48191,6 @@ member {
   type_id: 0x31f12dcf
   offset: 3008
 }
-member {
-  id: 0xf8037d37
-  name: "attr_groups"
-  type_id: 0xe52f2f44
-  offset: 4032
-}
 member {
   id: 0xf8e01779
   name: "attr_groups"
@@ -50625,12 +50035,6 @@ member {
   name: "base"
   type_id: 0x1b619644
 }
-member {
-  id: 0x85c1a1cb
-  name: "base"
-  type_id: 0x1b4ba19a
-  offset: 64
-}
 member {
   id: 0x85c253ee
   name: "base"
@@ -50726,11 +50130,6 @@ member {
   type_id: 0x33756485
   offset: 384
 }
-member {
-  id: 0xf9ecc4b7
-  name: "base_addr"
-  type_id: 0x1b4ba19a
-}
 member {
   id: 0x26b2f753
   name: "base_btf"
@@ -50777,18 +50176,6 @@ member {
   type_id: 0x295c7202
   offset: 56
 }
-member {
-  id: 0x9232ba55
-  name: "baser_coll_table"
-  type_id: 0x92233392
-  offset: 576
-}
-member {
-  id: 0x58199dc6
-  name: "baser_device_table"
-  type_id: 0x92233392
-  offset: 512
-}
 member {
   id: 0x70cac30d
   name: "bases"
@@ -51296,12 +50683,6 @@ member {
   type_id: 0xd3c80119
   offset: 5376
 }
-member {
-  id: 0x09a85b04
-  name: "be"
-  type_id: 0x6d7f5ff6
-  offset: 128
-}
 member {
   id: 0xd4e45e24
   name: "be_bits"
@@ -51492,12 +50873,6 @@ member {
   type_id: 0xe62ebf07
   offset: 160
 }
-member {
-  id: 0xd0847011
-  name: "bg_timer"
-  type_id: 0xcd7704bf
-  offset: 1664
-}
 member {
   id: 0x29a6b069
   name: "bgid"
@@ -52231,12 +51606,6 @@ member {
   type_id: 0x295c7202
   offset: 8
 }
-member {
-  id: 0xbab5eab6
-  name: "bits_per_irq"
-  type_id: 0x4585663f
-  offset: 64
-}
 member {
   id: 0x6cf5d11a
   name: "bits_per_lane_and_dclk_cycle"
@@ -52689,12 +52058,6 @@ member {
   type_id: 0x6d7f5ff6
   offset: 2184
 }
-member {
-  id: 0x8efec678
-  name: "blocking"
-  type_id: 0x92233392
-  offset: 6592
-}
 member {
   id: 0x48c48bbc
   name: "blocking_domain"
@@ -53908,12 +53271,6 @@ member {
   type_id: 0xc9082b19
   offset: 2624
 }
-member {
-  id: 0xe6502bd9
-  name: "bucket_size"
-  type_id: 0xe62ebf07
-  offset: 96
-}
 member {
   id: 0xff0ba4fe
   name: "buckets"
@@ -55057,12 +54414,6 @@ member {
   type_id: 0x5d8155a5
   offset: 32
 }
-member {
-  id: 0xfa427670
-  name: "buses"
-  type_id: 0x8f5ceaee
-  offset: 19328
-}
 member {
   id: 0x854f5ea0
   name: "busn_res"
@@ -57032,12 +56383,6 @@ member {
   type_id: 0x6720d32f
   offset: 32
 }
-member {
-  id: 0xa779a4af
-  name: "capacity"
-  type_id: 0x6720d32f
-  offset: 192
-}
 member {
   id: 0xa7f37e69
   name: "capacity"
@@ -57457,12 +56802,6 @@ member {
   type_id: 0x18bd6530
   offset: 320
 }
-member {
-  id: 0xd83a0eba
-  name: "cbaser"
-  type_id: 0x92233392
-  offset: 1024
-}
 member {
   id: 0xd34c00a5
   name: "cbovldmask"
@@ -57884,12 +57223,6 @@ member {
   type_id: 0x6720d32f
   offset: 608
 }
-member {
-  id: 0x9608d64b
-  name: "cflags"
-  type_id: 0x295c7202
-  offset: 15392
-}
 member {
   id: 0xd57ac3a1
   name: "cfs"
@@ -58342,12 +57675,6 @@ member {
   type_id: 0x2dbed6d8
   offset: 19520
 }
-member {
-  id: 0x83d10832
-  name: "change_pte"
-  type_id: 0x0c166597
-  offset: 256
-}
 member {
   id: 0x8c70199e
   name: "change_queue_depth"
@@ -59122,11 +58449,6 @@ member {
   name: "chip"
   type_id: 0xadd7ccb6
 }
-member {
-  id: 0xc6fa2a23
-  name: "chip"
-  type_id: 0x9819cf84
-}
 member {
   id: 0x50c82005
   name: "chip_data"
@@ -59904,18 +59226,6 @@ member {
   type_id: 0x13580d6c
   offset: 14464
 }
-member {
-  id: 0x2d61ef43
-  name: "clear_event_idx"
-  type_id: 0x0f7dbeee
-  offset: 2816
-}
-member {
-  id: 0xe32eadd5
-  name: "clear_flush_young"
-  type_id: 0x2f509af6
-  offset: 64
-}
 member {
   id: 0x0d593536
   name: "clear_list"
@@ -59992,12 +59302,6 @@ member {
   type_id: 0x1f3c8679
   offset: 384
 }
-member {
-  id: 0xf2531964
-  name: "clear_young"
-  type_id: 0x2f509af6
-  offset: 128
-}
 member {
   id: 0xf225f799
   name: "cleared"
@@ -61036,12 +60340,6 @@ member {
   type_id: 0xd3c80119
   offset: 1280
 }
-member {
-  id: 0x28ddf56e
-  name: "cmd_lock"
-  type_id: 0xa7c362b0
-  offset: 640
-}
 member {
   id: 0xc134320b
   name: "cmd_mask"
@@ -61374,24 +60672,6 @@ member {
   type_id: 0x30fbef83
   offset: 10880
 }
-member {
-  id: 0xe2ce2718
-  name: "coalesced_mmio"
-  type_id: 0xffdb6969
-  offset: 64
-}
-member {
-  id: 0x48aab379
-  name: "coalesced_mmio_ring"
-  type_id: 0x2ced036e
-  offset: 24640
-}
-member {
-  id: 0x02a639fa
-  name: "coalesced_zones"
-  type_id: 0xd3c80119
-  offset: 24768
-}
 member {
   id: 0x5406c379
   name: "code"
@@ -61554,12 +60834,6 @@ member {
   type_id: 0x6d7f5ff6
   offset: 192
 }
-member {
-  id: 0x6710a2d3
-  name: "col_idx"
-  type_id: 0x914dbfdc
-  offset: 928
-}
 member {
   id: 0x48c91cfd
   name: "collection"
@@ -61572,12 +60846,6 @@ member {
   type_id: 0x4585663f
   offset: 32
 }
-member {
-  id: 0x5a9c1331
-  name: "collection_list"
-  type_id: 0xd3c80119
-  offset: 1728
-}
 member {
   id: 0xd205c634
   name: "collection_size"
@@ -62853,12 +62121,6 @@ member {
   name: "config"
   type_id: 0x92233392
 }
-member {
-  id: 0xd1469e0e
-  name: "config"
-  type_id: 0xe357f5b0
-  offset: 704
-}
 member {
   id: 0xd1483d50
   name: "config"
@@ -63879,12 +63141,6 @@ member {
   type_id: 0x0baa70a7
   offset: 96
 }
-member {
-  id: 0xfcd19375
-  name: "control"
-  type_id: 0xedf277ba
-  offset: 64
-}
 member {
   id: 0xfcf56dc8
   name: "control"
@@ -64697,12 +63953,6 @@ member {
   name: "count"
   type_id: 0xc9082b19
 }
-member {
-  id: 0x65ec5e2d
-  name: "count"
-  type_id: 0xc9082b19
-  offset: 128
-}
 member {
   id: 0x6a729dee
   name: "count_buckets"
@@ -64836,23 +64086,11 @@ member {
   type_id: 0x21ebac93
   offset: 256
 }
-member {
-  id: 0x9ba00ef7
-  name: "cpl"
-  type_id: 0xe62ebf07
-  offset: 32
-}
 member {
   id: 0x92c2a1ed
   name: "cpp"
   type_id: 0x861a0f9a
 }
-member {
-  id: 0x0cc65d59
-  name: "cptr_el2"
-  type_id: 0x92233392
-  offset: 14976
-}
 member {
   id: 0x510c8cb9
   name: "cpu"
@@ -64970,12 +64208,6 @@ member {
   type_id: 0xe62ebf07
   offset: 544
 }
-member {
-  id: 0x51e0ba6b
-  name: "cpu"
-  type_id: 0xe62ebf07
-  offset: 64
-}
 member {
   id: 0x4c158848
   name: "cpu_addr_fixup"
@@ -65097,12 +64329,6 @@ member {
   type_id: 0x4585663f
   offset: 384
 }
-member {
-  id: 0x502de800
-  name: "cpu_pm_nb"
-  type_id: 0x449a775b
-  offset: 3840
-}
 member {
   id: 0xd7b3f93b
   name: "cpu_pwqs"
@@ -65621,12 +64847,6 @@ member {
   type_id: 0x2706dc09
   offset: 2176
 }
-member {
-  id: 0x00fa5522
-  name: "cr8"
-  type_id: 0xedf277ba
-  offset: 128
-}
 member {
   id: 0xf3e73479
   name: "cra_alignmask"
@@ -65763,18 +64983,6 @@ member {
   type_id: 0x70e54b38
   offset: 64
 }
-member {
-  id: 0x110caede
-  name: "creadr"
-  type_id: 0xc9082b19
-  offset: 1088
-}
-member {
-  id: 0x0fad648a
-  name: "create"
-  type_id: 0x2e1b59dd
-  offset: 64
-}
 member {
   id: 0x0fae5380
   name: "create"
@@ -65850,18 +65058,6 @@ member {
   offset: 2720
   bitsize: 1
 }
-member {
-  id: 0x92faaaee
-  name: "created"
-  type_id: 0x6d7f5ff6
-  offset: 4448
-}
-member {
-  id: 0x221ad62a
-  name: "created_vcpus"
-  type_id: 0x6720d32f
-  offset: 18752
-}
 member {
   id: 0xced3c28a
   name: "cred"
@@ -66352,11 +65548,6 @@ member {
   type_id: 0x295c7202
   offset: 656
 }
-member {
-  id: 0x5d7bf520
-  name: "csr_num"
-  type_id: 0x33756485
-}
 member {
   id: 0xde0d95ff
   name: "css"
@@ -66624,12 +65815,6 @@ member {
   type_id: 0x3747dc62
   offset: 256
 }
-member {
-  id: 0x8ed30508
-  name: "ctlr"
-  type_id: 0x74d29cf1
-  offset: 31872
-}
 member {
   id: 0x7d794a79
   name: "ctm"
@@ -66935,11 +66120,6 @@ member {
   name: "ctxsize"
   type_id: 0x39ee9172
 }
-member {
-  id: 0x2723fe2c
-  name: "ctxt"
-  type_id: 0x6a241fb6
-}
 member {
   id: 0x91091e90
   name: "cur"
@@ -67559,12 +66739,6 @@ member {
   offset: 111
   bitsize: 1
 }
-member {
-  id: 0x09c4ee83
-  name: "cwriter"
-  type_id: 0xc9082b19
-  offset: 1120
-}
 member {
   id: 0x9ed15d15
   name: "cxl"
@@ -68334,12 +67508,6 @@ member {
   type_id: 0xc8c766a0
   offset: 64
 }
-member {
-  id: 0xff5aeac8
-  name: "data"
-  type_id: 0xc8c766a0
-  offset: 128
-}
 member {
   id: 0xff5b2c47
   name: "data"
@@ -68393,12 +67561,6 @@ member {
   type_id: 0xe06ae107
   offset: 480
 }
-member {
-  id: 0xff7407e8
-  name: "data"
-  type_id: 0xe62ebf07
-  offset: 32
-}
 member {
   id: 0xff770e06
   name: "data"
@@ -68429,12 +67591,6 @@ member {
   type_id: 0xedf277ba
   offset: 64
 }
-member {
-  id: 0xff7fdfd9
-  name: "data"
-  type_id: 0xedf277ba
-  offset: 128
-}
 member {
   id: 0xff886278
   name: "data"
@@ -68782,17 +67938,6 @@ member {
   name: "data"
   type_id: 0x764913b9
 }
-member {
-  id: 0xffe56b33
-  name: "data"
-  type_id: 0x774f5f7f
-}
-member {
-  id: 0xffe56fd2
-  name: "data"
-  type_id: 0x774f5f7f
-  offset: 64
-}
 member {
   id: 0xffe71c01
   name: "data"
@@ -69001,12 +68146,6 @@ member {
   type_id: 0x4585663f
   offset: 320
 }
-member {
-  id: 0x97a5dcff
-  name: "data_offset"
-  type_id: 0xedf277ba
-  offset: 64
-}
 member {
   id: 0x97a5dfa6
   name: "data_offset"
@@ -69329,18 +68468,6 @@ member {
   type_id: 0x36691375
   offset: 64
 }
-member {
-  id: 0xd3a54092
-  name: "db_bitmap"
-  type_id: 0x064d6086
-  offset: 384
-}
-member {
-  id: 0x3baa0bf3
-  name: "db_lpi_base"
-  type_id: 0x22b36393
-  offset: 320
-}
 member {
   id: 0xf540eeb1
   name: "db_off"
@@ -69359,17 +68486,6 @@ member {
   type_id: 0x18bd6530
   offset: 59200
 }
-member {
-  id: 0x5cb6e321
-  name: "dbg_bcr"
-  type_id: 0x774f5f7f
-}
-member {
-  id: 0xb8d95da8
-  name: "dbg_bvr"
-  type_id: 0x774f5f7f
-  offset: 1024
-}
 member {
   id: 0x7a634154
   name: "dbg_client_name"
@@ -69406,18 +68522,6 @@ member {
   type_id: 0x0effb461
   offset: 2944
 }
-member {
-  id: 0x6a57f232
-  name: "dbg_wcr"
-  type_id: 0x774f5f7f
-  offset: 2048
-}
-member {
-  id: 0x88756f7c
-  name: "dbg_wvr"
-  type_id: 0x774f5f7f
-  offset: 3072
-}
 member {
   id: 0x24017197
   name: "dbi_base"
@@ -69460,12 +68564,6 @@ member {
   type_id: 0x4585663f
   offset: 128
 }
-member {
-  id: 0x0a10a4f8
-  name: "dcache_clean_inval_poc"
-  type_id: 0x0fc9cef8
-  offset: 512
-}
 member {
   id: 0x14599da8
   name: "dcbaa"
@@ -69570,11 +68668,6 @@ member {
   type_id: 0x4585663f
   offset: 64
 }
-member {
-  id: 0xc747f834
-  name: "dcr"
-  type_id: 0x24232993
-}
 member {
   id: 0xc74a8b1e
   name: "dcr"
@@ -69587,11 +68680,6 @@ member {
   type_id: 0xb3e7bac9
   offset: 8
 }
-member {
-  id: 0xf1c2dba4
-  name: "dcrn"
-  type_id: 0xe62ebf07
-}
 member {
   id: 0x50d8a1f7
   name: "dct_part_sizes"
@@ -69847,11 +68935,6 @@ member {
   type_id: 0x0c8ded5e
   offset: 256
 }
-member {
-  id: 0x07307794
-  name: "debug"
-  type_id: 0x366bef7d
-}
 member {
   id: 0x073956d8
   name: "debug"
@@ -69930,12 +69013,6 @@ member {
   type_id: 0x49a73111
   offset: 1792
 }
-member {
-  id: 0x7e662956
-  name: "debug_ptr"
-  type_id: 0x1cd322d1
-  offset: 15424
-}
 member {
   id: 0x2c8c53b8
   name: "debug_rdesc"
@@ -70014,12 +69091,6 @@ member {
   type_id: 0x120540d1
   offset: 576
 }
-member {
-  id: 0x6425d0fe
-  name: "debugfs_dentry"
-  type_id: 0x120540d1
-  offset: 26432
-}
 member {
   id: 0x35a0a098
   name: "debugfs_dir"
@@ -70212,12 +69283,6 @@ member {
   type_id: 0x120540d1
   offset: 59008
 }
-member {
-  id: 0xcd446a90
-  name: "debugfs_stat_data"
-  type_id: 0x073894f9
-  offset: 26496
-}
 member {
   id: 0xa113b6ec
   name: "debugfs_tot_len"
@@ -71310,6 +70375,12 @@ member {
   type_id: 0x0c96a24a
   offset: 256
 }
+member {
+  id: 0x8001f399
+  name: "deq"
+  type_id: 0x78f4e574
+  offset: 64
+}
 member {
   id: 0x02f59ce0
   name: "deq_seg"
@@ -71359,12 +70430,6 @@ member {
   type_id: 0x0c4d6f90
   offset: 128
 }
-member {
-  id: 0x8a59e26d
-  name: "dequeued"
-  type_id: 0xb3e7bac9
-  offset: 128
-}
 member {
   id: 0x7f5400a8
   name: "derive_sw_secret"
@@ -71383,11 +70448,6 @@ member {
   type_id: 0xafb28cf7
   offset: 16
 }
-member {
-  id: 0x87807fd8
-  name: "desc"
-  type_id: 0x5a5219ed
-}
 member {
   id: 0x8780fb54
   name: "desc"
@@ -71459,12 +70519,6 @@ member {
   type_id: 0x0483e6f8
   offset: 1344
 }
-member {
-  id: 0x87e1eb87
-  name: "desc"
-  type_id: 0x3bc2a7f0
-  offset: 64
-}
 member {
   id: 0x87e3bc35
   name: "desc"
@@ -71833,12 +70887,6 @@ member {
   type_id: 0x0d8e07a0
   offset: 384
 }
-member {
-  id: 0xa4fbb750
-  name: "destroy"
-  type_id: 0x0d947d59
-  offset: 192
-}
 member {
   id: 0xa4fbcad2
   name: "destroy"
@@ -71933,12 +70981,6 @@ member {
   type_id: 0x0f1728d9
   offset: 256
 }
-member {
-  id: 0xa414c1a9
-  name: "destructor"
-  type_id: 0x0ee038bb
-  offset: 128
-}
 member {
   id: 0xa414c5c8
   name: "destructor"
@@ -72212,12 +71254,6 @@ member {
   type_id: 0x3b04bead
   offset: 128
 }
-member {
-  id: 0xce062759
-  name: "dev"
-  type_id: 0x3fc5b8b3
-  offset: 256
-}
 member {
   id: 0xce0653f5
   name: "dev"
@@ -72317,12 +71353,6 @@ member {
   type_id: 0x326663cd
   offset: 256
 }
-member {
-  id: 0xce0bc034
-  name: "dev"
-  type_id: 0x322509a0
-  offset: 448
-}
 member {
   id: 0xce13618d
   name: "dev"
@@ -72685,12 +71715,6 @@ member {
   type_id: 0x0258f96e
   offset: 2688
 }
-member {
-  id: 0xce3c8adf
-  name: "dev"
-  type_id: 0x0561578b
-  offset: 128
-}
 member {
   id: 0xce3fe2d9
   name: "dev"
@@ -72808,11 +71832,6 @@ member {
   name: "dev_cor_errs"
   type_id: 0x68bb0e75
 }
-member {
-  id: 0xa05ae8b2
-  name: "dev_count"
-  type_id: 0x6720d32f
-}
 member {
   id: 0xa64bb146
   name: "dev_debug"
@@ -72938,12 +71957,23 @@ member {
   type_id: 0x1d33485a
   offset: 2432
 }
+member {
+  id: 0x1d443303
+  name: "dev_info"
+  type_id: 0x0baa70a7
+}
 member {
   id: 0x1d86e345
   name: "dev_info"
   type_id: 0xc97fa0d5
   offset: 20608
 }
+member {
+  id: 0xb6174f2e
+  name: "dev_info2"
+  type_id: 0x0baa70a7
+  offset: 32
+}
 member {
   id: 0x34b4b616
   name: "dev_kobj"
@@ -73174,6 +72204,12 @@ member {
   name: "dev_scratch"
   type_id: 0x33756485
 }
+member {
+  id: 0x6ba2a863
+  name: "dev_state"
+  type_id: 0x0baa70a7
+  offset: 96
+}
 member {
   id: 0x6bc4755d
   name: "dev_state"
@@ -73603,11 +72639,6 @@ member {
   name: "device_init"
   type_id: 0x2f4eca66
 }
-member {
-  id: 0xf5b742db
-  name: "device_irq_level"
-  type_id: 0xedf277ba
-}
 member {
   id: 0x4432480f
   name: "device_is_available"
@@ -73639,12 +72670,6 @@ member {
   offset: 194
   bitsize: 1
 }
-member {
-  id: 0x5adf7097
-  name: "device_list"
-  type_id: 0xd3c80119
-  offset: 1600
-}
 member {
   id: 0x5adf788d
   name: "device_list"
@@ -73870,12 +72895,6 @@ member {
   type_id: 0xd3c80119
   offset: 64
 }
-member {
-  id: 0x33ed52b5
-  name: "devices"
-  type_id: 0xd3c80119
-  offset: 26240
-}
 member {
   id: 0x33ed531f
   name: "devices"
@@ -74470,6 +73489,12 @@ member {
   name: "dir"
   type_id: 0x23f09c34
 }
+member {
+  id: 0x2edf726f
+  name: "dir"
+  type_id: 0x295c7202
+  offset: 24
+}
 member {
   id: 0x2ee42a6c
   name: "dir"
@@ -74556,11 +73581,6 @@ member {
   offset: 41
   bitsize: 1
 }
-member {
-  id: 0xa02b28d6
-  name: "direction"
-  type_id: 0xb3e7bac9
-}
 member {
   id: 0xa069b1d1
   name: "direction"
@@ -74704,17 +73724,6 @@ member {
   type_id: 0x34407506
   offset: 192
 }
-member {
-  id: 0x69efcf5e
-  name: "dirty_gfns"
-  type_id: 0x35324dc4
-  offset: 128
-}
-member {
-  id: 0x4647cbd4
-  name: "dirty_index"
-  type_id: 0xc9082b19
-}
 member {
   id: 0xcd7da86d
   name: "dirty_inode"
@@ -74745,18 +73754,6 @@ member {
   type_id: 0x33756485
   offset: 2368
 }
-member {
-  id: 0x0741ce14
-  name: "dirty_ring"
-  type_id: 0x95e9e529
-  offset: 77248
-}
-member {
-  id: 0x8de27dbd
-  name: "dirty_ring_size"
-  type_id: 0xc9082b19
-  offset: 34336
-}
 member {
   id: 0xaa41fb92
   name: "dirty_sleep"
@@ -74804,12 +73801,6 @@ member {
   type_id: 0x0ff0075d
   offset: 832
 }
-member {
-  id: 0x0d828e0a
-  name: "disable"
-  type_id: 0x0f6acd3e
-  offset: 2688
-}
 member {
   id: 0x0d82e48b
   name: "disable"
@@ -75407,12 +74398,6 @@ member {
   type_id: 0x0e5445cf
   offset: 128
 }
-member {
-  id: 0x1de22279
-  name: "disr_el1"
-  type_id: 0x92233392
-  offset: 192
-}
 member {
   id: 0x40f260d6
   name: "dissector"
@@ -75430,18 +74415,6 @@ member {
   type_id: 0x18bd6530
   offset: 64
 }
-member {
-  id: 0x929175ec
-  name: "dist_id"
-  type_id: 0x6720d32f
-  offset: 96
-}
-member {
-  id: 0x6fe87475
-  name: "dist_iodev"
-  type_id: 0x60b9a60c
-  offset: 512
-}
 member {
   id: 0x29b12afa
   name: "div"
@@ -77880,6 +76853,18 @@ member {
   type_id: 0x0625c03a
   offset: 160
 }
+member {
+  id: 0x94523a01
+  name: "dst0"
+  type_id: 0xe8034002
+  offset: 48
+}
+member {
+  id: 0x5493d7f6
+  name: "dst1"
+  type_id: 0xe8034002
+  offset: 80
+}
 member {
   id: 0x59edf322
   name: "dst_addr"
@@ -78052,6 +77037,12 @@ member {
   name: "dstats"
   type_id: 0x2bcf25d1
 }
+member {
+  id: 0x38c1840e
+  name: "dsthao"
+  type_id: 0xe8034002
+  offset: 144
+}
 member {
   id: 0x58e808e0
   name: "dt"
@@ -78593,12 +77584,6 @@ member {
   type_id: 0xe62ebf07
   offset: 32
 }
-member {
-  id: 0xd4f73d44
-  name: "dy_eligible"
-  type_id: 0x6d7f5ff6
-  offset: 8
-}
 member {
   id: 0x0ca6a6a3
   name: "dying"
@@ -79564,11 +78549,6 @@ member {
   offset: 2627
   bitsize: 1
 }
-member {
-  id: 0x3ba0211e
-  name: "emulation_failure"
-  type_id: 0x1bf61cb5
-}
 member {
   id: 0x1d3635db
   name: "en_hw_timestamp"
@@ -79664,12 +78644,6 @@ member {
   name: "enable"
   type_id: 0x33756485
 }
-member {
-  id: 0x98e86c88
-  name: "enable"
-  type_id: 0x0f6acd3e
-  offset: 2624
-}
 member {
   id: 0x98e9418c
   name: "enable"
@@ -79981,18 +78955,6 @@ member {
   type_id: 0x6d7f5ff6
   offset: 9024
 }
-member {
-  id: 0x3a2d355a
-  name: "enabled"
-  type_id: 0x6d7f5ff6
-  offset: 8
-}
-member {
-  id: 0x3a2d3590
-  name: "enabled"
-  type_id: 0x6d7f5ff6
-  offset: 504
-}
 member {
   id: 0x3a2d367c
   name: "enabled"
@@ -80005,18 +78967,6 @@ member {
   type_id: 0x6d7f5ff6
   offset: 136
 }
-member {
-  id: 0x3a2d374f
-  name: "enabled"
-  type_id: 0x6d7f5ff6
-  offset: 2240
-}
-member {
-  id: 0x3a2d39cb
-  name: "enabled"
-  type_id: 0x6d7f5ff6
-  offset: 448
-}
 member {
   id: 0x3a2d3a5d
   name: "enabled"
@@ -80046,12 +78996,6 @@ member {
   name: "enabled"
   type_id: 0x6d7f5ff6
 }
-member {
-  id: 0x3a2d3f2e
-  name: "enabled"
-  type_id: 0x6d7f5ff6
-  offset: 384
-}
 member {
   id: 0x3a34937f
   name: "enabled"
@@ -80335,12 +79279,6 @@ member {
   type_id: 0x18bd6530
   offset: 64
 }
-member {
-  id: 0x823c26d1
-  name: "end"
-  type_id: 0x33756485
-  offset: 192
-}
 member {
   id: 0x823c2af9
   name: "end"
@@ -81070,11 +80008,6 @@ member {
   type_id: 0x6720d32f
   offset: 4288
 }
-member {
-  id: 0xa2d43869
-  name: "eoi"
-  type_id: 0x38ab0bc9
-}
 member {
   id: 0xa2dfe6ad
   name: "eoi"
@@ -81189,6 +80122,17 @@ member {
   type_id: 0x4585663f
   offset: 64
 }
+member {
+  id: 0x43272c66
+  name: "ep_info"
+  type_id: 0x0baa70a7
+}
+member {
+  id: 0x3efdd095
+  name: "ep_info2"
+  type_id: 0x0baa70a7
+  offset: 32
+}
 member {
   id: 0x93a1b3b9
   name: "ep_init"
@@ -81264,16 +80208,6 @@ member {
   type_id: 0x04fd619c
   offset: 64
 }
-member {
-  id: 0x044a9f42
-  name: "epr"
-  type_id: 0xe62ebf07
-}
-member {
-  id: 0x04b5cf1e
-  name: "epr"
-  type_id: 0x197ee30b
-}
 member {
   id: 0x4571d9d3
   name: "eps"
@@ -81476,11 +80410,6 @@ member {
   type_id: 0x914dbfdc
   offset: 1088
 }
-member {
-  id: 0x7fb53355
-  name: "error"
-  type_id: 0xb3e7bac9
-}
 member {
   id: 0x7fb6e678
   name: "error"
@@ -81494,12 +80423,6 @@ member {
   offset: 6530
   bitsize: 1
 }
-member {
-  id: 0x76c39912
-  name: "error_code"
-  type_id: 0xe62ebf07
-  offset: 32
-}
 member {
   id: 0x0b9ba55b
   name: "error_count"
@@ -81685,16 +80608,6 @@ member {
   name: "esp_ip6_spec"
   type_id: 0x6df98672
 }
-member {
-  id: 0xfe44cfde
-  name: "esr_el2"
-  type_id: 0x92233392
-}
-member {
-  id: 0x215cae19
-  name: "esr_iss"
-  type_id: 0xedf277ba
-}
 member {
   id: 0x951f933e
   name: "essid"
@@ -81940,12 +80853,6 @@ member {
   name: "event"
   type_id: 0x82107bd5
 }
-member {
-  id: 0x0ad7602b
-  name: "event"
-  type_id: 0x98849204
-  offset: 288
-}
 member {
   id: 0x0add8422
   name: "event"
@@ -82278,12 +81185,6 @@ member {
   type_id: 0xdfed0371
   offset: 640
 }
-member {
-  id: 0x112c08c3
-  name: "events"
-  type_id: 0xd9b5b8b6
-  offset: 256
-}
 member {
   id: 0x113c8788
   name: "events"
@@ -82313,11 +81214,6 @@ member {
   type_id: 0x6d7f5ff6
   offset: 1032
 }
-member {
-  id: 0x11a602db
-  name: "events"
-  type_id: 0x53bf0b06
-}
 member {
   id: 0x11c1079f
   name: "events"
@@ -82353,17 +81249,6 @@ member {
   type_id: 0x0ee0f933
   offset: 9984
 }
-member {
-  id: 0x97ab0bd6
-  name: "events_guest"
-  type_id: 0xc9082b19
-  offset: 32
-}
-member {
-  id: 0xa9fd6a40
-  name: "events_host"
-  type_id: 0xc9082b19
-}
 member {
   id: 0x5701ba28
   name: "events_local_file"
@@ -82418,12 +81303,6 @@ member {
   type_id: 0x374ce5e7
   offset: 256
 }
-member {
-  id: 0x89066d93
-  name: "evt_page"
-  type_id: 0xedf277ba
-  offset: 128
-}
 member {
   id: 0x6ad2f83c
   name: "evt_rx"
@@ -82454,22 +81333,12 @@ member {
   type_id: 0x295c7202
   offset: 256
 }
-member {
-  id: 0xbba39a9a
-  name: "ex"
-  type_id: 0x00e0bdde
-}
 member {
   id: 0x9941f692
   name: "exceed"
   type_id: 0x1a6854cd
   offset: 416
 }
-member {
-  id: 0x6245278e
-  name: "exception"
-  type_id: 0xe62ebf07
-}
 member {
   id: 0xc448ecdc
   name: "exception_arg"
@@ -82834,12 +81703,6 @@ member {
   type_id: 0x92233392
   offset: 2624
 }
-member {
-  id: 0x4f84d1da
-  name: "exit_reason"
-  type_id: 0xe62ebf07
-  offset: 64
-}
 member {
   id: 0x4648209b
   name: "exit_request"
@@ -82888,12 +81751,6 @@ member {
   type_id: 0x3fcbf304
   offset: 1024
 }
-member {
-  id: 0x237f1104
-  name: "exits"
-  type_id: 0x92233392
-  offset: 7040
-}
 member {
   id: 0x964efc36
   name: "exp"
@@ -83173,12 +82030,6 @@ member {
   type_id: 0x33756485
   offset: 640
 }
-member {
-  id: 0xdf3a40d2
-  name: "exponent"
-  type_id: 0x007e8ce4
-  offset: 32
-}
 member {
   id: 0x248e76cf
   name: "export"
@@ -83455,11 +82306,6 @@ member {
   type_id: 0xe62ebf07
   offset: 128
 }
-member {
-  id: 0xbf324d0a
-  name: "extension_id"
-  type_id: 0x33756485
-}
 member {
   id: 0x9478fd81
   name: "extension_prog"
@@ -83504,12 +82350,6 @@ member {
   offset: 64
   bitsize: 1
 }
-member {
-  id: 0x15ff4fe5
-  name: "external_debug_state"
-  type_id: 0x590c6dd8
-  offset: 19584
-}
 member {
   id: 0x77b6c0c4
   name: "external_facing"
@@ -83979,11 +82819,6 @@ member {
   name: "fadvise_advice"
   type_id: 0xe62ebf07
 }
-member {
-  id: 0x73029e0c
-  name: "fail_entry"
-  type_id: 0x315223c4
-}
 member {
   id: 0x75d852d0
   name: "failcnt"
@@ -84112,18 +82947,6 @@ member {
   name: "family"
   type_id: 0xb3e7bac9
 }
-member {
-  id: 0xe9c99bd1
-  name: "far"
-  type_id: 0xedf277ba
-  offset: 64
-}
-member {
-  id: 0x550ab6b9
-  name: "far_el2"
-  type_id: 0x92233392
-  offset: 64
-}
 member {
   id: 0x0b6f4436
   name: "fast_io"
@@ -84236,12 +83059,6 @@ member {
   type_id: 0x25e44921
   offset: 1280
 }
-member {
-  id: 0x7b6a6e0c
-  name: "fault"
-  type_id: 0xe41fd2fe
-  offset: 15104
-}
 member {
   id: 0x7bb750d9
   name: "fault"
@@ -84283,12 +83100,6 @@ member {
   type_id: 0x2e08aceb
   offset: 320
 }
-member {
-  id: 0x559b32a7
-  name: "fault_ipa"
-  type_id: 0xedf277ba
-  offset: 64
-}
 member {
   id: 0x5a9c41ae
   name: "fault_param"
@@ -84600,12 +83411,6 @@ member {
   name: "fc"
   type_id: 0x98ac6d35
 }
-member {
-  id: 0xb86505a9
-  name: "fc"
-  type_id: 0xb3e7bac9
-  offset: 80
-}
 member {
   id: 0x0cf29fc2
   name: "fc_delete_all_nh"
@@ -85287,12 +84092,6 @@ member {
   type_id: 0xb914bfab
   offset: 11712
 }
-member {
-  id: 0xc5a16f87
-  name: "features"
-  type_id: 0xb914bfab
-  offset: 67264
-}
 member {
   id: 0xc5bc078c
   name: "features"
@@ -86696,12 +85495,6 @@ member {
   name: "filter_list"
   type_id: 0x09451098
 }
-member {
-  id: 0x033b7284
-  name: "filter_match"
-  type_id: 0x2c2ce191
-  offset: 3328
-}
 member {
   id: 0x033b7c37
   name: "filter_match"
@@ -86907,11 +85700,6 @@ member {
   type_id: 0xe62ebf07
   offset: 32
 }
-member {
-  id: 0x1f01199c
-  name: "first"
-  type_id: 0xe62ebf07
-}
 member {
   id: 0x1f2e3f08
   name: "first"
@@ -87991,12 +86779,6 @@ member {
   type_id: 0x33756485
   offset: 2112
 }
-member {
-  id: 0x2d5bffb1
-  name: "flags"
-  type_id: 0x33756485
-  offset: 2880
-}
 member {
   id: 0x2d5bffb9
   name: "flags"
@@ -88102,30 +86884,24 @@ member {
   type_id: 0xe8034002
   offset: 16
 }
-member {
-  id: 0x2d808bd3
-  name: "flags"
-  type_id: 0xe8034002
-  offset: 112
-}
 member {
   id: 0x2d808bdf
   name: "flags"
   type_id: 0xe8034002
   offset: 48
 }
+member {
+  id: 0x2d808edc
+  name: "flags"
+  type_id: 0xe8034002
+  offset: 128
+}
 member {
   id: 0x2d85715e
   name: "flags"
   type_id: 0xedf277ba
   offset: 448
 }
-member {
-  id: 0x2d8572c8
-  name: "flags"
-  type_id: 0xedf277ba
-  offset: 64
-}
 member {
   id: 0x2d8573b6
   name: "flags"
@@ -88571,12 +87347,6 @@ member {
   type_id: 0xb3e7bac9
   offset: 32
 }
-member {
-  id: 0x2ddb7ced
-  name: "flags"
-  type_id: 0xb3f81878
-  offset: 256
-}
 member {
   id: 0x2de12263
   name: "flags"
@@ -89535,11 +88305,6 @@ member {
   type_id: 0x6d7f5ff6
   offset: 19400
 }
-member {
-  id: 0x53106073
-  name: "force_pte_cb"
-  type_id: 0x7eadb465
-}
 member {
   id: 0x9bf39d6f
   name: "force_reset"
@@ -89805,12 +88570,6 @@ member {
   type_id: 0xd19129ce
   offset: 2432
 }
-member {
-  id: 0x06effd42
-  name: "fp_state"
-  type_id: 0x7e388552
-  offset: 15360
-}
 member {
   id: 0x13eb8d7b
   name: "fpcr"
@@ -89973,6 +88732,12 @@ member {
   type_id: 0x0d554dfb
   offset: 192
 }
+member {
+  id: 0xce6a9610
+  name: "frag_max_size"
+  type_id: 0xe8034002
+  offset: 160
+}
 member {
   id: 0x9fdfc4ad
   name: "frag_off"
@@ -90513,6 +89278,12 @@ member {
   type_id: 0x696e069f
   offset: 768
 }
+member {
+  id: 0xd988303d
+  name: "free_container_ctx"
+  type_id: 0x0faaab57
+  offset: 640
+}
 member {
   id: 0x3e10e356
   name: "free_context"
@@ -90525,6 +89296,12 @@ member {
   type_id: 0x99caa0ae
   offset: 64
 }
+member {
+  id: 0x77a0ad98
+  name: "free_dcbaa"
+  type_id: 0x0f9e7cc3
+  offset: 256
+}
 member {
   id: 0xcd8f3d51
   name: "free_dev"
@@ -90597,12 +89374,6 @@ member {
   type_id: 0x0e504c4f
   offset: 832
 }
-member {
-  id: 0x3e423a64
-  name: "free_index"
-  type_id: 0xc9082b19
-  offset: 160
-}
 member {
   id: 0x6f43c6d6
   name: "free_inode"
@@ -90695,12 +89466,6 @@ member {
   type_id: 0x0e6750fa
   offset: 384
 }
-member {
-  id: 0xfc81ed63
-  name: "free_notifier"
-  type_id: 0x0c0e84bd
-  offset: 576
-}
 member {
   id: 0x79d71685
   name: "free_on_exit"
@@ -90719,12 +89484,6 @@ member {
   type_id: 0x0e6713fe
   offset: 256
 }
-member {
-  id: 0xef540e05
-  name: "free_pages_exact"
-  type_id: 0x0fc9cef8
-  offset: 128
-}
 member {
   id: 0x54942a8c
   name: "free_pfn"
@@ -90780,6 +89539,12 @@ member {
   type_id: 0x0e1f07df
   offset: 448
 }
+member {
+  id: 0x3965c2a5
+  name: "free_transfer_ring"
+  type_id: 0x0fbe0b29
+  offset: 384
+}
 member {
   id: 0x5584ef29
   name: "free_upper_chunks"
@@ -91929,12 +90694,6 @@ member {
   name: "function"
   type_id: 0xabc38a13
 }
-member {
-  id: 0xad24c471
-  name: "function_id"
-  type_id: 0x33756485
-  offset: 64
-}
 member {
   id: 0x364a66b1
   name: "function_num_map"
@@ -92582,11 +91341,6 @@ member {
   type_id: 0x92233392
   offset: 1984
 }
-member {
-  id: 0x694cfe41
-  name: "generation"
-  type_id: 0x92233392
-}
 member {
   id: 0x699b5cf5
   name: "generation"
@@ -92609,16 +91363,6 @@ member {
   name: "generic"
   type_id: 0x09dc021e
 }
-member {
-  id: 0x42aa8b1f
-  name: "generic"
-  type_id: 0x9008e757
-}
-member {
-  id: 0x42be7fea
-  name: "generic"
-  type_id: 0x84fc1211
-}
 member {
   id: 0x42d6db26
   name: "generic"
@@ -92843,12 +91587,6 @@ member {
   type_id: 0x2c80812c
   offset: 320
 }
-member {
-  id: 0xbe7a98dd
-  name: "get_attr"
-  type_id: 0x2ee94408
-  offset: 384
-}
 member {
   id: 0xd9eaaef2
   name: "get_boot_addr"
@@ -93160,12 +91898,6 @@ member {
   type_id: 0x0db9efe5
   offset: 1600
 }
-member {
-  id: 0x09fd4226
-  name: "get_event_idx"
-  type_id: 0x2c3b9241
-  offset: 2752
-}
 member {
   id: 0xad0b27c9
   name: "get_features"
@@ -93358,12 +92090,6 @@ member {
   type_id: 0x2c582e60
   offset: 576
 }
-member {
-  id: 0x682b5a38
-  name: "get_input_level"
-  type_id: 0x334b2254
-  offset: 64
-}
 member {
   id: 0x69c08ebc
   name: "get_intermediate"
@@ -93685,12 +92411,6 @@ member {
   type_id: 0x0cbb9c80
   offset: 320
 }
-member {
-  id: 0xcf22b6e3
-  name: "get_page"
-  type_id: 0x0f3dfb90
-  offset: 192
-}
 member {
   id: 0xacf61961
   name: "get_params"
@@ -94404,24 +93124,12 @@ member {
   type_id: 0x60282e68
   offset: 1024
 }
-member {
-  id: 0xc25cb27c
-  name: "gfn_tree"
-  type_id: 0xeb923a9b
-  offset: 256
-}
 member {
   id: 0x8b338b1d
   name: "gfp"
   type_id: 0xf1a6dfed
   offset: 320
 }
-member {
-  id: 0xde99678b
-  name: "gfp_custom"
-  type_id: 0xf1a6dfed
-  offset: 64
-}
 member {
   id: 0x81a9f110
   name: "gfp_flags"
@@ -94463,12 +93171,6 @@ member {
   type_id: 0x6d7f5ff6
   offset: 16
 }
-member {
-  id: 0x8e40fa3f
-  name: "gfp_zero"
-  type_id: 0xf1a6dfed
-  offset: 32
-}
 member {
   id: 0x3b2054a4
   name: "gicd_typer"
@@ -94763,23 +93465,6 @@ member {
   type_id: 0x03913382
   offset: 64
 }
-member {
-  id: 0xc1d9a180
-  name: "gpa"
-  type_id: 0x1b4ba19a
-}
-member {
-  id: 0xca660682
-  name: "gpc_list"
-  type_id: 0xd3c80119
-  offset: 18560
-}
-member {
-  id: 0x46e189ff
-  name: "gpc_lock"
-  type_id: 0xf313e71a
-  offset: 18496
-}
 member {
   id: 0x4298e7ea
   name: "gpd_list_node"
@@ -94870,11 +93555,6 @@ member {
   type_id: 0x3e096c25
   offset: 2688
 }
-member {
-  id: 0x2bc76984
-  name: "gprs"
-  type_id: 0x6fb0151f
-}
 member {
   id: 0x1ef489e6
   name: "grab"
@@ -95067,12 +93747,6 @@ member {
   name: "group"
   type_id: 0xe145bd36
 }
-member {
-  id: 0xd37422b2
-  name: "group"
-  type_id: 0xe62ebf07
-  offset: 32
-}
 member {
   id: 0xd37a0cc8
   name: "group"
@@ -95114,12 +93788,6 @@ member {
   type_id: 0x2922a3d0
   offset: 256
 }
-member {
-  id: 0xd3bb5c92
-  name: "group"
-  type_id: 0x295c7202
-  offset: 696
-}
 member {
   id: 0xd3be02c5
   name: "group"
@@ -95132,12 +93800,6 @@ member {
   type_id: 0x6720d32f
   offset: 2400
 }
-member {
-  id: 0xd3ff70d7
-  name: "group"
-  type_id: 0x6d7f5ff6
-  offset: 16
-}
 member {
   id: 0x26e58ea7
   name: "group_caps"
@@ -95459,18 +94121,6 @@ member {
   offset: 2817
   bitsize: 1
 }
-member {
-  id: 0xd014eabd
-  name: "guest_debug"
-  type_id: 0x33756485
-  offset: 512
-}
-member {
-  id: 0x57b4f0b1
-  name: "guest_debug_preserved"
-  type_id: 0x2d873b56
-  offset: 66752
-}
 member {
   id: 0x3cad5ec0
   name: "guid"
@@ -95607,71 +94257,6 @@ member {
   type_id: 0xb24f0745
   offset: 1024
 }
-member {
-  id: 0x0e3de808
-  name: "halt_attempted_poll"
-  type_id: 0x92233392
-  offset: 64
-}
-member {
-  id: 0xd7979ded
-  name: "halt_poll_fail_hist"
-  type_id: 0x70444415
-  offset: 2496
-}
-member {
-  id: 0x5e1d7f8d
-  name: "halt_poll_fail_ns"
-  type_id: 0x92233392
-  offset: 320
-}
-member {
-  id: 0x5f0d9541
-  name: "halt_poll_invalid"
-  type_id: 0x92233392
-  offset: 128
-}
-member {
-  id: 0xcffef03f
-  name: "halt_poll_ns"
-  type_id: 0x4585663f
-  offset: 1280
-}
-member {
-  id: 0x47baacc5
-  name: "halt_poll_success_hist"
-  type_id: 0x70444415
-  offset: 448
-}
-member {
-  id: 0xdc094b5c
-  name: "halt_poll_success_ns"
-  type_id: 0x92233392
-  offset: 256
-}
-member {
-  id: 0x0946dc8b
-  name: "halt_successful_poll"
-  type_id: 0x92233392
-}
-member {
-  id: 0x2665d054
-  name: "halt_wait_hist"
-  type_id: 0x70444415
-  offset: 4544
-}
-member {
-  id: 0xa1ad1dfd
-  name: "halt_wait_ns"
-  type_id: 0x92233392
-  offset: 384
-}
-member {
-  id: 0xe9b25d2a
-  name: "halt_wakeup"
-  type_id: 0x92233392
-  offset: 192
-}
 member {
   id: 0xb805b270
   name: "handle"
@@ -95725,11 +94310,6 @@ member {
   type_id: 0x29bb2b33
   offset: 7424
 }
-member {
-  id: 0xb8f5134f
-  name: "handle"
-  type_id: 0x16864222
-}
 member {
   id: 0xf4a652d3
   name: "handle_break"
@@ -95783,12 +94363,6 @@ member {
   type_id: 0x2dfb782b
   offset: 960
 }
-member {
-  id: 0x72a25545
-  name: "handle_irq"
-  type_id: 0x0110ab48
-  offset: 2560
-}
 member {
   id: 0x33f92e8a
   name: "handle_kick"
@@ -96060,16 +94634,6 @@ member {
   name: "hardlink_flags"
   type_id: 0xe62ebf07
 }
-member {
-  id: 0xa4a87cc7
-  name: "hardware_entry_failure_reason"
-  type_id: 0xedf277ba
-}
-member {
-  id: 0x6364e5fc
-  name: "hardware_exit_reason"
-  type_id: 0xedf277ba
-}
 member {
   id: 0x7a882c59
   name: "hardware_test"
@@ -96101,12 +94665,6 @@ member {
   type_id: 0x6d7f5ff6
   offset: 856
 }
-member {
-  id: 0x5d4925a5
-  name: "has_attr"
-  type_id: 0x2ee94408
-  offset: 448
-}
 member {
   id: 0x698e14ba
   name: "has_blocked_load"
@@ -96240,12 +94798,6 @@ member {
   type_id: 0x6d7f5ff6
   offset: 64
 }
-member {
-  id: 0x557bdab2
-  name: "has_its"
-  type_id: 0x6d7f5ff6
-  offset: 832
-}
 member {
   id: 0xe114c970
   name: "has_ld_abs"
@@ -96739,16 +95291,6 @@ member {
   type_id: 0x4585663f
   offset: 384
 }
-member {
-  id: 0xd9db4be5
-  name: "hcall"
-  type_id: 0x033c2bb8
-}
-member {
-  id: 0xd9dce494
-  name: "hcall"
-  type_id: 0x04935a3e
-}
 member {
   id: 0x4f00ad96
   name: "hcc_params"
@@ -96862,12 +95404,6 @@ member {
   type_id: 0x18bd6530
   offset: 128
 }
-member {
-  id: 0xc4593e51
-  name: "hcr_el2"
-  type_id: 0x92233392
-  offset: 14848
-}
 member {
   id: 0xd39b1380
   name: "hcs_params"
@@ -97393,11 +95929,6 @@ member {
   type_id: 0x9249a64d
   offset: 256
 }
-member {
-  id: 0xb5e76888
-  name: "head"
-  type_id: 0xbdd18903
-}
 member {
   id: 0x61e179fc
   name: "head_file"
@@ -98385,12 +96916,6 @@ member {
   type_id: 0x18bd6530
   offset: 64
 }
-member {
-  id: 0x2edd8c13
-  name: "host_debug_state"
-  type_id: 0x385d66bc
-  offset: 23744
-}
 member {
   id: 0x31ca0bed
   name: "host_deinit"
@@ -98415,12 +96940,6 @@ member {
   type_id: 0x4585663f
   offset: 3488
 }
-member {
-  id: 0x909d979f
-  name: "host_fpsimd_state"
-  type_id: 0x3ef473d4
-  offset: 23680
-}
 member {
   id: 0xda2e02e2
   name: "host_init"
@@ -98432,12 +96951,6 @@ member {
   type_id: 0xb914bfab
   offset: 10112
 }
-member {
-  id: 0xc2defa03
-  name: "host_irq"
-  type_id: 0x4585663f
-  offset: 608
-}
 member {
   id: 0xfb8e63cd
   name: "host_lock"
@@ -98544,18 +97057,6 @@ member {
   offset: 2630
   bitsize: 1
 }
-member {
-  id: 0xd7232081
-  name: "host_timer_irq"
-  type_id: 0xc9082b19
-  offset: 736
-}
-member {
-  id: 0x0b3a6d95
-  name: "host_timer_irq_flags"
-  type_id: 0xc9082b19
-  offset: 768
-}
 member {
   id: 0x3f896917
   name: "host_unshare_hyp"
@@ -98719,12 +97220,6 @@ member {
   type_id: 0x0c9af3aa
   offset: 1408
 }
-member {
-  id: 0xd6cec4c2
-  name: "hpfar_el2"
-  type_id: 0x92233392
-  offset: 128
-}
 member {
   id: 0xa2d9b50c
   name: "hpi"
@@ -98796,12 +97291,6 @@ member {
   type_id: 0xcd7704bf
   offset: 832
 }
-member {
-  id: 0x8a1ddc22
-  name: "hrtimer"
-  type_id: 0xcd7704bf
-  offset: 128
-}
 member {
   id: 0x7e4bc277
   name: "hrtimer_active"
@@ -98986,17 +97475,6 @@ member {
   type_id: 0x6d7f5ff6
   offset: 14016
 }
-member {
-  id: 0x8c045ea7
-  name: "hsr"
-  type_id: 0xe62ebf07
-}
-member {
-  id: 0x440037d1
-  name: "hsr_high"
-  type_id: 0xe62ebf07
-  offset: 32
-}
 member {
   id: 0x06e8b9a4
   name: "hsub"
@@ -99209,35 +97687,12 @@ member {
   type_id: 0x4a835590
   offset: 256
 }
-member {
-  id: 0x130ace31
-  name: "hva_tree"
-  type_id: 0xd0f3b5bf
-  offset: 128
-}
-member {
-  id: 0x65c703ea
-  name: "hvc_exit_stat"
-  type_id: 0x92233392
-  offset: 6656
-}
 member {
   id: 0x97368b37
   name: "hw"
   type_id: 0xf181ace2
   offset: 2816
 }
-member {
-  id: 0x97aa71b6
-  name: "hw"
-  type_id: 0x6d7f5ff6
-  offset: 512
-}
-member {
-  id: 0x97c7b08c
-  name: "hw"
-  type_id: 0x00b57da4
-}
 member {
   id: 0x97cde891
   name: "hw"
@@ -99386,12 +97841,6 @@ member {
   type_id: 0xb3e7bac9
   offset: 6672
 }
-member {
-  id: 0x2d3aa998
-  name: "hw_events"
-  type_id: 0x1d65d221
-  offset: 3648
-}
 member {
   id: 0x912b066b
   name: "hw_features"
@@ -99465,12 +97914,6 @@ member {
   offset: 58112
   bitsize: 1
 }
-member {
-  id: 0xf34e08bb
-  name: "hw_mmu"
-  type_id: 0x38e86333
-  offset: 14784
-}
 member {
   id: 0xcc4e42e2
   name: "hw_name"
@@ -99709,12 +98152,6 @@ member {
   type_id: 0x2c3d3de2
   offset: 1024
 }
-member {
-  id: 0xb62bb539
-  name: "hwintid"
-  type_id: 0xc9082b19
-  offset: 576
-}
 member {
   id: 0xeac4d9d6
   name: "hwirq"
@@ -99816,16 +98253,6 @@ member {
   type_id: 0x14e88d4b
   offset: 1920
 }
-member {
-  id: 0x32e7dee3
-  name: "hypercall"
-  type_id: 0x2c32891d
-}
-member {
-  id: 0x8a1c8492
-  name: "hyperv"
-  type_id: 0x7ff97877
-}
 member {
   id: 0xaf8a45d4
   name: "hysteresis"
@@ -100416,11 +98843,6 @@ member {
   type_id: 0x399c459b
   offset: 192
 }
-member {
-  id: 0x83618e44
-  name: "ia_bits"
-  type_id: 0xc9082b19
-}
 member {
   id: 0x7af3be67
   name: "ia_ctime"
@@ -100565,12 +98987,6 @@ member {
   name: "ibss"
   type_id: 0x26eb875a
 }
-member {
-  id: 0x27f5e987
-  name: "icache_inval_pou"
-  type_id: 0x0fc9cef8
-  offset: 576
-}
 member {
   id: 0x8b721752
   name: "icanon"
@@ -100707,11 +99123,6 @@ member {
   type_id: 0x1dd4b558
   offset: 1664
 }
-member {
-  id: 0xa6e46395
-  name: "icptcode"
-  type_id: 0xb3e7bac9
-}
 member {
   id: 0x9263012c
   name: "icq"
@@ -101439,12 +99850,6 @@ member {
   type_id: 0xc9082b19
   offset: 12864
 }
-member {
-  id: 0xba6f54b9
-  name: "id_hash"
-  type_id: 0x394dcf37
-  offset: 320
-}
 member {
   id: 0x05495988
   name: "id_header"
@@ -101634,12 +100039,6 @@ member {
   type_id: 0xe1a31370
   offset: 9088
 }
-member {
-  id: 0x50f15a4b
-  name: "idai"
-  type_id: 0x6d7f5ff6
-  offset: 32
-}
 member {
   id: 0xc093344b
   name: "ident"
@@ -101991,11 +100390,6 @@ member {
   type_id: 0x16749208
   offset: 16
 }
-member {
-  id: 0x3caea455
-  name: "idx"
-  type_id: 0x295c7202
-}
 member {
   id: 0x3cc2707a
   name: "idx"
@@ -102112,12 +100506,6 @@ member {
   offset: 27
   bitsize: 1
 }
-member {
-  id: 0x7eaf49aa
-  name: "if_flag"
-  type_id: 0xb3e7bac9
-  offset: 104
-}
 member {
   id: 0x7d1e2280
   name: "if_flags"
@@ -102352,12 +100740,6 @@ member {
   type_id: 0x33756485
   offset: 2176
 }
-member {
-  id: 0x50f909b7
-  name: "iflags"
-  type_id: 0x295c7202
-  offset: 15400
-}
 member {
   id: 0x102491dd
   name: "ifname"
@@ -102668,6 +101050,11 @@ member {
   type_id: 0xc9082b19
   offset: 320
 }
+member {
+  id: 0xe8bad6da
+  name: "iif"
+  type_id: 0x6720d32f
+}
 member {
   id: 0xaada75c0
   name: "iifindex"
@@ -102770,12 +101157,6 @@ member {
   offset: 1312
   bitsize: 1
 }
-member {
-  id: 0xb85c9514
-  name: "immediate_exit"
-  type_id: 0xb3e7bac9
-  offset: 8
-}
 member {
   id: 0x0239d915
   name: "imod_interval"
@@ -102788,12 +101169,6 @@ member {
   type_id: 0xc9082b19
   offset: 64
 }
-member {
-  id: 0x7a0e7466
-  name: "implementation_rev"
-  type_id: 0xc9082b19
-  offset: 64
-}
 member {
   id: 0xf089858f
   name: "implicit_fb"
@@ -103072,11 +101447,6 @@ member {
   offset: 12098
   bitsize: 1
 }
-member {
-  id: 0xd935af97
-  name: "in_kernel"
-  type_id: 0x6d7f5ff6
-}
 member {
   id: 0xb2ce8b46
   name: "in_len"
@@ -103115,11 +101485,6 @@ member {
   name: "in_saddr"
   type_id: 0xa54936d5
 }
-member {
-  id: 0x3c4c15e8
-  name: "in_spin_loop"
-  type_id: 0x6d7f5ff6
-}
 member {
   id: 0xd8c3755f
   name: "in_tx"
@@ -103504,11 +101869,6 @@ member {
   type_id: 0xe62ebf07
   offset: 128
 }
-member {
-  id: 0xadf00094
-  name: "index"
-  type_id: 0xc9082b19
-}
 member {
   id: 0xadf006ed
   name: "index"
@@ -104152,12 +102512,6 @@ member {
   type_id: 0x0f626ee5
   offset: 1088
 }
-member {
-  id: 0x1ae7589a
-  name: "init"
-  type_id: 0x0d947d59
-  offset: 128
-}
 member {
   id: 0x1ae79ef6
   name: "init"
@@ -104784,17 +103138,6 @@ member {
   type_id: 0x295c7202
   offset: 160
 }
-member {
-  id: 0x73fbf26c
-  name: "input"
-  type_id: 0xedf277ba
-}
-member {
-  id: 0x73fbf68d
-  name: "input"
-  type_id: 0xedf277ba
-  offset: 64
-}
 member {
   id: 0x73fe0389
   name: "input"
@@ -105013,12 +103356,6 @@ member {
   type_id: 0x099fec03
   offset: 12992
 }
-member {
-  id: 0xdac7f876
-  name: "insn_bytes"
-  type_id: 0xda277458
-  offset: 8
-}
 member {
   id: 0x7cdc8c52
   name: "insn_cnt"
@@ -105070,11 +103407,6 @@ member {
   type_id: 0xc9082b19
   offset: 75936
 }
-member {
-  id: 0x8b19911e
-  name: "insn_size"
-  type_id: 0xb3e7bac9
-}
 member {
   id: 0x23399750
   name: "insn_stack"
@@ -105363,11 +103695,6 @@ member {
   name: "internal"
   type_id: 0x33756485
 }
-member {
-  id: 0xcf651311
-  name: "internal"
-  type_id: 0x1bf62820
-}
 member {
   id: 0xeba68a32
   name: "internal_addr"
@@ -105734,18 +104061,6 @@ member {
   type_id: 0x3ae3ff84
   offset: 1088
 }
-member {
-  id: 0x4a590e0a
-  name: "intid"
-  type_id: 0x6720d32f
-  offset: 160
-}
-member {
-  id: 0x4af72c65
-  name: "intid"
-  type_id: 0xc9082b19
-  offset: 448
-}
 member {
   id: 0x5dfd62b5
   name: "intr_cmd"
@@ -105914,24 +104229,6 @@ member {
   type_id: 0x475137a2
   offset: 576
 }
-member {
-  id: 0x6e9b1c0d
-  name: "invalidate_range"
-  type_id: 0x0c16b659
-  offset: 448
-}
-member {
-  id: 0x4f063390
-  name: "invalidate_range_end"
-  type_id: 0x0c397826
-  offset: 384
-}
-member {
-  id: 0x0545c767
-  name: "invalidate_range_start"
-  type_id: 0x2f7f5489
-  offset: 320
-}
 member {
   id: 0xa4356576
   name: "invalidate_seq"
@@ -105998,11 +104295,6 @@ member {
   type_id: 0x6d7f5ff6
   offset: 72
 }
-member {
-  id: 0x9d5b90f8
-  name: "io"
-  type_id: 0x3050ef8f
-}
 member {
   id: 0x7aee4108
   name: "io_base"
@@ -106075,18 +104367,6 @@ member {
   type_id: 0x3c5401fe
   offset: 192
 }
-member {
-  id: 0xadd5b431
-  name: "io_int_parm"
-  type_id: 0xe62ebf07
-  offset: 32
-}
-member {
-  id: 0x1dac28b0
-  name: "io_int_word"
-  type_id: 0xe62ebf07
-  offset: 64
-}
 member {
   id: 0xfe460429
   name: "io_is_busy"
@@ -106333,12 +104613,6 @@ member {
   name: "iocb"
   type_id: 0x08b52b5b
 }
-member {
-  id: 0x4d44694e
-  name: "ioctl"
-  type_id: 0x203cd5eb
-  offset: 512
-}
 member {
   id: 0x4d466701
   name: "ioctl"
@@ -106494,18 +104768,6 @@ member {
   type_id: 0x19c60038
   offset: 6528
 }
-member {
-  id: 0xc33609f7
-  name: "iodev"
-  type_id: 0x60b9a60c
-  offset: 128
-}
-member {
-  id: 0x10f4be53
-  name: "iodev_type"
-  type_id: 0xf101ec6d
-  offset: 192
-}
 member {
   id: 0x5a8c2ccc
   name: "iodone_cnt"
@@ -106518,18 +104780,6 @@ member {
   type_id: 0x74d29cf1
   offset: 3680
 }
-member {
-  id: 0x3103f4d5
-  name: "ioeventfd_count"
-  type_id: 0x6720d32f
-  offset: 32
-}
-member {
-  id: 0x0d7ae40f
-  name: "ioeventfds"
-  type_id: 0xd3c80119
-  offset: 20288
-}
 member {
   id: 0x51cefec4
   name: "iomap"
@@ -107131,24 +105381,6 @@ member {
   type_id: 0xb3e7bac9
   offset: 104
 }
-member {
-  id: 0xb21940c8
-  name: "ipa"
-  type_id: 0xe8034002
-  offset: 16
-}
-member {
-  id: 0x73d7e0dc
-  name: "ipb"
-  type_id: 0xe62ebf07
-  offset: 96
-}
-member {
-  id: 0x73d7e464
-  name: "ipb"
-  type_id: 0xe62ebf07
-  offset: 32
-}
 member {
   id: 0x376c5a92
   name: "ipc"
@@ -107420,12 +105652,6 @@ member {
   type_id: 0x6720d32f
   offset: 4768
 }
-member {
-  id: 0x99159806
-  name: "irq"
-  type_id: 0x6720d32f
-  offset: 160
-}
 member {
   id: 0x99159922
   name: "irq"
@@ -107438,12 +105664,6 @@ member {
   type_id: 0x6720d32f
   offset: 7584
 }
-member {
-  id: 0x99159c15
-  name: "irq"
-  type_id: 0x6720d32f
-  offset: 2240
-}
 member {
   id: 0x99159c24
   name: "irq"
@@ -107563,17 +105783,6 @@ member {
   type_id: 0xfc0e1dbd
   offset: 4032
 }
-member {
-  id: 0x99949b8a
-  name: "irq"
-  type_id: 0xe62ebf07
-}
-member {
-  id: 0x99abc34e
-  name: "irq"
-  type_id: 0xd9729a52
-  offset: 64
-}
 member {
   id: 0x99c8e1eb
   name: "irq"
@@ -107598,12 +105807,6 @@ member {
   type_id: 0x0e01e935
   offset: 320
 }
-member {
-  id: 0x3b21a108
-  name: "irq_ack_notifier_list"
-  type_id: 0x5e8dc7f4
-  offset: 25344
-}
 member {
   id: 0x8dcdd781
   name: "irq_base"
@@ -107789,29 +105992,12 @@ member {
   type_id: 0x2b3a7da8
   offset: 7360
 }
-member {
-  id: 0xd133b0b1
-  name: "irq_level"
-  type_id: 0x6d7f5ff6
-  offset: 4456
-}
-member {
-  id: 0x8c92967c
-  name: "irq_lock"
-  type_id: 0xc8b17aa7
-}
 member {
   id: 0x8ca9364f
   name: "irq_lock"
   type_id: 0xf313e71a
   offset: 9088
 }
-member {
-  id: 0x8cfde860
-  name: "irq_lock"
-  type_id: 0xa7c362b0
-  offset: 24896
-}
 member {
   id: 0xa09e6601
   name: "irq_managed"
@@ -107855,12 +106041,6 @@ member {
   type_id: 0x0e01e935
   offset: 1984
 }
-member {
-  id: 0x94f98f17
-  name: "irq_num"
-  type_id: 0x6720d32f
-  offset: 4416
-}
 member {
   id: 0x740ba1b4
   name: "irq_pending"
@@ -107946,12 +106126,6 @@ member {
   type_id: 0x2d47c59a
   offset: 704
 }
-member {
-  id: 0x71efddfa
-  name: "irq_routing"
-  type_id: 0x2145f7aa
-  offset: 25280
-}
 member {
   id: 0x03f31823
   name: "irq_safe"
@@ -107995,12 +106169,6 @@ member {
   type_id: 0x0e01e935
   offset: 128
 }
-member {
-  id: 0xb5417608
-  name: "irq_srcu"
-  type_id: 0xa46efa19
-  offset: 30400
-}
 member {
   id: 0xb989726e
   name: "irq_start_time"
@@ -108074,12 +106242,6 @@ member {
   type_id: 0x2dff40fc
   offset: 4480
 }
-member {
-  id: 0x450927c5
-  name: "irqfds"
-  type_id: 0x13064264
-  offset: 19584
-}
 member {
   id: 0x53de8d1e
   name: "irqflags"
@@ -108834,6 +106996,12 @@ member {
   type_id: 0x6d7f5ff6
   offset: 26432
 }
+member {
+  id: 0x62d4e2e8
+  name: "is_usb_offload_enabled"
+  type_id: 0x3431098c
+  offset: 128
+}
 member {
   id: 0x567e927d
   name: "is_useropt"
@@ -108907,24 +107075,6 @@ member {
   type_id: 0xc93e017b
   offset: 176
 }
-member {
-  id: 0x1a818083
-  name: "is_write"
-  type_id: 0xb3e7bac9
-  offset: 160
-}
-member {
-  id: 0x1a818982
-  name: "is_write"
-  type_id: 0xb3e7bac9
-  offset: 64
-}
-member {
-  id: 0x1ad44087
-  name: "is_write"
-  type_id: 0xe62ebf07
-  offset: 64
-}
 member {
   id: 0x5f2e888d
   name: "is_yuv"
@@ -109130,12 +107280,6 @@ member {
   type_id: 0xd9c2196b
   offset: 128
 }
-member {
-  id: 0xb75a0aec
-  name: "items"
-  type_id: 0xd3c80119
-  offset: 64
-}
 member {
   id: 0xb7cc436a
   name: "items"
@@ -109153,12 +107297,6 @@ member {
   type_id: 0x585b40a5
   offset: 64
 }
-member {
-  id: 0x2b5908df
-  name: "iter"
-  type_id: 0x3bc62241
-  offset: 1344
-}
 member {
   id: 0x2b68f74f
   name: "iter"
@@ -109245,45 +107383,6 @@ member {
   type_id: 0xd0f3b5bf
   offset: 256
 }
-member {
-  id: 0x1caf0749
-  name: "its"
-  type_id: 0x3c6958c4
-}
-member {
-  id: 0x857bfedc
-  name: "its_lock"
-  type_id: 0xa7c362b0
-  offset: 1216
-}
-member {
-  id: 0x8e370213
-  name: "its_read"
-  type_id: 0x05a52bb0
-}
-member {
-  id: 0xa70b7acb
-  name: "its_vm"
-  type_id: 0x04fb8f54
-  offset: 64
-}
-member {
-  id: 0xa736298d
-  name: "its_vm"
-  type_id: 0x39aedbce
-  offset: 1408
-}
-member {
-  id: 0xa9a971b2
-  name: "its_vpe"
-  type_id: 0x19bba071
-  offset: 1408
-}
-member {
-  id: 0x8844b6fd
-  name: "its_write"
-  type_id: 0x0de80fb7
-}
 member {
   id: 0x7dc35cdf
   name: "itty"
@@ -110370,12 +108469,6 @@ member {
   type_id: 0x42201dce
   offset: 128
 }
-member {
-  id: 0xd7f60431
-  name: "kind"
-  type_id: 0xfd01d20e
-  offset: 128
-}
 member {
   id: 0x1862ef71
   name: "klist_children"
@@ -110417,12 +108510,6 @@ member {
   type_id: 0xd079ba20
   offset: 5120
 }
-member {
-  id: 0x85e4ba6c
-  name: "kmem_cache"
-  type_id: 0x2efd5036
-  offset: 128
-}
 member {
   id: 0x5fc74326
   name: "kmem_cachep"
@@ -110885,29 +108972,6 @@ member {
   name: "kvec"
   type_id: 0x39c0701e
 }
-member {
-  id: 0x730e8b69
-  name: "kvm"
-  type_id: 0x363b9249
-}
-member {
-  id: 0x730e8f88
-  name: "kvm"
-  type_id: 0x363b9249
-  offset: 64
-}
-member {
-  id: 0xaa4c4a21
-  name: "kvm_dirty_regs"
-  type_id: 0xedf277ba
-  offset: 2368
-}
-member {
-  id: 0x4b1e23b0
-  name: "kvm_valid_regs"
-  type_id: 0xedf277ba
-  offset: 2304
-}
 member {
   id: 0x6f6286ef
   name: "kworker"
@@ -111223,12 +109287,6 @@ member {
   type_id: 0xec0a20ff
   offset: 384
 }
-member {
-  id: 0x26892e85
-  name: "last"
-  type_id: 0xe62ebf07
-  offset: 32
-}
 member {
   id: 0x26a602b8
   name: "last"
@@ -111325,12 +109383,6 @@ member {
   type_id: 0x33756485
   offset: 64
 }
-member {
-  id: 0x85550ce5
-  name: "last_boosted_vcpu"
-  type_id: 0x6720d32f
-  offset: 18784
-}
 member {
   id: 0x191711ef
   name: "last_bstat"
@@ -111839,11 +109891,6 @@ member {
   type_id: 0x495d0861
   offset: 2112
 }
-member {
-  id: 0xb280959d
-  name: "last_steal"
-  type_id: 0x92233392
-}
 member {
   id: 0x4ac408b3
   name: "last_switch_count"
@@ -111950,36 +109997,12 @@ member {
   type_id: 0x914dbfdc
   offset: 2592
 }
-member {
-  id: 0xab7e4a6e
-  name: "last_used_slot"
-  type_id: 0x3d5133eb
-  offset: 77504
-}
-member {
-  id: 0xabf33787
-  name: "last_used_slot"
-  type_id: 0xb02b353a
-  offset: 64
-}
-member {
-  id: 0x1838fabc
-  name: "last_used_slot_gen"
-  type_id: 0x92233392
-  offset: 77568
-}
 member {
   id: 0x583801a8
   name: "last_vblank_count"
   type_id: 0x92233392
   offset: 384
 }
-member {
-  id: 0x9555d521
-  name: "last_vcpu_ran"
-  type_id: 0x13580d6c
-  offset: 192
-}
 member {
   id: 0x9898696f
   name: "last_wakee"
@@ -112010,6 +110033,12 @@ member {
   type_id: 0x0d066629
   offset: 192
 }
+member {
+  id: 0xab47d75e
+  name: "lastopt"
+  type_id: 0xe8034002
+  offset: 96
+}
 member {
   id: 0xcc0a009b
   name: "lastuse"
@@ -112891,18 +110920,6 @@ member {
   type_id: 0x4585663f
   offset: 896
 }
-member {
-  id: 0xb8405d0b
-  name: "len"
-  type_id: 0x4585663f
-  offset: 32
-}
-member {
-  id: 0xb862f164
-  name: "len"
-  type_id: 0x6720d32f
-  offset: 64
-}
 member {
   id: 0xb862f207
   name: "len"
@@ -113362,12 +111379,6 @@ member {
   type_id: 0xe62ebf07
   offset: 224
 }
-member {
-  id: 0x865cec96
-  name: "level"
-  type_id: 0xe62ebf07
-  offset: 32
-}
 member {
   id: 0x8673c739
   name: "level"
@@ -113707,12 +111718,6 @@ member {
   type_id: 0xe62ebf07
   offset: 384
 }
-member {
-  id: 0x2b9d91fc
-  name: "line_level"
-  type_id: 0x6d7f5ff6
-  offset: 480
-}
 member {
   id: 0x17206248
   name: "line_off"
@@ -113885,11 +111890,6 @@ member {
   type_id: 0x633815f0
   offset: 192
 }
-member {
-  id: 0x55f738dc
-  name: "link"
-  type_id: 0x49a73111
-}
 member {
   id: 0x55f9336e
   name: "link"
@@ -114971,12 +112971,6 @@ member {
   type_id: 0x92233392
   offset: 7296
 }
-member {
-  id: 0xbcb6da5b
-  name: "loaded"
-  type_id: 0x6d7f5ff6
-  offset: 704
-}
 member {
   id: 0xbcc151ab
   name: "loaded"
@@ -115043,6 +113037,12 @@ member {
   type_id: 0xd3c80119
   offset: 30976
 }
+member {
+  id: 0x2a3c445d
+  name: "local_error"
+  type_id: 0x0e2bd379
+  offset: 704
+}
 member {
   id: 0x9ddaf23a
   name: "local_fixed_chan"
@@ -115614,12 +113614,6 @@ member {
   type_id: 0xa7c362b0
   offset: 448
 }
-member {
-  id: 0x2d4b3b7e
-  name: "lock"
-  type_id: 0xa7c362b0
-  offset: 18944
-}
 member {
   id: 0x2d4b3bb8
   name: "lock"
@@ -116345,17 +114339,6 @@ member {
   type_id: 0xc9082b19
   offset: 76192
 }
-member {
-  id: 0x6dda6565
-  name: "longmode"
-  type_id: 0xe62ebf07
-  offset: 512
-}
-member {
-  id: 0x6dda6e7d
-  name: "longmode"
-  type_id: 0xe62ebf07
-}
 member {
   id: 0xe77d91bb
   name: "longname"
@@ -116757,48 +114740,6 @@ member {
   type_id: 0x4585663f
   offset: 32
 }
-member {
-  id: 0xeca52885
-  name: "lpi_array"
-  type_id: 0x38d23361
-  offset: 256
-}
-member {
-  id: 0x43246e2d
-  name: "lpi_idx"
-  type_id: 0x6720d32f
-  offset: 192
-}
-member {
-  id: 0x9ecea343
-  name: "lpi_list"
-  type_id: 0xd3c80119
-  offset: 64
-}
-member {
-  id: 0x4d9128b0
-  name: "lpi_list_count"
-  type_id: 0x6720d32f
-  offset: 1152
-}
-member {
-  id: 0x9c466cf2
-  name: "lpi_list_head"
-  type_id: 0xd3c80119
-  offset: 1024
-}
-member {
-  id: 0xbe693b59
-  name: "lpi_list_lock"
-  type_id: 0xc8b17aa7
-  offset: 960
-}
-member {
-  id: 0xd5bf2684
-  name: "lpi_translation_cache"
-  type_id: 0xd3c80119
-  offset: 1216
-}
 member {
   id: 0x0a9f8132
   name: "lpm_capable"
@@ -117711,12 +115652,6 @@ member {
   type_id: 0x6d7f5ff6
   offset: 128
 }
-member {
-  id: 0x69005a44
-  name: "manual_dirty_log_protect"
-  type_id: 0x92233392
-  offset: 26368
-}
 member {
   id: 0xac46515e
   name: "manual_mode_value"
@@ -117777,12 +115712,6 @@ member {
   type_id: 0xd6298487
   offset: 192
 }
-member {
-  id: 0x8d25e654
-  name: "map"
-  type_id: 0xd39aff0d
-  offset: 31680
-}
 member {
   id: 0x8d4fb401
   name: "map"
@@ -117986,12 +115915,6 @@ member {
   type_id: 0x2c7bd73f
   offset: 576
 }
-member {
-  id: 0x308dee6b
-  name: "map_event"
-  type_id: 0x2c2ce191
-  offset: 3264
-}
 member {
   id: 0x3d93c0fb
   name: "map_extra"
@@ -120000,12 +117923,6 @@ member {
   type_id: 0x295c7202
   offset: 7648
 }
-member {
-  id: 0xf60ae606
-  name: "max_halt_poll_ns"
-  type_id: 0x4585663f
-  offset: 34304
-}
 member {
   id: 0x7e72c641
   name: "max_hang_time"
@@ -121124,12 +119041,6 @@ member {
   type_id: 0x4585663f
   offset: 45248
 }
-member {
-  id: 0x107724e0
-  name: "max_vcpus"
-  type_id: 0x6720d32f
-  offset: 18720
-}
 member {
   id: 0xb15d2ccc
   name: "max_vfreq"
@@ -121932,18 +119843,6 @@ member {
   type_id: 0x3b9c6e49
   offset: 384
 }
-member {
-  id: 0x376609fd
-  name: "mdcr_el2"
-  type_id: 0x92233392
-  offset: 14912
-}
-member {
-  id: 0xdb73cbc4
-  name: "mdcr_el2_host"
-  type_id: 0x92233392
-  offset: 15040
-}
 member {
   id: 0xbb1af1d1
   name: "mdev"
@@ -122126,11 +120025,6 @@ member {
   type_id: 0x2ea66283
   offset: 768
 }
-member {
-  id: 0xd7400399
-  name: "mdscr_el1"
-  type_id: 0xc9082b19
-}
 member {
   id: 0x3e3e85fb
   name: "me"
@@ -122688,12 +120582,6 @@ member {
   type_id: 0x1ed6200d
   offset: 1792
 }
-member {
-  id: 0x4f1355bb
-  name: "memslots"
-  type_id: 0xb717646a
-  offset: 18112
-}
 member {
   id: 0xbaa89f63
   name: "memsw"
@@ -124178,12 +122066,6 @@ member {
   type_id: 0x2953a412
   offset: 192
 }
-member {
-  id: 0x3025d10a
-  name: "mm"
-  type_id: 0x1b36c7a2
-  offset: 64
-}
 member {
   id: 0x3025d29c
   name: "mm"
@@ -124201,12 +122083,6 @@ member {
   name: "mm"
   type_id: 0x1b36c7a2
 }
-member {
-  id: 0x3025d651
-  name: "mm"
-  type_id: 0x1b36c7a2
-  offset: 832
-}
 member {
   id: 0x3025dc29
   name: "mm"
@@ -124219,12 +122095,6 @@ member {
   type_id: 0x1b36c7a2
   offset: 960
 }
-member {
-  id: 0x3025dd22
-  name: "mm"
-  type_id: 0x1b36c7a2
-  offset: 192
-}
 member {
   id: 0xf2c3ca3b
   name: "mm_account"
@@ -124266,12 +122136,6 @@ member {
   name: "mm_mt"
   type_id: 0xa179a8c5
 }
-member {
-  id: 0xa69ad382
-  name: "mm_ops"
-  type_id: 0x0d97a2b2
-  offset: 128
-}
 member {
   id: 0x0abfe66e
   name: "mm_state"
@@ -124331,12 +122195,6 @@ member {
   type_id: 0x2e1b3edd
   offset: 448
 }
-member {
-  id: 0x87fdbe87
-  name: "mmap"
-  type_id: 0x2ed842b7
-  offset: 576
-}
 member {
   id: 0x87fe4e24
   name: "mmap"
@@ -124557,11 +122415,6 @@ member {
   type_id: 0xc9082b19
   offset: 32
 }
-member {
-  id: 0x4779a89b
-  name: "mmio"
-  type_id: 0x373a3dac
-}
 member {
   id: 0x78030744
   name: "mmio_always_on"
@@ -124574,66 +122427,18 @@ member {
   name: "mmio_base"
   type_id: 0x18bd6530
 }
-member {
-  id: 0x41a58807
-  name: "mmio_cur_fragment"
-  type_id: 0x6720d32f
-  offset: 1440
-}
 member {
   id: 0xdd74e29a
   name: "mmio_enabled"
   type_id: 0x178c0a08
   offset: 64
 }
-member {
-  id: 0x22f5be35
-  name: "mmio_exit_kernel"
-  type_id: 0x92233392
-  offset: 6912
-}
-member {
-  id: 0x3c9c64dc
-  name: "mmio_exit_user"
-  type_id: 0x92233392
-  offset: 6848
-}
-member {
-  id: 0x0abc4886
-  name: "mmio_fragments"
-  type_id: 0x5d2762c3
-  offset: 1536
-}
-member {
-  id: 0xe4aa6cb8
-  name: "mmio_is_write"
-  type_id: 0x6720d32f
-  offset: 1408
-}
 member {
   id: 0xdba12957
   name: "mmio_len"
   type_id: 0xe62ebf07
   offset: 512
 }
-member {
-  id: 0xb16b8efe
-  name: "mmio_needed"
-  type_id: 0x6720d32f
-  offset: 1344
-}
-member {
-  id: 0x22a96429
-  name: "mmio_nr_fragments"
-  type_id: 0x6720d32f
-  offset: 1472
-}
-member {
-  id: 0xf337f353
-  name: "mmio_read_completed"
-  type_id: 0x6720d32f
-  offset: 1376
-}
 member {
   id: 0x12cc7367
   name: "mmio_start"
@@ -124646,75 +122451,6 @@ member {
   type_id: 0xd3c80119
   offset: 1280
 }
-member {
-  id: 0x6d5a2dc5
-  name: "mmu"
-  type_id: 0x38e86333
-  offset: 192
-}
-member {
-  id: 0x6dab2c05
-  name: "mmu"
-  type_id: 0xc9e16a53
-}
-member {
-  id: 0x1c0c4ea6
-  name: "mmu_invalidate_in_progress"
-  type_id: 0xfc0e1dbd
-  offset: 26048
-}
-member {
-  id: 0xf7c73e7d
-  name: "mmu_invalidate_range_end"
-  type_id: 0x33756485
-  offset: 26176
-}
-member {
-  id: 0xc81d2fc7
-  name: "mmu_invalidate_range_start"
-  type_id: 0x33756485
-  offset: 26112
-}
-member {
-  id: 0x59a47d0f
-  name: "mmu_invalidate_seq"
-  type_id: 0x33756485
-  offset: 25984
-}
-member {
-  id: 0x833819ed
-  name: "mmu_lock"
-  type_id: 0xf4933b90
-}
-member {
-  id: 0x4938a60d
-  name: "mmu_notifier"
-  type_id: 0x846ab93f
-  offset: 25408
-}
-member {
-  id: 0x18b48436
-  name: "mmu_page_cache"
-  type_id: 0xa2ba72d6
-}
-member {
-  id: 0x1a817692
-  name: "mn_active_invalidate_count"
-  type_id: 0x33756485
-  offset: 18368
-}
-member {
-  id: 0x8174053d
-  name: "mn_invalidate_lock"
-  type_id: 0xf313e71a
-  offset: 18304
-}
-member {
-  id: 0xf11c4ad7
-  name: "mn_memslots_update_rcuwait"
-  type_id: 0xdba44af3
-  offset: 18432
-}
 member {
   id: 0x32301a1f
   name: "mnt"
@@ -125201,12 +122937,6 @@ member {
   type_id: 0x72d1d1c0
   offset: 32
 }
-member {
-  id: 0x87fa34df
-  name: "mode"
-  type_id: 0x6720d32f
-  offset: 384
-}
 member {
   id: 0x87fa354d
   name: "mode"
@@ -125877,22 +123607,6 @@ member {
   type_id: 0xe62ebf07
   offset: 704
 }
-member {
-  id: 0xfc27981e
-  name: "mp_state"
-  type_id: 0xe62ebf07
-}
-member {
-  id: 0xfcc328ac
-  name: "mp_state"
-  type_id: 0x029d28cb
-  offset: 66816
-}
-member {
-  id: 0x34f49183
-  name: "mpidr"
-  type_id: 0xc9082b19
-}
 member {
   id: 0x9410bf1b
   name: "mpls_features"
@@ -126413,12 +124127,6 @@ member {
   type_id: 0x6720d32f
   offset: 64
 }
-member {
-  id: 0x67f93f00
-  name: "msg_page"
-  type_id: 0xedf277ba
-  offset: 192
-}
 member {
   id: 0x91e9d7fd
   name: "msg_parser"
@@ -126610,12 +124318,6 @@ member {
   name: "msiinfo"
   type_id: 0xa5e1bddf
 }
-member {
-  id: 0x7abe829e
-  name: "msis_require_devid"
-  type_id: 0x6d7f5ff6
-  offset: 104
-}
 member {
   id: 0x8e2397ea
   name: "msix_base"
@@ -126672,16 +124374,6 @@ member {
   type_id: 0x295c7202
   offset: 1408
 }
-member {
-  id: 0x324f2583
-  name: "msr"
-  type_id: 0x079bc2f5
-}
-member {
-  id: 0x32ae90fe
-  name: "msr"
-  type_id: 0xe62ebf07
-}
 member {
   id: 0xcf473d6a
   name: "msr_saved_flags"
@@ -127565,12 +125257,6 @@ member {
   type_id: 0xca2a51af
   offset: 32
 }
-member {
-  id: 0x0d114fce
-  name: "name"
-  type_id: 0xca2a51af
-  offset: 128
-}
 member {
   id: 0x0d273c21
   name: "name"
@@ -127838,12 +125524,6 @@ member {
   type_id: 0x19ce8000
   offset: 32
 }
-member {
-  id: 0x0dc6047f
-  name: "name"
-  type_id: 0x1d61e0cf
-  offset: 128
-}
 member {
   id: 0x0dc6099d
   name: "name"
@@ -127946,12 +125626,6 @@ member {
   type_id: 0x0483e6f8
   offset: 1280
 }
-member {
-  id: 0x0ddfea33
-  name: "name"
-  type_id: 0x0483e6f8
-  offset: 2432
-}
 member {
   id: 0x0ddfef10
   name: "name"
@@ -128415,12 +126089,6 @@ member {
   type_id: 0x4585663f
   offset: 64
 }
-member {
-  id: 0xb1e7f3ff
-  name: "nassgireq"
-  type_id: 0x6d7f5ff6
-  offset: 392
-}
 member {
   id: 0x452670ab
   name: "nat_bysource"
@@ -128675,12 +126343,6 @@ member {
   type_id: 0x3de3f5a1
   offset: 1152
 }
-member {
-  id: 0xb7cbdc47
-  name: "ndata"
-  type_id: 0xe62ebf07
-  offset: 32
-}
 member {
   id: 0x4ce502de
   name: "ndctl"
@@ -129943,12 +127605,6 @@ member {
   offset: 154
   bitsize: 4
 }
-member {
-  id: 0xe719c8c0
-  name: "new_value"
-  type_id: 0x33756485
-  offset: 64
-}
 member {
   id: 0xe723c4b2
   name: "new_value"
@@ -131018,6 +128674,12 @@ member {
   type_id: 0xc9082b19
   offset: 64
 }
+member {
+  id: 0x25da85de
+  name: "nhoff"
+  type_id: 0xe8034002
+  offset: 112
+}
 member {
   id: 0xd1269bee
   name: "nht"
@@ -131558,11 +129220,6 @@ member {
   offset: 2629
   bitsize: 1
 }
-member {
-  id: 0x603fc5a7
-  name: "nobjs"
-  type_id: 0x6720d32f
-}
 member {
   id: 0x0934e011
   name: "noboot"
@@ -131609,12 +129266,6 @@ member {
   name: "node"
   type_id: 0x6c32e522
 }
-member {
-  id: 0x0f3ca933
-  name: "node"
-  type_id: 0x49a73111
-  offset: 3712
-}
 member {
   id: 0x0f3ca99f
   name: "node"
@@ -131854,12 +129505,6 @@ member {
   type_id: 0x6720d32f
   offset: 52096
 }
-member {
-  id: 0xdeaef990
-  name: "node_idx"
-  type_id: 0x6720d32f
-  offset: 8512
-}
 member {
   id: 0xd7b5832b
   name: "node_list"
@@ -132372,11 +130017,6 @@ member {
   type_id: 0x2ead6653
   offset: 256
 }
-member {
-  id: 0x56e50a84
-  name: "notify"
-  type_id: 0x130fee63
-}
 member {
   id: 0x56f8e261
   name: "notify"
@@ -132797,11 +130437,6 @@ member {
   type_id: 0x74d29cf1
   offset: 192
 }
-member {
-  id: 0xc2c8918f
-  name: "nr_cpus"
-  type_id: 0x6720d32f
-}
 member {
   id: 0x98f55073
   name: "nr_cpus_allowed"
@@ -132814,12 +130449,6 @@ member {
   type_id: 0xc93e017b
   offset: 2416
 }
-member {
-  id: 0xb9a58615
-  name: "nr_db_lpis"
-  type_id: 0x6720d32f
-  offset: 448
-}
 member {
   id: 0x244cd0bd
   name: "nr_deferred"
@@ -133095,12 +130724,6 @@ member {
   type_id: 0xc9082b19
   offset: 8160
 }
-member {
-  id: 0x2af96acc
-  name: "nr_lpis"
-  type_id: 0x6720d32f
-  offset: 64
-}
 member {
   id: 0x183eb746
   name: "nr_maps"
@@ -133125,12 +130748,6 @@ member {
   type_id: 0x607419c2
   offset: 64
 }
-member {
-  id: 0x8a52dd6e
-  name: "nr_memslot_pages"
-  type_id: 0x33756485
-  offset: 896
-}
 member {
   id: 0x02abbc80
   name: "nr_migratepages"
@@ -133225,12 +130842,6 @@ member {
   type_id: 0xfc0e1dbd
   offset: 768
 }
-member {
-  id: 0xe3b1b19e
-  name: "nr_pages"
-  type_id: 0x33756485
-  offset: 64
-}
 member {
   id: 0xe3b1b2b8
   name: "nr_pages"
@@ -133380,12 +130991,6 @@ member {
   type_id: 0xc9082b19
   offset: 704
 }
-member {
-  id: 0xddd1c1b9
-  name: "nr_regions"
-  type_id: 0x6720d32f
-  offset: 224
-}
 member {
   id: 0x5a432fb1
   name: "nr_relocs"
@@ -133428,12 +131033,6 @@ member {
   type_id: 0xc93e017b
   offset: 192
 }
-member {
-  id: 0xf6e30a95
-  name: "nr_rt_entries"
-  type_id: 0xc9082b19
-  offset: 31616
-}
 member {
   id: 0xd6072070
   name: "nr_running"
@@ -133535,18 +131134,6 @@ member {
   type_id: 0x4585663f
   offset: 8640
 }
-member {
-  id: 0x5eb23b58
-  name: "nr_spis"
-  type_id: 0x6720d32f
-  offset: 128
-}
-member {
-  id: 0x5eb23fa1
-  name: "nr_spis"
-  type_id: 0x6720d32f
-  offset: 32
-}
 member {
   id: 0x47396359
   name: "nr_spread_over"
@@ -133698,12 +131285,6 @@ member {
   name: "nr_vlan_devs"
   type_id: 0x4585663f
 }
-member {
-  id: 0x6ba53b1d
-  name: "nr_vpes"
-  type_id: 0x6720d32f
-  offset: 256
-}
 member {
   id: 0xd52b9423
   name: "nr_wakeups"
@@ -134645,12 +132226,6 @@ member {
   type_id: 0x4585663f
   offset: 192
 }
-member {
-  id: 0xaeede60f
-  name: "num_events"
-  type_id: 0x6720d32f
-  offset: 3392
-}
 member {
   id: 0x7f574879
   name: "num_exentries"
@@ -134776,12 +132351,6 @@ member {
   type_id: 0xc9082b19
   offset: 320
 }
-member {
-  id: 0xf95b9cd7
-  name: "num_id_bits"
-  type_id: 0xc9082b19
-  offset: 31936
-}
 member {
   id: 0x3e07f1e9
   name: "num_ids"
@@ -135224,12 +132793,6 @@ member {
   type_id: 0x5d8155a5
   offset: 1920
 }
-member {
-  id: 0xbf52270e
-  name: "num_pri_bits"
-  type_id: 0xc9082b19
-  offset: 31904
-}
 member {
   id: 0x4c06bbb4
   name: "num_private"
@@ -136106,12 +133669,6 @@ member {
   type_id: 0xd3c80119
   offset: 448
 }
-member {
-  id: 0x2aa4f724
-  name: "objects"
-  type_id: 0x0cbf60eb
-  offset: 256
-}
 member {
   id: 0x89cabbe4
   name: "objects"
@@ -136917,12 +134474,6 @@ member {
   type_id: 0xf67b8436
   offset: 128
 }
-member {
-  id: 0x9bf12a52
-  name: "offset"
-  type_id: 0xedf277ba
-  offset: 64
-}
 member {
   id: 0x9bf12eb3
   name: "offset"
@@ -137333,12 +134884,6 @@ member {
   type_id: 0x0483e6f8
   offset: 9920
 }
-member {
-  id: 0xc21468d0
-  name: "online_vcpus"
-  type_id: 0x74d29cf1
-  offset: 18688
-}
 member {
   id: 0x7adb50ba
   name: "onlink"
@@ -137942,12 +135487,6 @@ member {
   type_id: 0xecd302d8
   offset: 1152
 }
-member {
-  id: 0xaf890e76
-  name: "ops"
-  type_id: 0x02067bf4
-  offset: 768
-}
 member {
   id: 0xaf8c0a54
   name: "ops"
@@ -138013,12 +135552,6 @@ member {
   type_id: 0x28b7a3b7
   offset: 8704
 }
-member {
-  id: 0xafaa08ab
-  name: "ops"
-  type_id: 0x2101ca02
-  offset: 128
-}
 member {
   id: 0xafaa22ec
   name: "ops"
@@ -138060,12 +135593,6 @@ member {
   name: "ops"
   type_id: 0x3b991d29
 }
-member {
-  id: 0xafb0c299
-  name: "ops"
-  type_id: 0x3bcbf8c5
-  offset: 128
-}
 member {
   id: 0xafb0ea3a
   name: "ops"
@@ -138453,11 +135980,6 @@ member {
   name: "ops"
   type_id: 0x31c93a7f
 }
-member {
-  id: 0xafbacb95
-  name: "ops"
-  type_id: 0x31cb364e
-}
 member {
   id: 0xafbb0869
   name: "ops"
@@ -138523,11 +136045,6 @@ member {
   type_id: 0x379acd09
   offset: 3392
 }
-member {
-  id: 0xafbcd9c0
-  name: "ops"
-  type_id: 0x37d96371
-}
 member {
   id: 0xafbcdef5
   name: "ops"
@@ -139048,11 +136565,6 @@ member {
   type_id: 0xe62ebf07
   offset: 96
 }
-member {
-  id: 0x35649aee
-  name: "osi"
-  type_id: 0x129d9eba
-}
 member {
   id: 0x8d9b8608
   name: "osid"
@@ -139284,6 +136796,12 @@ member {
   type_id: 0x2d4be55c
   offset: 192
 }
+member {
+  id: 0xdf6660f4
+  name: "output"
+  type_id: 0x2d2736e0
+  offset: 576
+}
 member {
   id: 0xdf666814
   name: "output"
@@ -139456,11 +136974,6 @@ member {
   type_id: 0x18bd6530
   offset: 8000
 }
-member {
-  id: 0x39d6cdec
-  name: "overflow_work"
-  type_id: 0xb95bf932
-}
 member {
   id: 0x4c799d4b
   name: "overhead"
@@ -139515,12 +137028,6 @@ member {
   type_id: 0x6d7f5ff6
   offset: 13120
 }
-member {
-  id: 0x8dc5ba0f
-  name: "override_halt_poll_ns"
-  type_id: 0x6d7f5ff6
-  offset: 34272
-}
 member {
   id: 0xf1d2ff61
   name: "override_only"
@@ -139700,12 +137207,6 @@ member {
   type_id: 0x18bd6530
   offset: 256
 }
-member {
-  id: 0x4a85cb53
-  name: "owner"
-  type_id: 0x18bd6530
-  offset: 832
-}
 member {
   id: 0x4a85cf2e
   name: "owner"
@@ -140360,24 +137861,12 @@ member {
   type_id: 0x7dc8196c
   offset: 44704
 }
-member {
-  id: 0x6b32a1dc
-  name: "pad"
-  type_id: 0xe62ebf07
-  offset: 544
-}
 member {
   id: 0x6b32a238
   name: "pad"
   type_id: 0xe62ebf07
   offset: 32
 }
-member {
-  id: 0x6b32a680
-  name: "pad"
-  type_id: 0xe62ebf07
-  offset: 96
-}
 member {
   id: 0x6b32af03
   name: "pad"
@@ -140395,12 +137884,6 @@ member {
   type_id: 0x5d8155a5
   offset: 1368
 }
-member {
-  id: 0x6b90bd2c
-  name: "pad"
-  type_id: 0x44377683
-  offset: 8
-}
 member {
   id: 0x6bb3a9c1
   name: "pad"
@@ -140447,12 +137930,6 @@ member {
   type_id: 0x295c7202
   offset: 16
 }
-member {
-  id: 0xbad0c2a3
-  name: "pad2"
-  type_id: 0xe62ebf07
-  offset: 32
-}
 member {
   id: 0xbaffe3eb
   name: "pad2"
@@ -140542,11 +138019,6 @@ member {
   type_id: 0xb3e7bac9
   offset: 24
 }
-member {
-  id: 0x646aaa85
-  name: "padding"
-  type_id: 0x8ca7b4cd
-}
 member {
   id: 0x64774c4f
   name: "padding"
@@ -140559,11 +138031,6 @@ member {
   type_id: 0x914dbfdc
   offset: 16
 }
-member {
-  id: 0x6491fbda
-  name: "padding"
-  type_id: 0x77f6ebb4
-}
 member {
   id: 0x64a65d9f
   name: "padding"
@@ -140599,12 +138066,6 @@ member {
   type_id: 0xb5c6bcdb
   offset: 32
 }
-member {
-  id: 0xd06a5757
-  name: "padding1"
-  type_id: 0x8d58bd1a
-  offset: 16
-}
 member {
   id: 0x9481c1a2
   name: "padding2"
@@ -140710,12 +138171,6 @@ member {
   type_id: 0x1c3dbe5a
   offset: 2912
 }
-member {
-  id: 0x21516548
-  name: "page_count"
-  type_id: 0x2c7bd73f
-  offset: 320
-}
 member {
   id: 0x3189af2e
   name: "page_done"
@@ -141164,11 +138619,6 @@ member {
   type_id: 0x6720d32f
   offset: 288
 }
-member {
-  id: 0xae5a4181
-  name: "papr_hcall"
-  type_id: 0x2c2be6c7
-}
 member {
   id: 0xfe407cce
   name: "par"
@@ -141280,12 +138730,6 @@ member {
   type_id: 0xc9082b19
   offset: 192
 }
-member {
-  id: 0x4b34b9aa
-  name: "params"
-  type_id: 0x9addce46
-  offset: 192
-}
 member {
   id: 0x4b3911d5
   name: "params"
@@ -141310,12 +138754,6 @@ member {
   type_id: 0x18bd6530
   offset: 128
 }
-member {
-  id: 0x4bf9b0b2
-  name: "params"
-  type_id: 0x57d5dd0d
-  offset: 128
-}
 member {
   id: 0xe64a6945
   name: "params_len"
@@ -142288,12 +139726,6 @@ member {
   type_id: 0x04f0669a
   offset: 64
 }
-member {
-  id: 0x6d45f1ba
-  name: "pause"
-  type_id: 0x6d7f5ff6
-  offset: 15416
-}
 member {
   id: 0x6d4faa04
   name: "pause"
@@ -142417,11 +139849,6 @@ member {
   type_id: 0x33756485
   offset: 768
 }
-member {
-  id: 0xa5f74e1c
-  name: "pc"
-  type_id: 0x33756485
-}
 member {
   id: 0xa33342ec
   name: "pci"
@@ -143193,12 +140620,6 @@ member {
   type_id: 0x06835e9c
   offset: 128
 }
-member {
-  id: 0x8109b274
-  name: "pendbaser"
-  type_id: 0x92233392
-  offset: 31808
-}
 member {
   id: 0xf91c8462
   name: "pending"
@@ -143300,18 +140721,6 @@ member {
   type_id: 0x4585663f
   offset: 6496
 }
-member {
-  id: 0x141c8cee
-  name: "pending_last"
-  type_id: 0x6d7f5ff6
-  offset: 960
-}
-member {
-  id: 0x004ca63d
-  name: "pending_latch"
-  type_id: 0x6d7f5ff6
-  offset: 488
-}
 member {
   id: 0xe53a2590
   name: "pending_link"
@@ -143342,12 +140751,6 @@ member {
   type_id: 0x4585663f
   offset: 928
 }
-member {
-  id: 0x09b42908
-  name: "pending_page"
-  type_id: 0xedf277ba
-  offset: 320
-}
 member {
   id: 0x8c0336f4
   name: "pending_reset"
@@ -143558,12 +140961,6 @@ member {
   type_id: 0x04fd619c
   offset: 7104
 }
-member {
-  id: 0x34c743f9
-  name: "percpu_pmu"
-  type_id: 0x331b3d77
-  offset: 2176
-}
 member {
   id: 0x4db3a084
   name: "percpu_pvec_drained"
@@ -143576,12 +140973,6 @@ member {
   type_id: 0x4585663f
   offset: 6208
 }
-member {
-  id: 0xf94346ab
-  name: "perf_event"
-  type_id: 0x1dce0fdd
-  offset: 64
-}
 member {
   id: 0xf96ca45e
   name: "perf_event"
@@ -144123,30 +141514,12 @@ member {
   type_id: 0x6e1fde8f
   offset: 64
 }
-member {
-  id: 0x03a47022
-  name: "pfr0_csv2"
-  type_id: 0x295c7202
-  offset: 3136
-}
-member {
-  id: 0x42988d63
-  name: "pfr0_csv3"
-  type_id: 0x295c7202
-  offset: 3144
-}
 member {
   id: 0x88830a16
   name: "pg"
   type_id: 0x4585663f
   offset: 1184
 }
-member {
-  id: 0x331a3623
-  name: "pgd"
-  type_id: 0x11281698
-  offset: 64
-}
 member {
   id: 0x332a4920
   name: "pgd"
@@ -144163,24 +141536,12 @@ member {
   name: "pgd"
   type_id: 0xe381831a
 }
-member {
-  id: 0x99236fa3
-  name: "pgd_phys"
-  type_id: 0xbdd18903
-  offset: 64
-}
 member {
   id: 0x2d272759
   name: "pgdat"
   type_id: 0x03038214
   offset: 11200
 }
-member {
-  id: 0xdd74def2
-  name: "pgm_code"
-  type_id: 0xe62ebf07
-  offset: 64
-}
 member {
   id: 0x2b8ac6b5
   name: "pgmap"
@@ -144251,12 +141612,6 @@ member {
   type_id: 0xc9082b19
   offset: 224
 }
-member {
-  id: 0x7f170713
-  name: "pgt"
-  type_id: 0x114e61a5
-  offset: 128
-}
 member {
   id: 0x5a4cacba
   name: "pgtables_bytes"
@@ -144575,11 +141930,6 @@ member {
   name: "phys_addr"
   type_id: 0xe8034002
 }
-member {
-  id: 0xbda607c1
-  name: "phys_addr"
-  type_id: 0xedf277ba
-}
 member {
   id: 0xbdabdba2
   name: "phys_addr"
@@ -144655,12 +142005,6 @@ member {
   name: "phys_id"
   type_id: 0x295c7202
 }
-member {
-  id: 0x66a97394
-  name: "phys_to_virt"
-  type_id: 0x14e88d4b
-  offset: 384
-}
 member {
   id: 0xda31db2e
   name: "physfn"
@@ -144948,12 +142292,6 @@ member {
   type_id: 0x18456730
   offset: 192
 }
-member {
-  id: 0x74912d9b
-  name: "pid"
-  type_id: 0x18456730
-  offset: 1088
-}
 member {
   id: 0x74912e66
   name: "pid"
@@ -145308,12 +142646,6 @@ member {
   type_id: 0xb3579875
   offset: 640
 }
-member {
-  id: 0x037e99ae
-  name: "pinned_pages"
-  type_id: 0xeb923a9b
-  offset: 320
-}
 member {
   id: 0x88a70e08
   name: "pinned_vm"
@@ -145362,11 +142694,6 @@ member {
   type_id: 0x3a47ea7a
   offset: 768
 }
-member {
-  id: 0x782f8731
-  name: "pio"
-  type_id: 0xe62ebf07
-}
 member {
   id: 0x999ac82a
   name: "pipe"
@@ -145676,17 +143003,6 @@ member {
   type_id: 0x5d8155a5
   offset: 192
 }
-member {
-  id: 0xe908f26f
-  name: "pkvm"
-  type_id: 0xf75540c7
-  offset: 3392
-}
-member {
-  id: 0xb403a636
-  name: "pkvm_memcache"
-  type_id: 0xce6b97ea
-}
 member {
   id: 0x451925c4
   name: "placement"
@@ -145775,12 +143091,6 @@ member {
   offset: 80
   bitsize: 1
 }
-member {
-  id: 0x1a1fd0a0
-  name: "plat_device"
-  type_id: 0x3f37d9d5
-  offset: 3584
-}
 member {
   id: 0x38c654ae
   name: "platform_data"
@@ -146032,30 +143342,12 @@ member {
   type_id: 0x6720d32f
   offset: 12768
 }
-member {
-  id: 0x15c30de0
-  name: "pmc"
-  type_id: 0x44c5e79a
-  offset: 320
-}
 member {
   id: 0x6ed4d38c
   name: "pmc_width"
   type_id: 0xe8034002
   offset: 384
 }
-member {
-  id: 0xca44b141
-  name: "pmceid_bitmap"
-  type_id: 0xb914bfab
-  offset: 3456
-}
-member {
-  id: 0x28894114
-  name: "pmceid_ext_bitmap"
-  type_id: 0xb914bfab
-  offset: 3520
-}
 member {
   id: 0x56639b84
   name: "pmd"
@@ -146105,12 +143397,6 @@ member {
   type_id: 0x92233392
   offset: 2368
 }
-member {
-  id: 0xa6727baa
-  name: "pmscr_el1"
-  type_id: 0x92233392
-  offset: 4096
-}
 member {
   id: 0x98e24df0
   name: "pmsr_capa"
@@ -146146,17 +143432,6 @@ member {
   name: "pmu"
   type_id: 0x3b12c8e0
 }
-member {
-  id: 0x93b6279b
-  name: "pmu"
-  type_id: 0xbe704ca9
-  offset: 62272
-}
-member {
-  id: 0x93ce5218
-  name: "pmu"
-  type_id: 0xc60bc51e
-}
 member {
   id: 0x2cb55697
   name: "pmu_cpu_context"
@@ -146181,30 +143456,12 @@ member {
   type_id: 0x0d07014d
   offset: 768
 }
-member {
-  id: 0x3957d3b9
-  name: "pmu_filter"
-  type_id: 0x064d6086
-  offset: 2944
-}
-member {
-  id: 0x03f344e6
-  name: "pmu_lock"
-  type_id: 0xc8b17aa7
-  offset: 2112
-}
 member {
   id: 0xbadfff7b
   name: "pmu_private"
   type_id: 0x18bd6530
   offset: 1280
 }
-member {
-  id: 0xd81b71f1
-  name: "pmuver"
-  type_id: 0x6720d32f
-  offset: 2496
-}
 member {
   id: 0x809d8aa2
   name: "pmxops"
@@ -147067,12 +144324,6 @@ member {
   type_id: 0xfe384bcc
   offset: 2432
 }
-member {
-  id: 0x48131453
-  name: "port"
-  type_id: 0xe8034002
-  offset: 16
-}
 member {
   id: 0x4848f266
   name: "port"
@@ -148551,12 +145802,6 @@ member {
   name: "preempt_count"
   type_id: 0x92233392
 }
-member {
-  id: 0xad12ae54
-  name: "preempt_notifier"
-  type_id: 0x89c67026
-  offset: 64
-}
 member {
   id: 0x44e4fcbb
   name: "preempt_notifiers"
@@ -148569,12 +145814,6 @@ member {
   type_id: 0x92233392
   offset: 704
 }
-member {
-  id: 0x1bd1d822
-  name: "preempted"
-  type_id: 0x6d7f5ff6
-  offset: 1936
-}
 member {
   id: 0xa093e6ac
   name: "preenable"
@@ -149569,17 +146808,6 @@ member {
   type_id: 0x4585663f
   offset: 512
 }
-member {
-  id: 0x10cd0450
-  name: "priority"
-  type_id: 0x295c7202
-  offset: 688
-}
-member {
-  id: 0x10cd0767
-  name: "priority"
-  type_id: 0x295c7202
-}
 member {
   id: 0x10ebf2d4
   name: "priority"
@@ -149991,12 +147219,6 @@ member {
   type_id: 0x18bd6530
   offset: 192
 }
-member {
-  id: 0x91796f71
-  name: "private"
-  type_id: 0x18bd6530
-  offset: 128
-}
 member {
   id: 0x91a931d3
   name: "private"
@@ -150213,12 +147435,6 @@ member {
   type_id: 0x0d89a697
   offset: 3264
 }
-member {
-  id: 0xdbd2d18f
-  name: "private_irqs"
-  type_id: 0x4449c48b
-  offset: 2496
-}
 member {
   id: 0x78439144
   name: "private_list"
@@ -151384,12 +148600,6 @@ member {
   type_id: 0xfc0e1dbd
   offset: 2112
 }
-member {
-  id: 0x703b904f
-  name: "propbaser"
-  type_id: 0x92233392
-  offset: 896
-}
 member {
   id: 0x29846bfc
   name: "propbit"
@@ -151590,18 +148800,6 @@ member {
   type_id: 0xaf023c73
   offset: 7616
 }
-member {
-  id: 0x7efa09f3
-  name: "protected_hyp_mem"
-  type_id: 0x1f4573ef
-  offset: 128
-}
-member {
-  id: 0x46e4dafc
-  name: "protected_shared_mem"
-  type_id: 0x1f4573ef
-  offset: 192
-}
 member {
   id: 0x5d16456b
   name: "proto"
@@ -151631,6 +148829,12 @@ member {
   type_id: 0x295c7202
   offset: 64
 }
+member {
+  id: 0x5d4a9b23
+  name: "proto"
+  type_id: 0x295c7202
+  offset: 8
+}
 member {
   id: 0x5d4a9e3a
   name: "proto"
@@ -151939,12 +149143,6 @@ member {
   name: "psample_group"
   type_id: 0x0d436e43
 }
-member {
-  id: 0x2c10bf52
-  name: "psci_version"
-  type_id: 0xc9082b19
-  offset: 2816
-}
 member {
   id: 0x2bf0ee90
   name: "psec"
@@ -152070,12 +149268,6 @@ member {
   type_id: 0x34ef1514
   offset: 64
 }
-member {
-  id: 0xedfdadd3
-  name: "pstate_ss"
-  type_id: 0x6d7f5ff6
-  offset: 32
-}
 member {
   id: 0x946deb91
   name: "pstr"
@@ -152133,18 +149325,6 @@ member {
   name: "pte"
   type_id: 0xc32dc55c
 }
-member {
-  id: 0xeef9224d
-  name: "pte_is_counted_cb"
-  type_id: 0xf2ecf779
-  offset: 64
-}
-member {
-  id: 0x8661d99b
-  name: "pte_ops"
-  type_id: 0x2e6ac856
-  offset: 320
-}
 member {
   id: 0xce442d14
   name: "ptl"
@@ -152567,12 +149747,6 @@ member {
   type_id: 0x2c0bb831
   offset: 64
 }
-member {
-  id: 0x68c1b0bb
-  name: "put_page"
-  type_id: 0x0f3dfb90
-  offset: 256
-}
 member {
   id: 0xee3c87e4
   name: "put_port"
@@ -152621,12 +149795,6 @@ member {
   type_id: 0x07941efa
   offset: 320
 }
-member {
-  id: 0x0f7f629e
-  name: "pvmfw_load_addr"
-  type_id: 0x1b4ba19a
-  offset: 384
-}
 member {
   id: 0x7cfddcb6
   name: "pvt_info"
@@ -153844,12 +151012,6 @@ member {
   type_id: 0xfc5791f4
   offset: 128
 }
-member {
-  id: 0x766556ed
-  name: "r0"
-  type_id: 0x33756485
-  offset: 64
-}
 member {
   id: 0x9e0af45c
   name: "r2w_factor"
@@ -153874,6 +151036,12 @@ member {
   type_id: 0x12bb35ff
   offset: 128
 }
+member {
+  id: 0x2940a2be
+  name: "ra"
+  type_id: 0x7584e7da
+  offset: 32
+}
 member {
   id: 0x0e79d07a
   name: "ra_chain"
@@ -154041,12 +151209,6 @@ member {
   type_id: 0xe0987ef0
   offset: 192
 }
-member {
-  id: 0x0e6e7fb8
-  name: "range"
-  type_id: 0xd2fe57e5
-  offset: 64
-}
 member {
   id: 0x0e957cc9
   name: "range"
@@ -155487,12 +152649,6 @@ member {
   type_id: 0x18bd6530
   offset: 64
 }
-member {
-  id: 0xb5b5379c
-  name: "rd_iodev"
-  type_id: 0x60b9a60c
-  offset: 31360
-}
 member {
   id: 0x5761a9c9
   name: "rd_lock"
@@ -155510,11 +152666,6 @@ member {
   type_id: 0x3842259a
   offset: 3712
 }
-member {
-  id: 0xc63d4176
-  name: "rd_regions"
-  type_id: 0xd3c80119
-}
 member {
   id: 0x39c535a2
   name: "rd_table"
@@ -155574,18 +152725,6 @@ member {
   type_id: 0xc9082b19
   offset: 7040
 }
-member {
-  id: 0x525d4aae
-  name: "rdreg"
-  type_id: 0x116d36b8
-  offset: 31680
-}
-member {
-  id: 0xe932d634
-  name: "rdreg_index"
-  type_id: 0xc9082b19
-  offset: 31744
-}
 member {
   id: 0x4163d7c4
   name: "rdy_queue"
@@ -155703,11 +152842,6 @@ member {
   type_id: 0x0ea3bf3c
   offset: 640
 }
-member {
-  id: 0x485b3652
-  name: "read"
-  type_id: 0x0669d6b3
-}
 member {
   id: 0x486528a2
   name: "read"
@@ -155726,11 +152860,6 @@ member {
   type_id: 0x33756485
   offset: 1728
 }
-member {
-  id: 0x487026f9
-  name: "read"
-  type_id: 0x2d797d9d
-}
 member {
   id: 0x48703aa7
   name: "read"
@@ -155902,12 +153031,6 @@ member {
   type_id: 0x1bf16028
   offset: 384
 }
-member {
-  id: 0x2635ef55
-  name: "read_counter"
-  type_id: 0x1eba2d88
-  offset: 2944
-}
 member {
   id: 0xa1b42c88
   name: "read_dbi"
@@ -156324,30 +153447,6 @@ member {
   type_id: 0x0e837004
   offset: 384
 }
-member {
-  id: 0xa3f01223
-  name: "ready"
-  type_id: 0x6d7f5ff6
-  offset: 264
-}
-member {
-  id: 0xa3f0172f
-  name: "ready"
-  type_id: 0x6d7f5ff6
-  offset: 1944
-}
-member {
-  id: 0xa3f017bd
-  name: "ready"
-  type_id: 0x6d7f5ff6
-  offset: 8
-}
-member {
-  id: 0x6bffa57c
-  name: "ready_for_interrupt_injection"
-  type_id: 0xb3e7bac9
-  offset: 96
-}
 member {
   id: 0xb8c769bd
   name: "ready_list"
@@ -156483,12 +153582,6 @@ member {
   name: "reason"
   type_id: 0xe62ebf07
 }
-member {
-  id: 0xbbfcbfdf
-  name: "reason"
-  type_id: 0xe62ebf07
-  offset: 64
-}
 member {
   id: 0x63a5e94a
   name: "reattach_i3c_dev"
@@ -156723,12 +153816,6 @@ member {
   type_id: 0x054f691a
   offset: 26176
 }
-member {
-  id: 0x32fffef6
-  name: "recv_page"
-  type_id: 0xedf277ba
-  offset: 256
-}
 member {
   id: 0xc16c3147
   name: "recv_seq"
@@ -156845,11 +153932,6 @@ member {
   type_id: 0x92233392
   offset: 640
 }
-member {
-  id: 0x325a63f3
-  name: "redist_vcpu"
-  type_id: 0x08dcfb76
-}
 member {
   id: 0x9ff3b23a
   name: "redundant_pic_cnt"
@@ -157419,12 +154501,6 @@ member {
   name: "refcount"
   type_id: 0x6f1daf87
 }
-member {
-  id: 0x05ec0a8d
-  name: "refcount"
-  type_id: 0x6f1daf87
-  offset: 544
-}
 member {
   id: 0x05ec0d90
   name: "refcount"
@@ -157775,12 +154851,6 @@ member {
   name: "reg_offset"
   type_id: 0x4585663f
 }
-member {
-  id: 0xddab36b7
-  name: "reg_pmmir"
-  type_id: 0x92233392
-  offset: 4352
-}
 member {
   id: 0x7288a0e4
   name: "reg_read"
@@ -158001,12 +155071,6 @@ member {
   type_id: 0xe62ebf07
   offset: 64
 }
-member {
-  id: 0x4e19f41c
-  name: "regions"
-  type_id: 0x3e3a4a9e
-  offset: 128
-}
 member {
   id: 0xa45f1ee8
   name: "register_default_trap_handler"
@@ -158258,11 +155322,6 @@ member {
   type_id: 0x01222f7d
   offset: 320
 }
-member {
-  id: 0x80627a33
-  name: "regs"
-  type_id: 0x590c6dd8
-}
 member {
   id: 0x80790d43
   name: "regs"
@@ -158284,11 +155343,6 @@ member {
   name: "regs"
   type_id: 0xd731b823
 }
-member {
-  id: 0x80f111bb
-  name: "regs"
-  type_id: 0xca67e5f6
-}
 member {
   id: 0x21d1f57f
   name: "regs_intr"
@@ -158521,17 +155575,6 @@ member {
   type_id: 0x0c307972
   offset: 192
 }
-member {
-  id: 0xae94e729
-  name: "release"
-  type_id: 0x0c15b27a
-}
-member {
-  id: 0xae95664d
-  name: "release"
-  type_id: 0x0d947d59
-  offset: 256
-}
 member {
   id: 0xae95b968
   name: "release"
@@ -158975,17 +156018,6 @@ member {
   type_id: 0xb3e7bac9
   offset: 2056
 }
-member {
-  id: 0x8726cc6c
-  name: "remote_tlb_flush"
-  type_id: 0x92233392
-}
-member {
-  id: 0xe4dfd298
-  name: "remote_tlb_flush_requests"
-  type_id: 0x92233392
-  offset: 64
-}
 member {
   id: 0x39638edc
   name: "remote_tx_win"
@@ -160066,11 +157098,6 @@ member {
   type_id: 0x74d29cf1
   offset: 5504
 }
-member {
-  id: 0xf6476a4c
-  name: "request_interrupt_window"
-  type_id: 0xb3e7bac9
-}
 member {
   id: 0x6fead5f8
   name: "request_is_queued"
@@ -160187,12 +157214,6 @@ member {
   type_id: 0x6720d32f
   offset: 3200
 }
-member {
-  id: 0x9f936789
-  name: "requests"
-  type_id: 0x92233392
-  offset: 448
-}
 member {
   id: 0x9fd286ba
   name: "requests"
@@ -160361,18 +157382,6 @@ member {
   type_id: 0x21397e56
   offset: 128
 }
-member {
-  id: 0xacf78dbd
-  name: "resampler_list"
-  type_id: 0xd3c80119
-  offset: 192
-}
-member {
-  id: 0x85260d3d
-  name: "resampler_lock"
-  type_id: 0xa7c362b0
-  offset: 320
-}
 member {
   id: 0x1aa9410e
   name: "rescan"
@@ -160895,12 +157904,6 @@ member {
   type_id: 0xb3e7bac9
   offset: 152
 }
-member {
-  id: 0xd4d047b1
-  name: "reserved"
-  type_id: 0xb3e7bac9
-  offset: 72
-}
 member {
   id: 0xd4d15398
   name: "reserved"
@@ -160937,6 +157940,12 @@ member {
   type_id: 0xb4d0b861
   offset: 32
 }
+member {
+  id: 0xd4ed0237
+  name: "reserved"
+  type_id: 0x8ea78f33
+  offset: 128
+}
 member {
   id: 0xd4eef0a8
   name: "reserved"
@@ -161306,12 +158315,6 @@ member {
   type_id: 0x0c5ef833
   offset: 576
 }
-member {
-  id: 0x62b29c82
-  name: "reset"
-  type_id: 0x0f3dfb90
-  offset: 3200
-}
 member {
   id: 0x62b2a267
   name: "reset"
@@ -161324,12 +158327,6 @@ member {
   type_id: 0x0ec90737
   offset: 128
 }
-member {
-  id: 0x62d0d919
-  name: "reset"
-  type_id: 0x6d7f5ff6
-  offset: 136
-}
 member {
   id: 0x62d0da0e
   name: "reset"
@@ -161433,12 +158430,6 @@ member {
   offset: 11178
   bitsize: 1
 }
-member {
-  id: 0xcfe72c2d
-  name: "reset_index"
-  type_id: 0xc9082b19
-  offset: 32
-}
 member {
   id: 0xb1b2f32e
   name: "reset_methods"
@@ -161506,12 +158497,6 @@ member {
   type_id: 0x2ced3956
   offset: 512
 }
-member {
-  id: 0xa700e1ff
-  name: "reset_state"
-  type_id: 0x3f42023f
-  offset: 67392
-}
 member {
   id: 0xa4c83369
   name: "reset_time"
@@ -161561,12 +158546,6 @@ member {
   type_id: 0x2e0f9112
   offset: 128
 }
-member {
-  id: 0x3a956acf
-  name: "resident"
-  type_id: 0x6d7f5ff6
-  offset: 256
-}
 member {
   id: 0x38e53c13
   name: "residual_transfer_count"
@@ -161984,18 +158963,6 @@ member {
   type_id: 0x6720d32f
   offset: 576
 }
-member {
-  id: 0x07c203de
-  name: "result"
-  type_id: 0xedf277ba
-  offset: 64
-}
-member {
-  id: 0x07c20efd
-  name: "result"
-  type_id: 0xedf277ba
-  offset: 128
-}
 member {
   id: 0x07cb2b16
   name: "result"
@@ -162304,18 +159271,6 @@ member {
   type_id: 0x295c7202
   offset: 320
 }
-member {
-  id: 0x517bb4e8
-  name: "ret"
-  type_id: 0xedf277ba
-  offset: 64
-}
-member {
-  id: 0x517bb77e
-  name: "ret"
-  type_id: 0xedf277ba
-  offset: 448
-}
 member {
   id: 0x51f16a64
   name: "ret"
@@ -162328,12 +159283,6 @@ member {
   type_id: 0x6720d32f
   offset: 32
 }
-member {
-  id: 0x51f63d7f
-  name: "ret"
-  type_id: 0x607419c2
-  offset: 512
-}
 member {
   id: 0x4c003468
   name: "ret_addr"
@@ -162363,12 +159312,6 @@ member {
   type_id: 0xe448b2fe
   offset: 96
 }
-member {
-  id: 0xff72a66c
-  name: "ret_value"
-  type_id: 0x33756485
-  offset: 192
-}
 member {
   id: 0xf64e43b1
   name: "retimer"
@@ -162897,12 +159840,6 @@ member {
   name: "ring_lock"
   type_id: 0xa7c362b0
 }
-member {
-  id: 0xa84d097f
-  name: "ring_lock"
-  type_id: 0xf313e71a
-  offset: 24704
-}
 member {
   id: 0x66a87345
   name: "ring_mask"
@@ -162932,21 +159869,6 @@ member {
   type_id: 0x16c47ce6
   offset: 128
 }
-member {
-  id: 0x28cf1121
-  name: "rip"
-  type_id: 0xedf277ba
-}
-member {
-  id: 0xb09d2ffa
-  name: "riscv_csr"
-  type_id: 0x0f0b7249
-}
-member {
-  id: 0x112a2e09
-  name: "riscv_sbi"
-  type_id: 0x378b9399
-}
 member {
   id: 0xef0151a4
   name: "rlim"
@@ -164539,12 +161461,6 @@ member {
   type_id: 0x33756485
   offset: 3136
 }
-member {
-  id: 0x021fd03f
-  name: "run"
-  type_id: 0x3da548f2
-  offset: 960
-}
 member {
   id: 0x2f68ddc4
   name: "run_array"
@@ -165736,12 +162652,6 @@ member {
   name: "s"
   type_id: 0xc9082b19
 }
-member {
-  id: 0x67846dd9
-  name: "s"
-  type_id: 0x76df8305
-  offset: 2432
-}
 member {
   id: 0x67c4eef4
   name: "s"
@@ -165800,31 +162710,6 @@ member {
   type_id: 0xd41e888f
   offset: 640
 }
-member {
-  id: 0x3fd31627
-  name: "s390_reset_flags"
-  type_id: 0xedf277ba
-}
-member {
-  id: 0x2b1b8ef2
-  name: "s390_sieic"
-  type_id: 0x31f9c69b
-}
-member {
-  id: 0x5fd2e3fb
-  name: "s390_stsi"
-  type_id: 0x114efe06
-}
-member {
-  id: 0x66d41c47
-  name: "s390_tsch"
-  type_id: 0x0ad62715
-}
-member {
-  id: 0xd9d85a91
-  name: "s390_ucontrol"
-  type_id: 0x19910c85
-}
 member {
   id: 0x87554dcf
   name: "s3d_ext_data"
@@ -167095,6 +163980,11 @@ member {
   type_id: 0x18bd6530
   offset: 256
 }
+member {
+  id: 0xd440bc7f
+  name: "sbq"
+  type_id: 0x12e24ee1
+}
 member {
   id: 0x693c7182
   name: "sbrn"
@@ -167539,11 +164429,6 @@ member {
   type_id: 0x4585663f
   offset: 28672
 }
-member {
-  id: 0xe0b448e4
-  name: "sched_in"
-  type_id: 0x0c5f174a
-}
 member {
   id: 0x03385852
   name: "sched_info"
@@ -167563,12 +164448,6 @@ member {
   type_id: 0x0faae5b1
   offset: 128
 }
-member {
-  id: 0x7b24028f
-  name: "sched_out"
-  type_id: 0x0c252e30
-  offset: 64
-}
 member {
   id: 0x848a6070
   name: "sched_period"
@@ -168469,12 +165348,6 @@ member {
   type_id: 0x80904a3b
   offset: 256
 }
-member {
-  id: 0xa39136f0
-  name: "secure_access"
-  type_id: 0x6d7f5ff6
-  offset: 3424
-}
 member {
   id: 0xb0199c94
   name: "secure_elements"
@@ -168738,18 +165611,6 @@ member {
   type_id: 0x7047fa95
   offset: 832
 }
-member {
-  id: 0xebeb17cb
-  name: "sel1"
-  type_id: 0xb3e7bac9
-  offset: 88
-}
-member {
-  id: 0xaf6f4ac0
-  name: "sel2"
-  type_id: 0xe8034002
-  offset: 96
-}
 member {
   id: 0x72d71532
   name: "sel_res"
@@ -168987,12 +165848,6 @@ member {
   type_id: 0x2ee1b2db
   offset: 192
 }
-member {
-  id: 0xc2c18445
-  name: "send_page"
-  type_id: 0xedf277ba
-  offset: 192
-}
 member {
   id: 0x42f73f70
   name: "send_pkt"
@@ -169906,12 +166761,6 @@ member {
   type_id: 0x2ca91a7b
   offset: 128
 }
-member {
-  id: 0x0bb97dbd
-  name: "set_attr"
-  type_id: 0x2ee94408
-  offset: 320
-}
 member {
   id: 0xd1a721b7
   name: "set_auto_vbus_discharge_threshold"
@@ -170255,12 +167104,6 @@ member {
   type_id: 0x0d44ba38
   offset: 128
 }
-member {
-  id: 0x3cc9ff38
-  name: "set_event_filter"
-  type_id: 0x2ebb6897
-  offset: 2880
-}
 member {
   id: 0xada2d6c5
   name: "set_fecparam"
@@ -170345,6 +167188,11 @@ member {
   type_id: 0x2ccfa873
   offset: 1344
 }
+member {
+  id: 0x88f65c40
+  name: "set_interface"
+  type_id: 0x2d2076df
+}
 member {
   id: 0xce6643c0
   name: "set_ios"
@@ -170664,6 +167512,18 @@ member {
   type_id: 0x2ec73a64
   offset: 1344
 }
+member {
+  id: 0x18766439
+  name: "set_pcm_connection"
+  type_id: 0x2db6fcd8
+  offset: 128
+}
+member {
+  id: 0x58055805
+  name: "set_pcm_intf"
+  type_id: 0x2f815de7
+  offset: 64
+}
 member {
   id: 0xf0a8a677
   name: "set_pd_rx"
@@ -171655,12 +168515,6 @@ member {
   type_id: 0x295c7202
   offset: 240
 }
-member {
-  id: 0x4e4c2253
-  name: "sflags"
-  type_id: 0x295c7202
-  offset: 15408
-}
 member {
   id: 0x00c081a9
   name: "sfmode"
@@ -171890,18 +168744,6 @@ member {
   type_id: 0x18bd6530
   offset: 576
 }
-member {
-  id: 0x57b79a32
-  name: "sgi_config"
-  type_id: 0x4b27ac3d
-  offset: 128
-}
-member {
-  id: 0xb049594d
-  name: "sgi_domain"
-  type_id: 0x18a2fb63
-  offset: 64
-}
 member {
   id: 0x37a44b88
   name: "sgid"
@@ -172943,12 +169785,6 @@ member {
   type_id: 0x02097f03
   offset: 128
 }
-member {
-  id: 0xbf28dc5b
-  name: "signal_exits"
-  type_id: 0x92233392
-  offset: 6976
-}
 member {
   id: 0x7eb64f1d
   name: "signal_type"
@@ -172997,18 +169833,6 @@ member {
   type_id: 0x18bd6530
   offset: 64
 }
-member {
-  id: 0xd1201d45
-  name: "sigset"
-  type_id: 0x02097f03
-  offset: 1216
-}
-member {
-  id: 0x54ebc83a
-  name: "sigset_active"
-  type_id: 0x6720d32f
-  offset: 1152
-}
 member {
   id: 0x08f6c3d8
   name: "sigtrap"
@@ -173405,12 +170229,6 @@ member {
   type_id: 0xedf277ba
   offset: 64
 }
-member {
-  id: 0xd99613f3
-  name: "size"
-  type_id: 0xe8034002
-  offset: 48
-}
 member {
   id: 0xd9961bae
   name: "size"
@@ -173488,12 +170306,6 @@ member {
   type_id: 0xbdd18903
   offset: 320
 }
-member {
-  id: 0xd9cdf02e
-  name: "size"
-  type_id: 0xb3e7bac9
-  offset: 8
-}
 member {
   id: 0xd9eb71ce
   name: "size"
@@ -174997,12 +171809,6 @@ member {
   type_id: 0x6720d32f
   offset: 512
 }
-member {
-  id: 0x68304f23
-  name: "slot"
-  type_id: 0xe62ebf07
-  offset: 32
-}
 member {
   id: 0x688c706c
   name: "slot"
@@ -175150,24 +171956,12 @@ member {
   name: "slots"
   type_id: 0xa634ef38
 }
-member {
-  id: 0x59597675
-  name: "slots_arch_lock"
-  type_id: 0xa7c362b0
-  offset: 448
-}
 member {
   id: 0xdd8a193d
   name: "slots_lock"
   type_id: 0x8d536703
   offset: 32768
 }
-member {
-  id: 0xdda08f2f
-  name: "slots_lock"
-  type_id: 0xa7c362b0
-  offset: 64
-}
 member {
   id: 0x3e932eb1
   name: "slow_charger_loop"
@@ -175311,12 +172105,6 @@ member {
   name: "smc_hash"
   type_id: 0x3c4ed50c
 }
-member {
-  id: 0xe4cebf61
-  name: "smccc_feat"
-  type_id: 0x2c432ef9
-  offset: 3200
-}
 member {
   id: 0x0697a2b0
   name: "smem_len"
@@ -175565,12 +172353,6 @@ member {
   name: "soft_byte_limit"
   type_id: 0xedf277ba
 }
-member {
-  id: 0x275ed516
-  name: "soft_limit"
-  type_id: 0xc9082b19
-  offset: 96
-}
 member {
   id: 0x27a4adf4
   name: "soft_limit"
@@ -175761,12 +172543,6 @@ member {
   type_id: 0x8d58bd1a
   offset: 96
 }
-member {
-  id: 0xd707c4f8
-  name: "source"
-  type_id: 0x295c7202
-  offset: 672
-}
 member {
   id: 0xd71086bc
   name: "source"
@@ -176152,12 +172928,6 @@ member {
   type_id: 0x6720d32f
   offset: 416
 }
-member {
-  id: 0x36ede007
-  name: "spin_loop"
-  type_id: 0x174a7c6e
-  offset: 1920
-}
 member {
   id: 0x9a7d3066
   name: "spinlock"
@@ -176175,12 +172945,6 @@ member {
   type_id: 0x33756485
   offset: 64
 }
-member {
-  id: 0xde92dea2
-  name: "spis"
-  type_id: 0x1a1575dd
-  offset: 448
-}
 member {
   id: 0xe3c602fa
   name: "splen"
@@ -176809,10 +173573,10 @@ member {
   offset: 416
 }
 member {
-  id: 0x2b889279
-  name: "srcu"
-  type_id: 0xa46efa19
-  offset: 26560
+  id: 0xcd809b0d
+  name: "srcrt"
+  type_id: 0xe8034002
+  offset: 64
 }
 member {
   id: 0x2b8894ec
@@ -177023,6 +173787,12 @@ member {
   type_id: 0xe8034002
   offset: 1584
 }
+member {
+  id: 0xc5c8b651
+  name: "srhoff"
+  type_id: 0xe8034002
+  offset: 176
+}
 member {
   id: 0x8e4ea0f1
   name: "sriov"
@@ -177511,12 +174281,6 @@ member {
   type_id: 0x0d2a160e
   offset: 448
 }
-member {
-  id: 0x4616bb5f
-  name: "start"
-  type_id: 0x0d879e14
-  offset: 3072
-}
 member {
   id: 0x46176449
   name: "start"
@@ -177540,12 +174304,6 @@ member {
   type_id: 0x33756485
   offset: 192
 }
-member {
-  id: 0x46284ff6
-  name: "start"
-  type_id: 0x33756485
-  offset: 128
-}
 member {
   id: 0x462b6471
   name: "start"
@@ -177811,12 +174569,6 @@ member {
   name: "start_id"
   type_id: 0xe62ebf07
 }
-member {
-  id: 0x4c6ccc95
-  name: "start_level"
-  type_id: 0xc9082b19
-  offset: 32
-}
 member {
   id: 0x4ca5b709
   name: "start_level"
@@ -178070,24 +174822,12 @@ member {
   name: "stashed"
   type_id: 0xb02b353a
 }
-member {
-  id: 0xb934c444
-  name: "stat"
-  type_id: 0x8f4af0b6
-  offset: 69760
-}
 member {
   id: 0xb936ff9f
   name: "stat"
   type_id: 0x8d724b7d
   offset: 768
 }
-member {
-  id: 0xb9403407
-  name: "stat"
-  type_id: 0xfbb47533
-  offset: 20416
-}
 member {
   id: 0xb9498bcf
   name: "stat"
@@ -179119,18 +175859,6 @@ member {
   type_id: 0xe62ebf07
   offset: 288
 }
-member {
-  id: 0xd657a07c
-  name: "stats_id"
-  type_id: 0x1d61e0cf
-  offset: 34384
-}
-member {
-  id: 0xd657a20e
-  name: "stats_id"
-  type_id: 0x1d61e0cf
-  offset: 76864
-}
 member {
   id: 0x17c68b0c
   name: "stats_lock"
@@ -179285,11 +176013,6 @@ member {
   name: "status"
   type_id: 0x02fc92e9
 }
-member {
-  id: 0x20688d61
-  name: "status"
-  type_id: 0x0faae5b1
-}
 member {
   id: 0x2069471f
   name: "status"
@@ -179355,12 +176078,6 @@ member {
   type_id: 0xe2f9425b
   offset: 2176
 }
-member {
-  id: 0x208adc31
-  name: "status"
-  type_id: 0xedf277ba
-  offset: 128
-}
 member {
   id: 0x208f24c4
   name: "status"
@@ -179474,23 +176191,6 @@ member {
   type_id: 0x16f3caa7
   offset: 384
 }
-member {
-  id: 0x368deee8
-  name: "std_bmap"
-  type_id: 0x33756485
-}
-member {
-  id: 0x17d504ad
-  name: "std_hyp_bmap"
-  type_id: 0x33756485
-  offset: 64
-}
-member {
-  id: 0x80093c04
-  name: "steal"
-  type_id: 0x34ed11d4
-  offset: 67584
-}
 member {
   id: 0x6a086ae6
   name: "step"
@@ -179649,12 +176349,6 @@ member {
   type_id: 0x0d2aaf9f
   offset: 320
 }
-member {
-  id: 0x6985f4f1
-  name: "stop"
-  type_id: 0x0d879e14
-  offset: 3136
-}
 member {
   id: 0x698616dc
   name: "stop"
@@ -180424,17 +177118,6 @@ member {
   type_id: 0x42201dce
   offset: 224
 }
-member {
-  id: 0x4add8ec8
-  name: "subchannel_id"
-  type_id: 0xe8034002
-}
-member {
-  id: 0x34ac3a50
-  name: "subchannel_nr"
-  type_id: 0xe8034002
-  offset: 16
-}
 member {
   id: 0x2c4470df
   name: "subclass_code"
@@ -180517,11 +177200,6 @@ member {
   name: "subdirs"
   type_id: 0x33756485
 }
-member {
-  id: 0x0ede87d4
-  name: "suberror"
-  type_id: 0xe62ebf07
-}
 member {
   id: 0x31604159
   name: "subformat"
@@ -181125,18 +177803,6 @@ member {
   type_id: 0xc9082b19
   offset: 32
 }
-member {
-  id: 0x86378461
-  name: "supported_cpus"
-  type_id: 0x99caa0ae
-  offset: 3072
-}
-member {
-  id: 0x86b24cf6
-  name: "supported_cpus"
-  type_id: 0x1c04d361
-  offset: 2368
-}
 member {
   id: 0x8d29a756
   name: "supported_events"
@@ -181684,12 +178350,6 @@ member {
   type_id: 0x92233392
   offset: 8832
 }
-member {
-  id: 0xae35f89b
-  name: "svcr"
-  type_id: 0x92233392
-  offset: 14720
-}
 member {
   id: 0x81787084
   name: "svdm_version"
@@ -181702,24 +178362,12 @@ member {
   type_id: 0xaca841ec
   offset: 7680
 }
-member {
-  id: 0x05e10aeb
-  name: "sve_max_vl"
-  type_id: 0x4585663f
-  offset: 14656
-}
 member {
   id: 0x2e0a3ab1
   name: "sve_state"
   type_id: 0x18bd6530
   offset: 5376
 }
-member {
-  id: 0x2e0a3f7d
-  name: "sve_state"
-  type_id: 0x18bd6530
-  offset: 14592
-}
 member {
   id: 0x0faf2220
   name: "svid"
@@ -182194,6 +178842,12 @@ member {
   type_id: 0x5d8155a5
   offset: 400
 }
+member {
+  id: 0x88a8ecb4
+  name: "sync_dev_ctx"
+  type_id: 0x2c9dd50a
+  offset: 448
+}
 member {
   id: 0xaa5b83a9
   name: "sync_dma"
@@ -182445,22 +179099,6 @@ member {
   type_id: 0x104ad696
   offset: 256
 }
-member {
-  id: 0x5debde6d
-  name: "syncr_busy"
-  type_id: 0x74d29cf1
-  offset: 31776
-}
-member {
-  id: 0x6f97ea5f
-  name: "syndbg"
-  type_id: 0x14e96be8
-}
-member {
-  id: 0x545bc45d
-  name: "synic"
-  type_id: 0x14e96bc2
-}
 member {
   id: 0x8e7c5fc5
   name: "synq_overflow_ts"
@@ -183415,11 +180053,6 @@ member {
   type_id: 0x011d1743
   offset: 384
 }
-member {
-  id: 0xb39193a3
-  name: "system_event"
-  type_id: 0x0f6d86be
-}
 member {
   id: 0x10e96a60
   name: "system_load"
@@ -184001,12 +180634,6 @@ member {
   name: "target"
   type_id: 0x6720d32f
 }
-member {
-  id: 0xb3c5f85e
-  name: "target"
-  type_id: 0x6720d32f
-  offset: 67200
-}
 member {
   id: 0xb3da3bc9
   name: "target"
@@ -184217,23 +180844,12 @@ member {
   type_id: 0xc9082b19
   offset: 2368
 }
-member {
-  id: 0x096d65bb
-  name: "target_vcpu"
-  type_id: 0x08dcfb76
-  offset: 384
-}
 member {
   id: 0x16133746
   name: "targets"
   type_id: 0x0d107c2b
   offset: 64
 }
-member {
-  id: 0x16377fa9
-  name: "targets"
-  type_id: 0x295c7202
-}
 member {
   id: 0x167e5754
   name: "targets"
@@ -185111,18 +181727,6 @@ member {
   type_id: 0x0ee450d7
   offset: 192
 }
-member {
-  id: 0xb6388968
-  name: "teardown_mc"
-  type_id: 0xce6b97ea
-  offset: 64
-}
-member {
-  id: 0xc6b10bc0
-  name: "teardown_stage2_mc"
-  type_id: 0xce6b97ea
-  offset: 192
-}
 member {
   id: 0x1bd6a7d2
   name: "technology"
@@ -185334,12 +181938,6 @@ member {
   type_id: 0x6d7f5ff6
   offset: 296
 }
-member {
-  id: 0xa10fc33f
-  name: "test_young"
-  type_id: 0x2f50a983
-  offset: 192
-}
 member {
   id: 0x6ca576c7
   name: "testinfo_len"
@@ -186508,12 +183106,6 @@ member {
   type_id: 0xc9082b19
   offset: 12864
 }
-member {
-  id: 0x0120b46e
-  name: "timer_cpu"
-  type_id: 0x2f1ca510
-  offset: 59968
-}
 member {
   id: 0xf23824cb
   name: "timer_expires"
@@ -186599,11 +183191,6 @@ member {
   type_id: 0x55314bfb
   offset: 9472
 }
-member {
-  id: 0x30902b47
-  name: "timers"
-  type_id: 0x4c3e1687
-}
 member {
   id: 0x5742dd35
   name: "timers_active"
@@ -187618,11 +184205,6 @@ member {
   offset: 3370
   bitsize: 1
 }
-member {
-  id: 0x6fe88545
-  name: "tpr_access"
-  type_id: 0x12592f4f
-}
 member {
   id: 0x14f2c5a7
   name: "tq"
@@ -187810,11 +184392,6 @@ member {
   name: "trans_event"
   type_id: 0x4901181a
 }
-member {
-  id: 0x072855a4
-  name: "trans_exc_code"
-  type_id: 0xedf277ba
-}
 member {
   id: 0x58786d8a
   name: "trans_start"
@@ -188093,6 +184670,12 @@ member {
   name: "transport"
   type_id: 0x19d71054
 }
+member {
+  id: 0xf2cb3293
+  name: "transport_finish"
+  type_id: 0x2dc3d72e
+  offset: 640
+}
 member {
   id: 0x2a829378
   name: "transport_header"
@@ -188255,12 +184838,6 @@ member {
   type_id: 0x3846864c
   offset: 6656
 }
-member {
-  id: 0x81d670ed
-  name: "trfcr_el1"
-  type_id: 0x92233392
-  offset: 4160
-}
 member {
   id: 0xd1709568
   name: "tricklecharge_current_ua"
@@ -188898,6 +185475,12 @@ member {
   type_id: 0x39fc1b17
   offset: 6224
 }
+member {
+  id: 0x8905c822
+  name: "tt_info"
+  type_id: 0x0baa70a7
+  offset: 64
+}
 member {
   id: 0x8909eca8
   name: "tt_info"
@@ -189922,6 +186505,12 @@ member {
   type_id: 0x6d7f5ff6
   offset: 13088
 }
+member {
+  id: 0x67023990
+  name: "tx_info"
+  type_id: 0x0baa70a7
+  offset: 128
+}
 member {
   id: 0x489a6749
   name: "tx_ir"
@@ -191366,6 +187955,12 @@ member {
   offset: 27
   bitsize: 2
 }
+member {
+  id: 0x7263c7bf
+  name: "type_ah"
+  type_id: 0x32b54b11
+  offset: 384
+}
 member {
   id: 0x737fb73e
   name: "type_attr_map_array"
@@ -191409,6 +188004,12 @@ member {
   type_id: 0xc9082b19
   offset: 480
 }
+member {
+  id: 0xd4787e60
+  name: "type_comp"
+  type_id: 0x32b54b11
+  offset: 320
+}
 member {
   id: 0xb38ca977
   name: "type_control"
@@ -191421,6 +188022,18 @@ member {
   type_id: 0x18bd6530
   offset: 448
 }
+member {
+  id: 0xf2fe58e1
+  name: "type_dstopts"
+  type_id: 0x32b54b11
+  offset: 512
+}
+member {
+  id: 0xc64a2d69
+  name: "type_esp"
+  type_id: 0x32b54b11
+  offset: 128
+}
 member {
   id: 0xe6df641d
   name: "type_falling_val"
@@ -191472,6 +188085,18 @@ member {
   offset: 616
   bitsize: 1
 }
+member {
+  id: 0xec93386d
+  name: "type_ipip"
+  type_id: 0x32b54b11
+  offset: 192
+}
+member {
+  id: 0xf788152f
+  name: "type_ipip6"
+  type_id: 0x32b54b11
+  offset: 256
+}
 member {
   id: 0xc29ac9a5
   name: "type_iso"
@@ -191533,6 +188158,12 @@ member {
   type_id: 0x3f5329f7
   offset: 5952
 }
+member {
+  id: 0x797b9c35
+  name: "type_offload_esp"
+  type_id: 0x3f5329f7
+  offset: 64
+}
 member {
   id: 0x9d444403
   name: "type_ops"
@@ -191568,6 +188199,12 @@ member {
   type_id: 0x4585663f
   offset: 64
 }
+member {
+  id: 0x34322597
+  name: "type_routing"
+  type_id: 0x32b54b11
+  offset: 448
+}
 member {
   id: 0x4a3d814f
   name: "type_str_buf"
@@ -191720,12 +188357,6 @@ member {
   name: "u"
   type_id: 0x6905d706
 }
-member {
-  id: 0xec1fd483
-  name: "u"
-  type_id: 0x608c0f38
-  offset: 64
-}
 member {
   id: 0xec25b730
   name: "u"
@@ -191754,12 +188385,6 @@ member {
   type_id: 0x460e36a4
   offset: 960
 }
-member {
-  id: 0xec3c82cc
-  name: "u"
-  type_id: 0x43da400a
-  offset: 64
-}
 member {
   id: 0xec3d71ae
   name: "u"
@@ -191911,22 +188536,6 @@ member {
   type_id: 0x33756485
   offset: 256
 }
-member {
-  id: 0x1a96b10c
-  name: "uaccess_its_write"
-  type_id: 0x2eae2318
-}
-member {
-  id: 0x8638eb22
-  name: "uaccess_read"
-  type_id: 0x0669d6b3
-  offset: 256
-}
-member {
-  id: 0x34f83972
-  name: "uaccess_write"
-  type_id: 0x2d62ee59
-}
 member {
   id: 0x555ff25e
   name: "uaddr"
@@ -194246,6 +190855,12 @@ member {
   type_id: 0xc9082b19
   offset: 1216
 }
+member {
+  id: 0xc6a4da74
+  name: "usb_offload_skip_urb"
+  type_id: 0x34104e47
+  offset: 512
+}
 member {
   id: 0x171fc3a7
   name: "usb_pd"
@@ -194774,18 +191389,6 @@ member {
   name: "used_keys"
   type_id: 0x4585663f
 }
-member {
-  id: 0x867737e5
-  name: "used_lrs"
-  type_id: 0x4585663f
-  offset: 2144
-}
-member {
-  id: 0x8677397b
-  name: "used_lrs"
-  type_id: 0x4585663f
-  offset: 2432
-}
 member {
   id: 0x59ccfd6e
   name: "used_map_cnt"
@@ -194816,12 +191419,6 @@ member {
   type_id: 0xa7c362b0
   offset: 6720
 }
-member {
-  id: 0x0170d376
-  name: "used_mask"
-  type_id: 0xb914bfab
-  offset: 2048
-}
 member {
   id: 0xcd075131
   name: "used_sems"
@@ -195216,24 +191813,12 @@ member {
   type_id: 0x6720d32f
   offset: 960
 }
-member {
-  id: 0x85e876e9
-  name: "users"
-  type_id: 0x4585663f
-  offset: 384
-}
 member {
   id: 0x85e87d65
   name: "users"
   type_id: 0x4585663f
   offset: 4544
 }
-member {
-  id: 0x914f88a3
-  name: "users_count"
-  type_id: 0xa722c13e
-  offset: 24576
-}
 member {
   id: 0xbb6c91c3
   name: "usersize"
@@ -195264,12 +191849,6 @@ member {
   type_id: 0xa7c362b0
   offset: 8960
 }
-member {
-  id: 0xff77b3c7
-  name: "userspace_pid"
-  type_id: 0x49b889e7
-  offset: 34240
-}
 member {
   id: 0x959b553f
   name: "uses_need_wakeup"
@@ -195589,12 +192168,6 @@ member {
   name: "v2"
   type_id: 0xe10a7e38
 }
-member {
-  id: 0x76466478
-  name: "v2_groups_user_writable"
-  type_id: 0x6d7f5ff6
-  offset: 96
-}
 member {
   id: 0x195445f8
   name: "v4"
@@ -195924,12 +192497,6 @@ member {
   type_id: 0x4585663f
   offset: 448
 }
-member {
-  id: 0x7e5c1bb6
-  name: "valid_wakeup"
-  type_id: 0x6d7f5ff6
-  offset: 1312
-}
 member {
   id: 0x2a0a55ed
   name: "validate"
@@ -196521,47 +193088,6 @@ member {
   type_id: 0x2e0761ed
   offset: 192
 }
-member {
-  id: 0xa936a2d5
-  name: "vcpu"
-  type_id: 0x08dcfb76
-}
-member {
-  id: 0xa936a512
-  name: "vcpu"
-  type_id: 0x08dcfb76
-  offset: 320
-}
-member {
-  id: 0xcd6e2d79
-  name: "vcpu_array"
-  type_id: 0x80c20070
-  offset: 18176
-}
-member {
-  id: 0xf58a324e
-  name: "vcpu_debug_state"
-  type_id: 0x590c6dd8
-  offset: 15488
-}
-member {
-  id: 0x7c4a52b5
-  name: "vcpu_id"
-  type_id: 0x6720d32f
-  offset: 288
-}
-member {
-  id: 0x7c4a5fae
-  name: "vcpu_id"
-  type_id: 0x6720d32f
-  offset: 128
-}
-member {
-  id: 0xbcb323c9
-  name: "vcpu_idx"
-  type_id: 0x6720d32f
-  offset: 320
-}
 member {
   id: 0x522a42f5
   name: "vd"
@@ -196699,11 +193225,6 @@ member {
   type_id: 0x39e70eca
   offset: 640
 }
-member {
-  id: 0x831d3c48
-  name: "vector"
-  type_id: 0xb3e7bac9
-}
 member {
   id: 0x8367d3d9
   name: "vector"
@@ -196777,6 +193298,12 @@ member {
   name: "vendor"
   type_id: 0xa745d9ba
 }
+member {
+  id: 0x19d3d4c2
+  name: "vendor_cleanup"
+  type_id: 0x0f9e7cc3
+  offset: 64
+}
 member {
   id: 0xb9270675
   name: "vendor_cmds"
@@ -196801,12 +193328,6 @@ member {
   type_id: 0x3deeb8f4
   offset: 11008
 }
-member {
-  id: 0xba785216
-  name: "vendor_hyp_bmap"
-  type_id: 0x33756485
-  offset: 128
-}
 member {
   id: 0x0b0b87f3
   name: "vendor_id"
@@ -196830,6 +193351,11 @@ member {
   type_id: 0x92233392
   offset: 2816
 }
+member {
+  id: 0xcc0a44cd
+  name: "vendor_init"
+  type_id: 0x2cd8506c
+}
 member {
   id: 0xc240aa08
   name: "vendor_load"
@@ -197246,97 +193772,6 @@ member {
   type_id: 0x4456a43e
   offset: 1024
 }
-member {
-  id: 0xf510916c
-  name: "vgic"
-  type_id: 0x2c25c966
-  offset: 384
-}
-member {
-  id: 0xaa37d774
-  name: "vgic_ap0r"
-  type_id: 0xbe0f19dc
-  offset: 96
-}
-member {
-  id: 0x47207a3e
-  name: "vgic_ap1r"
-  type_id: 0xbe0f19dc
-  offset: 224
-}
-member {
-  id: 0xc9dbb39f
-  name: "vgic_apr"
-  type_id: 0xc9082b19
-  offset: 64
-}
-member {
-  id: 0x76772152
-  name: "vgic_cpu"
-  type_id: 0xe46534dd
-  offset: 27968
-}
-member {
-  id: 0x082c701d
-  name: "vgic_cpu_base"
-  type_id: 0x1b4ba19a
-}
-member {
-  id: 0xc573cedf
-  name: "vgic_dist_base"
-  type_id: 0x1b4ba19a
-  offset: 192
-}
-member {
-  id: 0x4a8c149d
-  name: "vgic_hcr"
-  type_id: 0xc9082b19
-}
-member {
-  id: 0x0f936dd3
-  name: "vgic_its_base"
-  type_id: 0x1b4ba19a
-}
-member {
-  id: 0xa73178a4
-  name: "vgic_lr"
-  type_id: 0x01e90d51
-  offset: 96
-}
-member {
-  id: 0xa75822b6
-  name: "vgic_lr"
-  type_id: 0x68bb0e75
-  offset: 384
-}
-member {
-  id: 0xe66fe569
-  name: "vgic_model"
-  type_id: 0xc9082b19
-  offset: 32
-}
-member {
-  id: 0x28fa73a3
-  name: "vgic_sre"
-  type_id: 0xc9082b19
-  offset: 64
-}
-member {
-  id: 0xd491835d
-  name: "vgic_v2"
-  type_id: 0x020c6b41
-}
-member {
-  id: 0x166fabb0
-  name: "vgic_v3"
-  type_id: 0xbfc414f5
-}
-member {
-  id: 0x38bbfe42
-  name: "vgic_vmcr"
-  type_id: 0xc9082b19
-  offset: 32
-}
 member {
   id: 0x4e9808a4
   name: "vht_cap"
@@ -198177,12 +194612,6 @@ member {
   type_id: 0x1bf16028
   offset: 448
 }
-member {
-  id: 0x40e6d42e
-  name: "virt_to_phys"
-  type_id: 0x0b71f929
-  offset: 448
-}
 member {
   id: 0x47f05b51
   name: "virtmem"
@@ -198355,36 +194784,12 @@ member {
   type_id: 0x7584e7da
   offset: 16
 }
-member {
-  id: 0xd2927ea1
-  name: "vlpi_count"
-  type_id: 0x7e71c857
-  offset: 480
-}
-member {
-  id: 0xd298d587
-  name: "vlpi_count"
-  type_id: 0x74d29cf1
-  offset: 128
-}
 member {
   id: 0x182c3eca
   name: "vm_addr_space_mm"
   type_id: 0x8f0e76d7
   offset: 64
 }
-member {
-  id: 0x3046b926
-  name: "vm_bugged"
-  type_id: 0x6d7f5ff6
-  offset: 34368
-}
-member {
-  id: 0x82dad882
-  name: "vm_dead"
-  type_id: 0x6d7f5ff6
-  offset: 34376
-}
 member {
   id: 0xc16704da
   name: "vm_end"
@@ -198408,12 +194813,6 @@ member {
   name: "vm_flags"
   type_id: 0xd2d7132a
 }
-member {
-  id: 0x5d9a7aad
-  name: "vm_list"
-  type_id: 0xd3c80119
-  offset: 18816
-}
 member {
   id: 0x155d76e4
   name: "vm_lock"
@@ -198443,12 +194842,6 @@ member {
   type_id: 0xb0510713
   offset: 64
 }
-member {
-  id: 0xd652df47
-  name: "vm_node"
-  type_id: 0xd3c80119
-  offset: 192
-}
 member {
   id: 0x5a0cf049
   name: "vm_node_stat_diff"
@@ -198613,12 +195006,6 @@ member {
   type_id: 0x4585663f
   offset: 4032
 }
-member {
-  id: 0x87ea4d5c
-  name: "vmapp_count"
-  type_id: 0x74d29cf1
-  offset: 512
-}
 member {
   id: 0x7a9a7619
   name: "vmapping_counter"
@@ -198631,11 +195018,6 @@ member {
   type_id: 0x33756485
   offset: 832
 }
-member {
-  id: 0x69149bd4
-  name: "vmid"
-  type_id: 0x0c039fcc
-}
 member {
   id: 0x69834c4a
   name: "vmid"
@@ -198813,64 +195195,24 @@ member {
   type_id: 0x2f43a458
   offset: 2560
 }
-member {
-  id: 0x3e9547ca
-  name: "vpe_db_lpi"
-  type_id: 0x22b36393
-  offset: 192
-}
-member {
-  id: 0x1b58edc6
-  name: "vpe_id"
-  type_id: 0x914dbfdc
-  offset: 944
-}
 member {
   id: 0x891a8488
   name: "vpe_l1_base"
   type_id: 0x18bd6530
   offset: 384
 }
-member {
-  id: 0xa8c6574f
-  name: "vpe_lock"
-  type_id: 0xc8b17aa7
-  offset: 896
-}
-member {
-  id: 0x715799b8
-  name: "vpe_proxy_event"
-  type_id: 0x6720d32f
-}
 member {
   id: 0x1a9ae5dc
   name: "vpe_table_mask"
   type_id: 0x0d910d7f
   offset: 320
 }
-member {
-  id: 0xade8e87b
-  name: "vpes"
-  type_id: 0x09af8dc9
-  offset: 192
-}
-member {
-  id: 0x18a69b62
-  name: "vprop_page"
-  type_id: 0x06835e9c
-  offset: 128
-}
 member {
   id: 0x991cc136
   name: "vps"
   type_id: 0x3dbcdeab
   offset: 1344
 }
-member {
-  id: 0xdca92f00
-  name: "vpt_page"
-  type_id: 0x06835e9c
-}
 member {
   id: 0xc5916613
   name: "vqmmc"
@@ -198990,12 +195332,6 @@ member {
   type_id: 0x4585663f
   offset: 1344
 }
-member {
-  id: 0xf681ca11
-  name: "vsesr_el2"
-  type_id: 0x92233392
-  offset: 67328
-}
 member {
   id: 0x8d8f1051
   name: "vsk"
@@ -199085,12 +195421,6 @@ member {
   type_id: 0x16c1acc8
   offset: 64
 }
-member {
-  id: 0x8b881e3c
-  name: "vtcr"
-  type_id: 0x92233392
-  offset: 320
-}
 member {
   id: 0xc821afee
   name: "vtermno"
@@ -199269,6 +195599,12 @@ member {
   type_id: 0x347ff86e
   offset: 192
 }
+member {
+  id: 0x201ba432
+  name: "wait"
+  type_id: 0x35a67227
+  offset: 64
+}
 member {
   id: 0x201ba81a
   name: "wait"
@@ -199364,12 +195700,6 @@ member {
   type_id: 0x76e1f83e
   offset: 128
 }
-member {
-  id: 0x20f5a5f4
-  name: "wait"
-  type_id: 0xdba44af3
-  offset: 1024
-}
 member {
   id: 0x9c8dc12c
   name: "wait_blkd_tasks"
@@ -200272,18 +196602,6 @@ member {
   type_id: 0x578f9c2b
   offset: 22080
 }
-member {
-  id: 0x33be0c85
-  name: "wfe_exit_stat"
-  type_id: 0x92233392
-  offset: 6720
-}
-member {
-  id: 0xff2da133
-  name: "wfi_exit_stat"
-  type_id: 0x92233392
-  offset: 6784
-}
 member {
   id: 0x149f4f99
   name: "wheel_accumulated"
@@ -201484,11 +197802,6 @@ member {
   type_id: 0x0e00c9b9
   offset: 384
 }
-member {
-  id: 0x340ef030
-  name: "write"
-  type_id: 0x0e24c2f6
-}
 member {
   id: 0x3421983a
   name: "write"
@@ -201525,12 +197838,6 @@ member {
   type_id: 0x2d82cfe3
   offset: 1728
 }
-member {
-  id: 0x342da96c
-  name: "write"
-  type_id: 0x2d797f87
-  offset: 64
-}
 member {
   id: 0x342db9a0
   name: "write"
@@ -201687,12 +197994,6 @@ member {
   type_id: 0x3fcbf304
   offset: 7488
 }
-member {
-  id: 0x5f710844
-  name: "write_counter"
-  type_id: 0x0ff8ee0d
-  offset: 3008
-}
 member {
   id: 0x074a81fd
   name: "write_dbi"
@@ -201818,12 +198119,6 @@ member {
   type_id: 0xa7c362b0
   offset: 7744
 }
-member {
-  id: 0x365e3956
-  name: "write_mask"
-  type_id: 0x33756485
-  offset: 128
-}
 member {
   id: 0x54db64f6
   name: "write_merkle_tree_block"
@@ -202518,11 +198813,6 @@ member {
   type_id: 0x1997574a
   offset: 19584
 }
-member {
-  id: 0xd9690496
-  name: "xen"
-  type_id: 0x56bbf50a
-}
 member {
   id: 0x768fe3f7
   name: "xfer_completion"
@@ -203200,17 +199490,6 @@ member {
   type_id: 0x18bd6530
   offset: 5440
 }
-member {
-  id: 0xe15e2cfc
-  name: "zalloc_page"
-  type_id: 0x1ebe4388
-}
-member {
-  id: 0x511e5f54
-  name: "zalloc_pages_exact"
-  type_id: 0x1076c35e
-  offset: 64
-}
 member {
   id: 0x8aa8a43b
   name: "zc"
@@ -203345,14 +199624,6 @@ struct_union {
     member_id: 0x317e66e0
   }
 }
-struct_union {
-  id: 0x00b57da4
-  kind: STRUCT
-  definition {
-    bytesize: 8
-    member_id: 0x6364e5fc
-  }
-}
 struct_union {
   id: 0x00bf9506
   kind: STRUCT
@@ -203362,15 +199633,6 @@ struct_union {
     member_id: 0xb8ccd046
   }
 }
-struct_union {
-  id: 0x00e0bdde
-  kind: STRUCT
-  definition {
-    bytesize: 8
-    member_id: 0x6245278e
-    member_id: 0x76c39912
-  }
-}
 struct_union {
   id: 0x01122cba
   kind: STRUCT
@@ -203469,18 +199731,6 @@ struct_union {
     member_id: 0xdf6c70da
   }
 }
-struct_union {
-  id: 0x033c2bb8
-  kind: STRUCT
-  definition {
-    bytesize: 72
-    member_id: 0x6dda6e7d
-    member_id: 0x9ba00ef7
-    member_id: 0x73fbf68d
-    member_id: 0x07c20efd
-    member_id: 0x4b34b9aa
-  }
-}
 struct_union {
   id: 0x0366c345
   kind: STRUCT
@@ -203510,17 +199760,6 @@ struct_union {
     member_id: 0xa2f022cd
   }
 }
-struct_union {
-  id: 0x03d32356
-  kind: STRUCT
-  definition {
-    bytesize: 72
-    member_id: 0x6e4d805e
-    member_id: 0xb049594d
-    member_id: 0x57b79a32
-    member_id: 0x87ea4d5c
-  }
-}
 struct_union {
   id: 0x0416665f
   kind: STRUCT
@@ -203532,15 +199771,6 @@ struct_union {
     member_id: 0xd44af669
   }
 }
-struct_union {
-  id: 0x042d9ee3
-  kind: STRUCT
-  definition {
-    bytesize: 8
-    member_id: 0x715799b8
-    member_id: 0x50f15a4b
-  }
-}
 struct_union {
   id: 0x048fc360
   kind: STRUCT
@@ -203550,16 +199780,6 @@ struct_union {
     member_id: 0x877591f3
   }
 }
-struct_union {
-  id: 0x04935a3e
-  kind: STRUCT
-  definition {
-    bytesize: 32
-    member_id: 0x73fbf26c
-    member_id: 0x07c203de
-    member_id: 0x4bf9b0b2
-  }
-}
 struct_union {
   id: 0x04cbe228
   kind: STRUCT
@@ -203779,18 +199999,6 @@ struct_union {
     member_id: 0xc76cfdee
   }
 }
-struct_union {
-  id: 0x079bc2f5
-  kind: STRUCT
-  definition {
-    bytesize: 24
-    member_id: 0x7fb53355
-    member_id: 0x6b90bd2c
-    member_id: 0xbbfcbfdf
-    member_id: 0xaddf2f83
-    member_id: 0xff7fdfd9
-  }
-}
 struct_union {
   id: 0x07ba491c
   kind: STRUCT
@@ -204003,19 +200211,6 @@ struct_union {
     member_id: 0x4b4ac8f5
   }
 }
-struct_union {
-  id: 0x0ad62715
-  kind: STRUCT
-  definition {
-    bytesize: 20
-    member_id: 0x4add8ec8
-    member_id: 0x34ac3a50
-    member_id: 0xadd5b431
-    member_id: 0x1dac28b0
-    member_id: 0x73d7e0dc
-    member_id: 0x8a59e26d
-  }
-}
 struct_union {
   id: 0x0b00a1fe
   kind: STRUCT
@@ -204343,17 +200538,6 @@ struct_union {
     member_id: 0x2d857ee0
   }
 }
-struct_union {
-  id: 0x0f0b7249
-  kind: STRUCT
-  definition {
-    bytesize: 32
-    member_id: 0x5d7bf520
-    member_id: 0xe719c8c0
-    member_id: 0x365e3956
-    member_id: 0xff72a66c
-  }
-}
 struct_union {
   id: 0x0f29d6cf
   kind: STRUCT
@@ -204416,16 +200600,6 @@ struct_union {
     member_id: 0x7440609a
   }
 }
-struct_union {
-  id: 0x0f6d86be
-  kind: STRUCT
-  definition {
-    bytesize: 136
-    member_id: 0x5cb0fbc1
-    member_id: 0xb7cbdc47
-    member_id: 0x398b7926
-  }
-}
 struct_union {
   id: 0x0f6e64b7
   kind: STRUCT
@@ -204463,15 +200637,6 @@ struct_union {
     member_id: 0x52944bcc
   }
 }
-struct_union {
-  id: 0x102e0991
-  kind: STRUCT
-  definition {
-    bytesize: 16
-    member_id: 0x215cae19
-    member_id: 0x559b32a7
-  }
-}
 struct_union {
   id: 0x105131fa
   kind: STRUCT
@@ -204570,19 +200735,6 @@ struct_union {
     member_id: 0x3b3d4f5b
   }
 }
-struct_union {
-  id: 0x114efe06
-  kind: STRUCT
-  definition {
-    bytesize: 16
-    member_id: 0x24c02d11
-    member_id: 0x4a120f63
-    member_id: 0xd4d047b1
-    member_id: 0xb86505a9
-    member_id: 0xebeb17cb
-    member_id: 0xaf6f4ac0
-  }
-}
 struct_union {
   id: 0x1162939f
   kind: STRUCT
@@ -204610,16 +200762,6 @@ struct_union {
     member_id: 0xcf58d11f
   }
 }
-struct_union {
-  id: 0x12592f4f
-  kind: STRUCT
-  definition {
-    bytesize: 16
-    member_id: 0x28cf1121
-    member_id: 0x1ad44087
-    member_id: 0x6b32a680
-  }
-}
 struct_union {
   id: 0x125b2ca2
   kind: STRUCT
@@ -204637,14 +200779,6 @@ struct_union {
     member_id: 0x283653a1
   }
 }
-struct_union {
-  id: 0x129d9eba
-  kind: STRUCT
-  definition {
-    bytesize: 256
-    member_id: 0x2bc76984
-  }
-}
 struct_union {
   id: 0x12af4722
   kind: STRUCT
@@ -204684,17 +200818,6 @@ struct_union {
     member_id: 0xa89e596a
   }
 }
-struct_union {
-  id: 0x13064264
-  kind: STRUCT
-  definition {
-    bytesize: 88
-    member_id: 0x2d1fec85
-    member_id: 0xb75a0aec
-    member_id: 0xacf78dbd
-    member_id: 0x85260d3d
-  }
-}
 struct_union {
   id: 0x130b9b47
   kind: STRUCT
@@ -204706,14 +200829,6 @@ struct_union {
     member_id: 0x3c63eeb5
   }
 }
-struct_union {
-  id: 0x130fee63
-  kind: STRUCT
-  definition {
-    bytesize: 4
-    member_id: 0x2d8eaae1
-  }
-}
 struct_union {
   id: 0x13110934
   kind: STRUCT
@@ -204958,32 +201073,6 @@ struct_union {
     member_id: 0x35690218
   }
 }
-struct_union {
-  id: 0x14e96bc2
-  kind: STRUCT
-  definition {
-    bytesize: 32
-    member_id: 0x32ae90fe
-    member_id: 0xbad0c2a3
-    member_id: 0xfcd19375
-    member_id: 0x89066d93
-    member_id: 0x67f93f00
-  }
-}
-struct_union {
-  id: 0x14e96be8
-  kind: STRUCT
-  definition {
-    bytesize: 48
-    member_id: 0x32ae90fe
-    member_id: 0xbad0c2a3
-    member_id: 0xfcd19375
-    member_id: 0x208adc31
-    member_id: 0xc2c18445
-    member_id: 0x32fffef6
-    member_id: 0x09b42908
-  }
-}
 struct_union {
   id: 0x153cf6a0
   kind: STRUCT
@@ -205097,15 +201186,6 @@ struct_union {
     member_id: 0x375980f6
   }
 }
-struct_union {
-  id: 0x174a7c6e
-  kind: STRUCT
-  definition {
-    bytesize: 2
-    member_id: 0x3c4c15e8
-    member_id: 0xd4f73d44
-  }
-}
 struct_union {
   id: 0x1764a0c5
   kind: STRUCT
@@ -205172,14 +201252,6 @@ struct_union {
     member_id: 0xf440fec0
   }
 }
-struct_union {
-  id: 0x197ee30b
-  kind: STRUCT
-  definition {
-    bytesize: 4
-    member_id: 0x044a9f42
-  }
-}
 struct_union {
   id: 0x1983785b
   kind: STRUCT
@@ -205189,15 +201261,6 @@ struct_union {
     member_id: 0x70959b33
   }
 }
-struct_union {
-  id: 0x19910c85
-  kind: STRUCT
-  definition {
-    bytesize: 16
-    member_id: 0x072855a4
-    member_id: 0xdd74def2
-  }
-}
 struct_union {
   id: 0x19bb23ae
   kind: STRUCT
@@ -205370,27 +201433,6 @@ struct_union {
     member_id: 0xf5eb6708
   }
 }
-struct_union {
-  id: 0x1bf61cb5
-  kind: STRUCT
-  definition {
-    bytesize: 32
-    member_id: 0x0ede87d4
-    member_id: 0xb7cbdc47
-    member_id: 0x2d8572c8
-    member_id: 0x34a3e933
-  }
-}
-struct_union {
-  id: 0x1bf62820
-  kind: STRUCT
-  definition {
-    bytesize: 136
-    member_id: 0x0ede87d4
-    member_id: 0xb7cbdc47
-    member_id: 0xffe56fd2
-  }
-}
 struct_union {
   id: 0x1c07f73e
   kind: STRUCT
@@ -205419,16 +201461,6 @@ struct_union {
     member_id: 0x3a91b492
   }
 }
-struct_union {
-  id: 0x1c51bab0
-  kind: STRUCT
-  definition {
-    bytesize: 3
-    member_id: 0x10cd0767
-    member_id: 0x3a2d355a
-    member_id: 0xd3ff70d7
-  }
-}
 struct_union {
   id: 0x1cac6f1f
   kind: STRUCT
@@ -205769,16 +201801,6 @@ struct_union {
     member_id: 0x240de36e
   }
 }
-struct_union {
-  id: 0x24232993
-  kind: STRUCT
-  definition {
-    bytesize: 12
-    member_id: 0xf1c2dba4
-    member_id: 0xff7407e8
-    member_id: 0x1a818982
-  }
-}
 struct_union {
   id: 0x244bebad
   kind: STRUCT
@@ -206115,28 +202137,6 @@ struct_union {
     member_id: 0x521e7522
   }
 }
-struct_union {
-  id: 0x2c2be6c7
-  kind: STRUCT
-  definition {
-    bytesize: 88
-    member_id: 0xd14fc76e
-    member_id: 0x517bb4e8
-    member_id: 0x34abfc7a
-  }
-}
-struct_union {
-  id: 0x2c32891d
-  kind: STRUCT
-  definition {
-    bytesize: 72
-    member_id: 0xd14fc76e
-    member_id: 0x34a16385
-    member_id: 0x517bb77e
-    member_id: 0x6dda6565
-    member_id: 0x6b32a1dc
-  }
-}
 struct_union {
   id: 0x2c5bdc0e
   kind: STRUCT
@@ -206224,15 +202224,6 @@ struct_union {
     member_id: 0x2d19b169
   }
 }
-struct_union {
-  id: 0x2d873b56
-  kind: STRUCT
-  definition {
-    bytesize: 8
-    member_id: 0xd7400399
-    member_id: 0xedfdadd3
-  }
-}
 struct_union {
   id: 0x2d9765d2
   kind: STRUCT
@@ -206395,18 +202386,6 @@ struct_union {
     member_id: 0x99ee293a
   }
 }
-struct_union {
-  id: 0x3050ef8f
-  kind: STRUCT
-  definition {
-    bytesize: 16
-    member_id: 0xa02b28d6
-    member_id: 0xd9cdf02e
-    member_id: 0x48131453
-    member_id: 0x65c37c40
-    member_id: 0x97a5dcff
-  }
-}
 struct_union {
   id: 0x30572148
   kind: STRUCT
@@ -206425,15 +202404,6 @@ struct_union {
     member_id: 0xffe24985
   }
 }
-struct_union {
-  id: 0x315223c4
-  kind: STRUCT
-  definition {
-    bytesize: 16
-    member_id: 0xa4a87cc7
-    member_id: 0x51e0ba6b
-  }
-}
 struct_union {
   id: 0x31c1859a
   kind: STRUCT
@@ -206443,16 +202413,6 @@ struct_union {
     member_id: 0xf63f2604
   }
 }
-struct_union {
-  id: 0x31f9c69b
-  kind: STRUCT
-  definition {
-    bytesize: 8
-    member_id: 0xa6e46395
-    member_id: 0xb21940c8
-    member_id: 0x73d7e464
-  }
-}
 struct_union {
   id: 0x31fe95e7
   kind: STRUCT
@@ -206600,15 +202560,6 @@ struct_union {
     member_id: 0x39ff19b6
   }
 }
-struct_union {
-  id: 0x34ed11d4
-  kind: STRUCT
-  definition {
-    bytesize: 16
-    member_id: 0xb280959d
-    member_id: 0x85c1a1cb
-  }
-}
 struct_union {
   id: 0x3508486b
   kind: STRUCT
@@ -206679,14 +202630,6 @@ struct_union {
     member_id: 0x95dacd96
   }
 }
-struct_union {
-  id: 0x366bef7d
-  kind: STRUCT
-  definition {
-    bytesize: 16
-    member_id: 0xb81eae99
-  }
-}
 struct_union {
   id: 0x36acbefb
   kind: STRUCT
@@ -206714,17 +202657,6 @@ struct_union {
     member_id: 0x3dbb56a7
   }
 }
-struct_union {
-  id: 0x373a3dac
-  kind: STRUCT
-  definition {
-    bytesize: 24
-    member_id: 0xbda607c1
-    member_id: 0xff5ae7eb
-    member_id: 0xb8e3f22b
-    member_id: 0x1a818083
-  }
-}
 struct_union {
   id: 0x375126bc
   kind: STRUCT
@@ -206745,17 +202677,6 @@ struct_union {
     member_id: 0xd72d8bb2
   }
 }
-struct_union {
-  id: 0x378b9399
-  kind: STRUCT
-  definition {
-    bytesize: 80
-    member_id: 0xbf324d0a
-    member_id: 0xad24c471
-    member_id: 0x3496cf62
-    member_id: 0x51f63d7f
-  }
-}
 struct_union {
   id: 0x37f08244
   kind: STRUCT
@@ -206782,16 +202703,6 @@ struct_union {
     member_id: 0x80f2085f
   }
 }
-struct_union {
-  id: 0x385d66bc
-  kind: STRUCT
-  definition {
-    bytesize: 528
-    member_id: 0x80627a33
-    member_id: 0xa6727baa
-    member_id: 0x81d670ed
-  }
-}
 struct_union {
   id: 0x3876ab11
   kind: STRUCT
@@ -206824,14 +202735,6 @@ struct_union {
     member_id: 0xf8a78792
   }
 }
-struct_union {
-  id: 0x38ab0bc9
-  kind: STRUCT
-  definition {
-    bytesize: 1
-    member_id: 0x831d3c48
-  }
-}
 struct_union {
   id: 0x38df449f
   kind: STRUCT
@@ -206946,15 +202849,6 @@ struct_union {
     member_id: 0xbec140a3
   }
 }
-struct_union {
-  id: 0x3a9c9162
-  kind: STRUCT
-  definition {
-    bytesize: 16
-    member_id: 0x8b19911e
-    member_id: 0xdac7f876
-  }
-}
 struct_union {
   id: 0x3aa6e17c
   kind: STRUCT
@@ -207417,16 +203311,6 @@ struct_union {
     member_id: 0xd17382fd
   }
 }
-struct_union {
-  id: 0x43da400a
-  kind: UNION
-  definition {
-    bytesize: 48
-    member_id: 0x545bc45d
-    member_id: 0xd9dce494
-    member_id: 0x6f97ea5f
-  }
-}
 struct_union {
   id: 0x444ac848
   kind: UNION
@@ -207473,15 +203357,6 @@ struct_union {
     member_id: 0x403c1936
   }
 }
-struct_union {
-  id: 0x44cf9d95
-  kind: UNION
-  definition {
-    bytesize: 8
-    member_id: 0x485b3652
-    member_id: 0x8e370213
-  }
-}
 struct_union {
   id: 0x44e0bbd2
   kind: UNION
@@ -207796,15 +203671,6 @@ struct_union {
     member_id: 0x89460966
   }
 }
-struct_union {
-  id: 0x4c287de0
-  kind: UNION
-  definition {
-    bytesize: 4
-    member_id: 0x6b32af03
-    member_id: 0x782f8731
-  }
-}
 struct_union {
   id: 0x4c6fa86e
   kind: UNION
@@ -208080,15 +203946,6 @@ struct_union {
     member_id: 0x92f464d1
   }
 }
-struct_union {
-  id: 0x50fafc25
-  kind: UNION
-  definition {
-    bytesize: 40
-    member_id: 0x18b48436
-    member_id: 0xb403a636
-  }
-}
 struct_union {
   id: 0x51d7edf0
   kind: UNION
@@ -208144,15 +204001,6 @@ struct_union {
     member_id: 0xfe834548
   }
 }
-struct_union {
-  id: 0x537a3f0f
-  kind: UNION
-  definition {
-    bytesize: 4
-    member_id: 0x16377fa9
-    member_id: 0x34f49183
-  }
-}
 struct_union {
   id: 0x53b5414d
   kind: UNION
@@ -208231,15 +204079,6 @@ struct_union {
     member_id: 0x0936eae7
   }
 }
-struct_union {
-  id: 0x54c04e96
-  kind: UNION
-  definition {
-    bytesize: 16
-    member_id: 0x082c701d
-    member_id: 0xc63d4176
-  }
-}
 struct_union {
   id: 0x5509d7db
   kind: UNION
@@ -208432,15 +204271,6 @@ struct_union {
     member_id: 0x95dac977
   }
 }
-struct_union {
-  id: 0x5a6b6efc
-  kind: UNION
-  definition {
-    bytesize: 8
-    member_id: 0x325a63f3
-    member_id: 0x1caf0749
-  }
-}
 struct_union {
   id: 0x5a8e8177
   kind: UNION
@@ -208525,24 +204355,6 @@ struct_union {
     member_id: 0x438c4950
   }
 }
-struct_union {
-  id: 0x5bc27631
-  kind: UNION
-  definition {
-    bytesize: 8
-    member_id: 0x34f83972
-    member_id: 0x1a96b10c
-  }
-}
-struct_union {
-  id: 0x5bdb70e0
-  kind: UNION
-  definition {
-    bytesize: 8
-    member_id: 0x340ef030
-    member_id: 0x8844b6fd
-  }
-}
 struct_union {
   id: 0x5c3ef0a3
   kind: UNION
@@ -208660,14 +204472,6 @@ struct_union {
     member_id: 0x7f7538b5
   }
 }
-struct_union {
-  id: 0x5da1f3d6
-  kind: UNION
-  definition {
-    bytesize: 16
-    member_id: 0x2d6cb85c
-  }
-}
 struct_union {
   id: 0x5dafba4f
   kind: UNION
@@ -208741,15 +204545,6 @@ struct_union {
     member_id: 0x61467847
   }
 }
-struct_union {
-  id: 0x5e422cfb
-  kind: UNION
-  definition {
-    bytesize: 72
-    member_id: 0x22c0fbbc
-    member_id: 0x233f54d1
-  }
-}
 struct_union {
   id: 0x5e53dc24
   kind: UNION
@@ -209030,14 +204825,6 @@ struct_union {
     member_id: 0x5cb0fbc1
   }
 }
-struct_union {
-  id: 0x608c0f38
-  kind: UNION
-  definition {
-    bytesize: 72
-    member_id: 0xd9db4be5
-  }
-}
 struct_union {
   id: 0x60a4ff34
   kind: UNION
@@ -209201,15 +204988,6 @@ struct_union {
     member_id: 0xab12835f
   }
 }
-struct_union {
-  id: 0x63db26fc
-  kind: UNION
-  definition {
-    bytesize: 312
-    member_id: 0xd491835d
-    member_id: 0x166fabb0
-  }
-}
 struct_union {
   id: 0x63db5ef9
   kind: UNION
@@ -209392,14 +205170,6 @@ struct_union {
     member_id: 0xd25d6541
   }
 }
-struct_union {
-  id: 0x6903870d
-  kind: UNION
-  definition {
-    bytesize: 128
-    member_id: 0xffe56b33
-  }
-}
 struct_union {
   id: 0x6905d706
   kind: UNION
@@ -209709,15 +205479,6 @@ struct_union {
     member_id: 0x3c3764f7
   }
 }
-struct_union {
-  id: 0x7097e100
-  kind: UNION
-  definition {
-    bytesize: 4
-    member_id: 0x99949b8a
-    member_id: 0x20688d61
-  }
-}
 struct_union {
   id: 0x70e783e8
   kind: UNION
@@ -209882,42 +205643,6 @@ struct_union {
     member_id: 0x1ee6b6cd
   }
 }
-struct_union {
-  id: 0x7317df8a
-  kind: UNION
-  definition {
-    bytesize: 256
-    member_id: 0x97c7b08c
-    member_id: 0x73029e0c
-    member_id: 0xbba39a9a
-    member_id: 0x9d5b90f8
-    member_id: 0x07307794
-    member_id: 0x4779a89b
-    member_id: 0x32e7dee3
-    member_id: 0x6fe88545
-    member_id: 0x2b1b8ef2
-    member_id: 0x3fd31627
-    member_id: 0xd9d85a91
-    member_id: 0xc747f834
-    member_id: 0xcf651311
-    member_id: 0x3ba0211e
-    member_id: 0x35649aee
-    member_id: 0xae5a4181
-    member_id: 0x66d41c47
-    member_id: 0x04b5cf1e
-    member_id: 0xb39193a3
-    member_id: 0x5fd2e3fb
-    member_id: 0xa2d43869
-    member_id: 0x8a1c8492
-    member_id: 0xdabb1c55
-    member_id: 0x324f2583
-    member_id: 0xd9690496
-    member_id: 0x112a2e09
-    member_id: 0xb09d2ffa
-    member_id: 0x56e50a84
-    member_id: 0x6491fbda
-  }
-}
 struct_union {
   id: 0x734252fe
   kind: UNION
@@ -210192,15 +205917,6 @@ struct_union {
     member_id: 0xbed29020
   }
 }
-struct_union {
-  id: 0x76df8305
-  kind: UNION
-  definition {
-    bytesize: 2048
-    member_id: 0x80f111bb
-    member_id: 0x646aaa85
-  }
-}
 struct_union {
   id: 0x7745c8ef
   kind: UNION
@@ -211058,16 +206774,6 @@ struct_union {
     member_id: 0x2011e070
   }
 }
-struct_union {
-  id: 0x656e53f1
-  kind: STRUCT
-  name: "_kvm_stats_desc"
-  definition {
-    bytesize: 64
-    member_id: 0x87807fd8
-    member_id: 0x0dc6047f
-  }
-}
 struct_union {
   id: 0x459e900e
   kind: STRUCT
@@ -211504,31 +207210,6 @@ struct_union {
     member_id: 0x396b4bac
   }
 }
-struct_union {
-  id: 0x825d5993
-  kind: STRUCT
-  name: "arch_timer_context"
-  definition {
-    bytesize: 104
-    member_id: 0xa936a2d5
-    member_id: 0x99abc34e
-    member_id: 0x8a1ddc22
-    member_id: 0xbcb6da5b
-    member_id: 0xd7232081
-    member_id: 0x0b3a6d95
-  }
-}
-struct_union {
-  id: 0x2f1ca510
-  kind: STRUCT
-  name: "arch_timer_cpu"
-  definition {
-    bytesize: 288
-    member_id: 0x30902b47
-    member_id: 0xd0847011
-    member_id: 0x3a2d374f
-  }
-}
 struct_union {
   id: 0x82e932a0
   kind: STRUCT
@@ -211563,42 +207244,6 @@ struct_union {
   definition {
   }
 }
-struct_union {
-  id: 0xe62c1341
-  kind: STRUCT
-  name: "arm_pmu"
-  definition {
-    bytesize: 560
-    member_id: 0x93ce5218
-    member_id: 0x86b24cf6
-    member_id: 0x0ddfea33
-    member_id: 0xd81b71f1
-    member_id: 0x72a25545
-    member_id: 0x98e86c88
-    member_id: 0x0d828e0a
-    member_id: 0x09fd4226
-    member_id: 0x2d61ef43
-    member_id: 0x3cc9ff38
-    member_id: 0x2635ef55
-    member_id: 0x5f710844
-    member_id: 0x4616bb5f
-    member_id: 0x6985f4f1
-    member_id: 0x62b29c82
-    member_id: 0x308dee6b
-    member_id: 0x033b7284
-    member_id: 0xaeede60f
-    member_id: 0xa39136f0
-    member_id: 0xca44b141
-    member_id: 0x28894114
-    member_id: 0x1a1fd0a0
-    member_id: 0x2d3aa998
-    member_id: 0x0f3ca933
-    member_id: 0x502de800
-    member_id: 0xf8037d37
-    member_id: 0xddab36b7
-    member_id: 0x1cafacfd
-  }
-}
 struct_union {
   id: 0x48893aca
   kind: STRUCT
@@ -229100,6 +224745,25 @@ struct_union {
     member_id: 0x66aa8ae5
   }
 }
+struct_union {
+  id: 0x9f83ba8a
+  kind: STRUCT
+  name: "inet6_skb_parm"
+  definition {
+    bytesize: 24
+    member_id: 0xe8bad6da
+    member_id: 0x2940a2be
+    member_id: 0x94523a01
+    member_id: 0xcd809b0d
+    member_id: 0x5493d7f6
+    member_id: 0xab47d75e
+    member_id: 0x25da85de
+    member_id: 0x2d808edc
+    member_id: 0x38c1840e
+    member_id: 0xce6a9610
+    member_id: 0xc5c8b651
+  }
+}
 struct_union {
   id: 0x89a37894
   kind: STRUCT
@@ -231373,16 +227037,6 @@ struct_union {
     member_id: 0xb5c2b19d
   }
 }
-struct_union {
-  id: 0x2259094e
-  kind: STRUCT
-  name: "irq_ops"
-  definition {
-    bytesize: 16
-    member_id: 0x2d5bf13a
-    member_id: 0x682b5a38
-  }
-}
 struct_union {
   id: 0xb95bf932
   kind: STRUCT
@@ -231427,43 +227081,6 @@ struct_union {
     member_id: 0x50c461ff
   }
 }
-struct_union {
-  id: 0x39aedbce
-  kind: STRUCT
-  name: "its_vm"
-  definition {
-    bytesize: 128
-    member_id: 0x6e4d805e
-    member_id: 0xa719d61d
-    member_id: 0x18a69b62
-    member_id: 0xade8e87b
-    member_id: 0x6ba53b1d
-    member_id: 0x3baa0bf3
-    member_id: 0xd3a54092
-    member_id: 0xb9a58615
-    member_id: 0xd2927ea1
-  }
-}
-struct_union {
-  id: 0x19bba071
-  kind: STRUCT
-  name: "its_vpe"
-  definition {
-    bytesize: 128
-    member_id: 0xdca92f00
-    member_id: 0xa70b7acb
-    member_id: 0xd298d587
-    member_id: 0x99159806
-    member_id: 0x3e9547ca
-    member_id: 0x3a956acf
-    member_id: 0xa3f01223
-    member_id: 0x345b10fd
-    member_id: 0xa8c6574f
-    member_id: 0x6710a2d3
-    member_id: 0x1b58edc6
-    member_id: 0x141c8cee
-  }
-}
 struct_union {
   id: 0xb34a0d30
   kind: STRUCT
@@ -232700,83 +228317,6 @@ struct_union {
     member_id: 0x96845159
   }
 }
-struct_union {
-  id: 0xf2aeafb9
-  kind: STRUCT
-  name: "kvm"
-  definition {
-    bytesize: 4352
-    member_id: 0x833819ed
-    member_id: 0xdda08f2f
-    member_id: 0x59597675
-    member_id: 0x3025d651
-    member_id: 0x8a52dd6e
-    member_id: 0xf0778c7b
-    member_id: 0x4f1355bb
-    member_id: 0xcd6e2d79
-    member_id: 0x8174053d
-    member_id: 0x1a817692
-    member_id: 0xf11c4ad7
-    member_id: 0x46e189ff
-    member_id: 0xca660682
-    member_id: 0xc21468d0
-    member_id: 0x107724e0
-    member_id: 0x221ad62a
-    member_id: 0x85550ce5
-    member_id: 0x5d9a7aad
-    member_id: 0x2d4b3b7e
-    member_id: 0xfa427670
-    member_id: 0x450927c5
-    member_id: 0x0d7ae40f
-    member_id: 0xb9403407
-    member_id: 0xb857a998
-    member_id: 0x914f88a3
-    member_id: 0x48aab379
-    member_id: 0xa84d097f
-    member_id: 0x02a639fa
-    member_id: 0x8cfde860
-    member_id: 0x71efddfa
-    member_id: 0x3b21a108
-    member_id: 0x4938a60d
-    member_id: 0x59a47d0f
-    member_id: 0x1c0c4ea6
-    member_id: 0xc81d2fc7
-    member_id: 0xf7c73e7d
-    member_id: 0x33ed52b5
-    member_id: 0x69005a44
-    member_id: 0x6425d0fe
-    member_id: 0xcd446a90
-    member_id: 0x2b889279
-    member_id: 0xb5417608
-    member_id: 0xff77b3c7
-    member_id: 0x8dc5ba0f
-    member_id: 0xf60ae606
-    member_id: 0x8de27dbd
-    member_id: 0x3046b926
-    member_id: 0x82dad882
-    member_id: 0xd657a07c
-  }
-}
-struct_union {
-  id: 0xfd71f39d
-  kind: STRUCT
-  name: "kvm_arch"
-  definition {
-    bytesize: 488
-    member_id: 0x6dab2c05
-    member_id: 0x8b881e3c
-    member_id: 0xf510916c
-    member_id: 0x2c10bf52
-    member_id: 0x2d5bffb1
-    member_id: 0x3957d3b9
-    member_id: 0xce7b08c8
-    member_id: 0x86378461
-    member_id: 0x03a47022
-    member_id: 0x42988d63
-    member_id: 0xe4cebf61
-    member_id: 0xe908f26f
-  }
-}
 struct_union {
   id: 0x99ce8ef3
   kind: STRUCT
@@ -232784,29 +228324,6 @@ struct_union {
   definition {
   }
 }
-struct_union {
-  id: 0xef8b9e67
-  kind: STRUCT
-  name: "kvm_coalesced_mmio"
-  definition {
-    bytesize: 24
-    member_id: 0xbda607c1
-    member_id: 0xb8e3ff08
-    member_id: 0x30c18aff
-    member_id: 0xff5aeac8
-  }
-}
-struct_union {
-  id: 0x99f4eb25
-  kind: STRUCT
-  name: "kvm_coalesced_mmio_ring"
-  definition {
-    bytesize: 8
-    member_id: 0x1f01199c
-    member_id: 0x26892e85
-    member_id: 0xe2ce2718
-  }
-}
 struct_union {
   id: 0x6a241fb6
   kind: STRUCT
@@ -232820,181 +228337,7 @@ struct_union {
     member_id: 0x0763cc89
     member_id: 0x5b05aaff
     member_id: 0x792a2a11
-    member_id: 0x983c1d18
-  }
-}
-struct_union {
-  id: 0xb47f1c0e
-  kind: STRUCT
-  name: "kvm_debug_exit_arch"
-  definition {
-    bytesize: 16
-    member_id: 0x8c045ea7
-    member_id: 0x440037d1
-    member_id: 0xe9c99bd1
-  }
-}
-struct_union {
-  id: 0xe2d4c01c
-  kind: STRUCT
-  name: "kvm_device"
-  definition {
-    bytesize: 40
-    member_id: 0xafbacb95
-    member_id: 0x730e8f88
-    member_id: 0x91796f71
-    member_id: 0xd652df47
-  }
-}
-struct_union {
-  id: 0xc6171ee9
-  kind: STRUCT
-  name: "kvm_device_attr"
-  definition {
-    bytesize: 24
-    member_id: 0x2d8eaae1
-    member_id: 0xd37422b2
-    member_id: 0x8ce95ca0
-    member_id: 0x24c024d3
-  }
-}
-struct_union {
-  id: 0xc5f74818
-  kind: STRUCT
-  name: "kvm_device_ops"
-  definition {
-    bytesize: 80
-    member_id: 0x0de57ce8
-    member_id: 0x0fad648a
-    member_id: 0x1ae7589a
-    member_id: 0xa4fbb750
-    member_id: 0xae95664d
-    member_id: 0x0bb97dbd
-    member_id: 0xbe7a98dd
-    member_id: 0x5d4925a5
-    member_id: 0x4d44694e
-    member_id: 0x87fdbe87
-  }
-}
-struct_union {
-  id: 0xfe89d18d
-  kind: STRUCT
-  name: "kvm_dirty_gfn"
-  definition {
-    bytesize: 16
-    member_id: 0x2d8eaae1
-    member_id: 0x68304f23
-    member_id: 0x9bf12a52
-  }
-}
-struct_union {
-  id: 0x95e9e529
-  kind: STRUCT
-  name: "kvm_dirty_ring"
-  definition {
-    bytesize: 32
-    member_id: 0x4647cbd4
-    member_id: 0xcfe72c2d
-    member_id: 0xd9b710b8
-    member_id: 0x275ed516
-    member_id: 0x69efcf5e
-    member_id: 0xad5e20a5
-  }
-}
-struct_union {
-  id: 0x590c6dd8
-  kind: STRUCT
-  name: "kvm_guest_debug_arch"
-  definition {
-    bytesize: 512
-    member_id: 0x5cb6e321
-    member_id: 0xb8d95da8
-    member_id: 0x6a57f232
-    member_id: 0x88756f7c
-  }
-}
-struct_union {
-  id: 0xce6b97ea
-  kind: STRUCT
-  name: "kvm_hyp_memcache"
-  definition {
-    bytesize: 16
-    member_id: 0xb5e76888
-    member_id: 0xe3b1b19e
-  }
-}
-struct_union {
-  id: 0x7ff97877
-  kind: STRUCT
-  name: "kvm_hyperv_exit"
-  definition {
-    bytesize: 56
-    member_id: 0x5cb0fbc1
-    member_id: 0x6612cc37
-    member_id: 0xec3c82cc
-  }
-}
-struct_union {
-  id: 0x1b5f79d9
-  kind: STRUCT
-  name: "kvm_io_bus"
-  definition {
-    bytesize: 8
-    member_id: 0xa05ae8b2
-    member_id: 0x3103f4d5
-    member_id: 0x0e6e7fb8
-  }
-}
-struct_union {
-  id: 0x3fc5b8b3
-  kind: STRUCT
-  name: "kvm_io_device"
-  definition {
-    bytesize: 8
-    member_id: 0xafbcd9c0
-  }
-}
-struct_union {
-  id: 0xa4d21be9
-  kind: STRUCT
-  name: "kvm_io_device_ops"
-  definition {
-    bytesize: 24
-    member_id: 0x487026f9
-    member_id: 0x342da96c
-    member_id: 0xa414c1a9
-  }
-}
-struct_union {
-  id: 0x5b1f6457
-  kind: STRUCT
-  name: "kvm_io_range"
-  definition {
-    bytesize: 24
-    member_id: 0x243694c7
-    member_id: 0xb862f164
-    member_id: 0xce3c8adf
-  }
-}
-struct_union {
-  id: 0xd9729a52
-  kind: STRUCT
-  name: "kvm_irq_level"
-  definition {
-    bytesize: 8
-    member_id: 0x3fee6444
-    member_id: 0x865cec96
-  }
-}
-struct_union {
-  id: 0xaf573835
-  kind: STRUCT
-  name: "kvm_irq_routing_table"
-  definition {
-    bytesize: 3960
-    member_id: 0xc6fa2a23
-    member_id: 0xf6e30a95
-    member_id: 0x8d25e654
+    member_id: 0x982c7c86
   }
 }
 struct_union {
@@ -233016,390 +228359,6 @@ struct_union {
     member_id: 0x2ea5323b
   }
 }
-struct_union {
-  id: 0x07a8c893
-  kind: STRUCT
-  name: "kvm_memslots"
-  definition {
-    bytesize: 1072
-    member_id: 0x694cfe41
-    member_id: 0xabf33787
-    member_id: 0x130ace31
-    member_id: 0xc25cb27c
-    member_id: 0xba6f54b9
-    member_id: 0xdeaef990
-  }
-}
-struct_union {
-  id: 0xc6388883
-  kind: STRUCT
-  name: "kvm_mmio_fragment"
-  definition {
-    bytesize: 24
-    member_id: 0xc1d9a180
-    member_id: 0xff8a9de8
-    member_id: 0xb84059f2
-  }
-}
-struct_union {
-  id: 0xa2ba72d6
-  kind: STRUCT
-  name: "kvm_mmu_memory_cache"
-  definition {
-    bytesize: 40
-    member_id: 0x603fc5a7
-    member_id: 0x8e40fa3f
-    member_id: 0xde99678b
-    member_id: 0x85e4ba6c
-    member_id: 0xa779a4af
-    member_id: 0x2aa4f724
-  }
-}
-struct_union {
-  id: 0x029d28cb
-  kind: STRUCT
-  name: "kvm_mp_state"
-  definition {
-    bytesize: 4
-    member_id: 0xfc27981e
-  }
-}
-struct_union {
-  id: 0x6f796009
-  kind: STRUCT
-  name: "kvm_pgtable"
-  definition {
-    bytesize: 48
-    member_id: 0x83618e44
-    member_id: 0x4c6ccc95
-    member_id: 0x331a3623
-    member_id: 0xa69ad382
-    member_id: 0x6d5a2dc5
-    member_id: 0x2ddb7ced
-    member_id: 0x8661d99b
-  }
-}
-struct_union {
-  id: 0x1c1e6c54
-  kind: STRUCT
-  name: "kvm_pgtable_mm_ops"
-  definition {
-    bytesize: 80
-    member_id: 0xe15e2cfc
-    member_id: 0x511e5f54
-    member_id: 0xef540e05
-    member_id: 0xcf22b6e3
-    member_id: 0x68c1b0bb
-    member_id: 0x21516548
-    member_id: 0x66a97394
-    member_id: 0x40e6d42e
-    member_id: 0x0a10a4f8
-    member_id: 0x27f5e987
-  }
-}
-struct_union {
-  id: 0x93ebc7c6
-  kind: STRUCT
-  name: "kvm_pgtable_pte_ops"
-  definition {
-    bytesize: 16
-    member_id: 0x53106073
-    member_id: 0xeef9224d
-  }
-}
-struct_union {
-  id: 0x4025bdaf
-  kind: STRUCT
-  name: "kvm_pmc"
-  definition {
-    bytesize: 16
-    member_id: 0x3caea455
-    member_id: 0xf94346ab
-  }
-}
-struct_union {
-  id: 0xbe704ca9
-  kind: STRUCT
-  name: "kvm_pmu"
-  definition {
-    bytesize: 560
-    member_id: 0x39d6cdec
-    member_id: 0x112c08c3
-    member_id: 0x15c30de0
-    member_id: 0x94f98f17
-    member_id: 0x92faaaee
-    member_id: 0xd133b0b1
-  }
-}
-struct_union {
-  id: 0xd9b5b8b6
-  kind: STRUCT
-  name: "kvm_pmu_events"
-  definition {
-    bytesize: 8
-    member_id: 0xa9fd6a40
-    member_id: 0x97ab0bd6
-  }
-}
-struct_union {
-  id: 0xf75540c7
-  kind: STRUCT
-  name: "kvm_protected_vm"
-  definition {
-    bytesize: 64
-    member_id: 0xb8f5134f
-    member_id: 0xb6388968
-    member_id: 0xc6b10bc0
-    member_id: 0x037e99ae
-    member_id: 0x0f7f629e
-    member_id: 0x3a2d39cb
-  }
-}
-struct_union {
-  id: 0xdcd5c554
-  kind: STRUCT
-  name: "kvm_run"
-  definition {
-    bytesize: 2352
-    member_id: 0xf6476a4c
-    member_id: 0xb85c9514
-    member_id: 0xd06a5757
-    member_id: 0x4f84d1da
-    member_id: 0x6bffa57c
-    member_id: 0x7eaf49aa
-    member_id: 0x2d808bd3
-    member_id: 0x00fa5522
-    member_id: 0x5ba521f2
-    member_id: 0x3f0e6b4d
-    member_id: 0x4b1e23b0
-    member_id: 0xaa4c4a21
-    member_id: 0x67846dd9
-  }
-}
-struct_union {
-  id: 0xc9e16a53
-  kind: STRUCT
-  name: "kvm_s2_mmu"
-  definition {
-    bytesize: 40
-    member_id: 0x69149bd4
-    member_id: 0x99236fa3
-    member_id: 0x7f170713
-    member_id: 0x9555d521
-    member_id: 0xb89f1d6b
-  }
-}
-struct_union {
-  id: 0x2c432ef9
-  kind: STRUCT
-  name: "kvm_smccc_features"
-  definition {
-    bytesize: 24
-    member_id: 0x368deee8
-    member_id: 0x17d504ad
-    member_id: 0xba785216
-  }
-}
-struct_union {
-  id: 0xf0ca3374
-  kind: STRUCT
-  name: "kvm_stat_data"
-  definition {
-    bytesize: 24
-    member_id: 0x730e8b69
-    member_id: 0x87e1eb87
-    member_id: 0xd7f60431
-  }
-}
-struct_union {
-  id: 0x5a5219ed
-  kind: STRUCT
-  name: "kvm_stats_desc"
-  definition {
-    bytesize: 16
-    member_id: 0x2d8eaae1
-    member_id: 0xdf3a40d2
-    member_id: 0xd99613f3
-    member_id: 0x9bfaf69a
-    member_id: 0xe6502bd9
-    member_id: 0x0d114fce
-  }
-}
-struct_union {
-  id: 0xca67e5f6
-  kind: STRUCT
-  name: "kvm_sync_regs"
-  definition {
-    bytesize: 8
-    member_id: 0xf5b742db
-  }
-}
-struct_union {
-  id: 0x09330b45
-  kind: STRUCT
-  name: "kvm_vcpu"
-  definition {
-    bytesize: 9712
-    member_id: 0x730e8b69
-    member_id: 0xad12ae54
-    member_id: 0x5161b04d
-    member_id: 0x7c4a52b5
-    member_id: 0xbcb323c9
-    member_id: 0xfc4129b1
-    member_id: 0x87fa34df
-    member_id: 0x9f936789
-    member_id: 0xd014eabd
-    member_id: 0xad898a70
-    member_id: 0x021fd03f
-    member_id: 0x20f5a5f4
-    member_id: 0x74912d9b
-    member_id: 0x54ebc83a
-    member_id: 0xd1201d45
-    member_id: 0xcffef03f
-    member_id: 0x7e5c1bb6
-    member_id: 0xb16b8efe
-    member_id: 0xf337f353
-    member_id: 0xe4aa6cb8
-    member_id: 0x41a58807
-    member_id: 0x22a96429
-    member_id: 0x0abc4886
-    member_id: 0x36ede007
-    member_id: 0x1bd1d822
-    member_id: 0xa3f0172f
-    member_id: 0xb81bb253
-    member_id: 0xb934c444
-    member_id: 0xd657a20e
-    member_id: 0x0741ce14
-    member_id: 0xab7e4a6e
-    member_id: 0x1838fabc
-  }
-}
-struct_union {
-  id: 0xb16454d0
-  kind: STRUCT
-  name: "kvm_vcpu_arch"
-  definition {
-    bytesize: 8464
-    member_id: 0x2723fe2c
-    member_id: 0x2e0a3f7d
-    member_id: 0x05e10aeb
-    member_id: 0xae35f89b
-    member_id: 0xf34e08bb
-    member_id: 0xc4593e51
-    member_id: 0x376609fd
-    member_id: 0x0cc65d59
-    member_id: 0xdb73cbc4
-    member_id: 0x7b6a6e0c
-    member_id: 0x06effd42
-    member_id: 0x9608d64b
-    member_id: 0x50f909b7
-    member_id: 0x4e4c2253
-    member_id: 0x6d45f1ba
-    member_id: 0x7e662956
-    member_id: 0xf58a324e
-    member_id: 0x15ff4fe5
-    member_id: 0x909d979f
-    member_id: 0x2edd8c13
-    member_id: 0x76772152
-    member_id: 0x0120b46e
-    member_id: 0x93b6279b
-    member_id: 0x57b4f0b1
-    member_id: 0xfcc328ac
-    member_id: 0x37f52c8e
-    member_id: 0xb3c5f85e
-    member_id: 0xc5a16f87
-    member_id: 0xf681ca11
-    member_id: 0xa700e1ff
-    member_id: 0x80093c04
-  }
-}
-struct_union {
-  id: 0xe41fd2fe
-  kind: STRUCT
-  name: "kvm_vcpu_fault_info"
-  definition {
-    bytesize: 32
-    member_id: 0xfe44cfde
-    member_id: 0x550ab6b9
-    member_id: 0xd6cec4c2
-    member_id: 0x1de22279
-  }
-}
-struct_union {
-  id: 0x8f4af0b6
-  kind: STRUCT
-  name: "kvm_vcpu_stat"
-  definition {
-    bytesize: 888
-    member_id: 0x42be7fea
-    member_id: 0x65c703ea
-    member_id: 0x33be0c85
-    member_id: 0xff2da133
-    member_id: 0x3c9c64dc
-    member_id: 0x22f5be35
-    member_id: 0xbf28dc5b
-    member_id: 0x237f1104
-  }
-}
-struct_union {
-  id: 0x84fc1211
-  kind: STRUCT
-  name: "kvm_vcpu_stat_generic"
-  definition {
-    bytesize: 832
-    member_id: 0x0946dc8b
-    member_id: 0x0e3de808
-    member_id: 0x5f0d9541
-    member_id: 0xe9b25d2a
-    member_id: 0xdc094b5c
-    member_id: 0x5e1d7f8d
-    member_id: 0xa1ad1dfd
-    member_id: 0x47baacc5
-    member_id: 0xd7979ded
-    member_id: 0x2665d054
-    member_id: 0x8efec678
-  }
-}
-struct_union {
-  id: 0xfbb47533
-  kind: STRUCT
-  name: "kvm_vm_stat"
-  definition {
-    bytesize: 32
-    member_id: 0x42aa8b1f
-    member_id: 0x7efa09f3
-    member_id: 0x46e4dafc
-  }
-}
-struct_union {
-  id: 0x9008e757
-  kind: STRUCT
-  name: "kvm_vm_stat_generic"
-  definition {
-    bytesize: 16
-    member_id: 0x8726cc6c
-    member_id: 0xe4dfd298
-  }
-}
-struct_union {
-  id: 0x0c039fcc
-  kind: STRUCT
-  name: "kvm_vmid"
-  definition {
-    bytesize: 8
-    member_id: 0xcc3069e2
-  }
-}
-struct_union {
-  id: 0x56bbf50a
-  kind: STRUCT
-  name: "kvm_xen_exit"
-  definition {
-    bytesize: 80
-    member_id: 0x5cb0fbc1
-    member_id: 0xec1fd483
-  }
-}
 struct_union {
   id: 0x27179756
   kind: STRUCT
@@ -235997,58 +230956,6 @@ struct_union {
     member_id: 0xc5916613
   }
 }
-struct_union {
-  id: 0x846ab93f
-  kind: STRUCT
-  name: "mmu_notifier"
-  definition {
-    bytesize: 72
-    member_id: 0x2d522361
-    member_id: 0xafb0c299
-    member_id: 0x3025dd22
-    member_id: 0x95dac9dc
-    member_id: 0x85e876e9
-    member_id: 0x2d081245
-    member_id: 0x637602ba
-  }
-}
-struct_union {
-  id: 0x65fba0a9
-  kind: STRUCT
-  name: "mmu_notifier_ops"
-  definition {
-    bytesize: 112
-    member_id: 0xae94e729
-    member_id: 0xe32eadd5
-    member_id: 0xf2531964
-    member_id: 0xa10fc33f
-    member_id: 0x83d10832
-    member_id: 0x0545c767
-    member_id: 0x4f063390
-    member_id: 0x6e9b1c0d
-    member_id: 0xaf409590
-    member_id: 0xfc81ed63
-    member_id: 0x2d08134b
-    member_id: 0x63760b9f
-    member_id: 0xac8941f8
-    member_id: 0xe0f637f1
-  }
-}
-struct_union {
-  id: 0xa68d9aed
-  kind: STRUCT
-  name: "mmu_notifier_range"
-  definition {
-    bytesize: 48
-    member_id: 0x23919a13
-    member_id: 0x3025d10a
-    member_id: 0x46284ff6
-    member_id: 0x823c26d1
-    member_id: 0x2d2d0193
-    member_id: 0x0ad7602b
-    member_id: 0x4a85cf2e
-  }
-}
 struct_union {
   id: 0xd1ebc718
   kind: STRUCT
@@ -238152,6 +233059,17 @@ struct_union {
     member_id: 0x44304fff
   }
 }
+struct_union {
+  id: 0x68d1b84a
+  kind: STRUCT
+  name: "nf_conntrack_zone"
+  definition {
+    bytesize: 4
+    member_id: 0xccbe612e
+    member_id: 0x2d41d692
+    member_id: 0x2edf726f
+  }
+}
 struct_union {
   id: 0x5f7df287
   kind: STRUCT
@@ -241806,19 +236724,6 @@ struct_union {
     member_id: 0x987465ac
   }
 }
-struct_union {
-  id: 0x5fd7ae1b
-  kind: STRUCT
-  name: "pmu_hw_events"
-  definition {
-    bytesize: 288
-    member_id: 0x11a602db
-    member_id: 0x0170d376
-    member_id: 0x03f344e6
-    member_id: 0x34c743f9
-    member_id: 0x99159c15
-  }
-}
 struct_union {
   id: 0x0f15c20c
   kind: UNION
@@ -242342,26 +237247,6 @@ struct_union {
     member_id: 0xcca579d8
   }
 }
-struct_union {
-  id: 0x89c67026
-  kind: STRUCT
-  name: "preempt_notifier"
-  definition {
-    bytesize: 24
-    member_id: 0x55f738dc
-    member_id: 0xafaa08ab
-  }
-}
-struct_union {
-  id: 0xae47ce96
-  kind: STRUCT
-  name: "preempt_ops"
-  definition {
-    bytesize: 16
-    member_id: 0xe0b448e4
-    member_id: 0x7b24028f
-  }
-}
 struct_union {
   id: 0x1331151e
   kind: STRUCT
@@ -246144,6 +241029,16 @@ struct_union {
     member_id: 0xf225f799
   }
 }
+struct_union {
+  id: 0xa065b5b5
+  kind: STRUCT
+  name: "sbq_wait"
+  definition {
+    bytesize: 48
+    member_id: 0xd440bc7f
+    member_id: 0x201ba432
+  }
+}
 struct_union {
   id: 0x2c37cb88
   kind: STRUCT
@@ -250862,6 +245757,21 @@ struct_union {
     member_id: 0xe0f63d43
   }
 }
+struct_union {
+  id: 0x201f4d61
+  kind: STRUCT
+  name: "snd_usb_audio_vendor_ops"
+  definition {
+    bytesize: 56
+    member_id: 0x88f65c40
+    member_id: 0x58055805
+    member_id: 0x18766439
+    member_id: 0x2d081dfb
+    member_id: 0x63760909
+    member_id: 0xac894e91
+    member_id: 0xe0f635d9
+  }
+}
 struct_union {
   id: 0xb7b99e10
   kind: STRUCT
@@ -261204,18 +256114,6 @@ struct_union {
     member_id: 0x2d081124
   }
 }
-struct_union {
-  id: 0x3f42023f
-  kind: STRUCT
-  name: "vcpu_reset_state"
-  definition {
-    bytesize: 24
-    member_id: 0xa5f74e1c
-    member_id: 0x766556ed
-    member_id: 0x09a85b04
-    member_id: 0x62d0d919
-  }
-}
 struct_union {
   id: 0x9871ee6b
   kind: STRUCT
@@ -261232,196 +256130,6 @@ struct_union {
     member_id: 0xe0f6333c
   }
 }
-struct_union {
-  id: 0xe46534dd
-  kind: STRUCT
-  name: "vgic_cpu"
-  definition {
-    bytesize: 4000
-    member_id: 0x3b3d55bb
-    member_id: 0xdbd2d18f
-    member_id: 0xc8f35c78
-    member_id: 0x18b67de8
-    member_id: 0xb5b5379c
-    member_id: 0x525d4aae
-    member_id: 0xe932d634
-    member_id: 0x5debde6d
-    member_id: 0x8109b274
-    member_id: 0x8ed30508
-    member_id: 0xbf52270e
-    member_id: 0xf95b9cd7
-  }
-}
-struct_union {
-  id: 0x2c25c966
-  kind: STRUCT
-  name: "vgic_dist"
-  definition {
-    bytesize: 304
-    member_id: 0xd935af97
-    member_id: 0xa3f017bd
-    member_id: 0xd56295db
-    member_id: 0xe66fe569
-    member_id: 0x7a0e7466
-    member_id: 0x76466478
-    member_id: 0x7abe829e
-    member_id: 0x5eb23b58
-    member_id: 0xc573cedf
-    member_id: 0x36fb8f0a
-    member_id: 0x3a2d3f2e
-    member_id: 0xb1e7f3ff
-    member_id: 0xde92dea2
-    member_id: 0x6fe87475
-    member_id: 0x557bdab2
-    member_id: 0x703b904f
-    member_id: 0xbe693b59
-    member_id: 0x9c466cf2
-    member_id: 0x4d9128b0
-    member_id: 0xd5bf2684
-    member_id: 0x2b5908df
-    member_id: 0xa736298d
-  }
-}
-struct_union {
-  id: 0x60b9a60c
-  kind: STRUCT
-  name: "vgic_io_device"
-  definition {
-    bytesize: 40
-    member_id: 0xf9ecc4b7
-    member_id: 0x3551435a
-    member_id: 0x4e19f41c
-    member_id: 0x10f4be53
-    member_id: 0xddd1c1b9
-    member_id: 0xce062759
-  }
-}
-struct_union {
-  id: 0x421531e8
-  kind: STRUCT
-  name: "vgic_irq"
-  definition {
-    bytesize: 112
-    member_id: 0x8c92967c
-    member_id: 0x9ecea343
-    member_id: 0xd96ad022
-    member_id: 0xa936a512
-    member_id: 0x096d65bb
-    member_id: 0x4af72c65
-    member_id: 0x2b9d91fc
-    member_id: 0x004ca63d
-    member_id: 0x224f240b
-    member_id: 0x3a2d3590
-    member_id: 0x97aa71b6
-    member_id: 0x05ec0a8d
-    member_id: 0xb62bb539
-    member_id: 0xc2defa03
-    member_id: 0x371515be
-    member_id: 0xd707c4f8
-    member_id: 0x8f0fcc44
-    member_id: 0x10cd0450
-    member_id: 0xd3bb5c92
-    member_id: 0xd1469e0e
-    member_id: 0xaf890e76
-    member_id: 0x4a85cb53
-  }
-}
-struct_union {
-  id: 0xdbe5858f
-  kind: STRUCT
-  name: "vgic_its"
-  definition {
-    bytesize: 232
-    member_id: 0x0f936dd3
-    member_id: 0x3a2d3a5d
-    member_id: 0xc33609f7
-    member_id: 0xce0bc034
-    member_id: 0x58199dc6
-    member_id: 0x9232ba55
-    member_id: 0x28ddf56e
-    member_id: 0xd83a0eba
-    member_id: 0x110caede
-    member_id: 0x09c4ee83
-    member_id: 0xb41bc738
-    member_id: 0x857bfedc
-    member_id: 0x5adf7097
-    member_id: 0x5a9c1331
-  }
-}
-struct_union {
-  id: 0x6ff43c7f
-  kind: STRUCT
-  name: "vgic_redist_region"
-  definition {
-    bytesize: 40
-    member_id: 0xadf00094
-    member_id: 0x85c1a1cb
-    member_id: 0x65ec5e2d
-    member_id: 0x3e423a64
-    member_id: 0x7c00e79b
-  }
-}
-struct_union {
-  id: 0x3ae08515
-  kind: STRUCT
-  name: "vgic_register_region"
-  definition {
-    bytesize: 48
-    member_id: 0x83dea94b
-    member_id: 0xb8405d0b
-    member_id: 0xbab5eab6
-    member_id: 0xcb7a7a49
-    member_id: 0x32f872a3
-    member_id: 0x353d48f5
-    member_id: 0x8638eb22
-    member_id: 0x353b064f
-  }
-}
-struct_union {
-  id: 0xc5586f9b
-  kind: STRUCT
-  name: "vgic_state_iter"
-  definition {
-    bytesize: 40
-    member_id: 0xc2c8918f
-    member_id: 0x5eb23fa1
-    member_id: 0x2af96acc
-    member_id: 0x929175ec
-    member_id: 0x7c4a5fae
-    member_id: 0x4a590e0a
-    member_id: 0x43246e2d
-    member_id: 0xeca52885
-  }
-}
-struct_union {
-  id: 0x020c6b41
-  kind: STRUCT
-  name: "vgic_v2_cpu_if"
-  definition {
-    bytesize: 272
-    member_id: 0x4a8c149d
-    member_id: 0x38bbfe42
-    member_id: 0xc9dbb39f
-    member_id: 0xa73178a4
-    member_id: 0x867737e5
-  }
-}
-struct_union {
-  id: 0xbfc414f5
-  kind: STRUCT
-  name: "vgic_v3_cpu_if"
-  definition {
-    bytesize: 312
-    member_id: 0x4a8c149d
-    member_id: 0x38bbfe42
-    member_id: 0x28fa73a3
-    member_id: 0xaa37d774
-    member_id: 0x47207a3e
-    member_id: 0xa75822b6
-    member_id: 0xa9a971b2
-    member_id: 0x8677397b
-  }
-}
 struct_union {
   id: 0xcf6d5ce3
   kind: STRUCT
@@ -263426,6 +258134,27 @@ struct_union {
     member_id: 0xff8a95a5
   }
 }
+struct_union {
+  id: 0xe716d120
+  kind: STRUCT
+  name: "xfrm_state_afinfo"
+  definition {
+    bytesize: 96
+    member_id: 0x9e7cf46f
+    member_id: 0x5d4a9b23
+    member_id: 0x797b9c35
+    member_id: 0xc64a2d69
+    member_id: 0xec93386d
+    member_id: 0xf788152f
+    member_id: 0xd4787e60
+    member_id: 0x7263c7bf
+    member_id: 0x34322597
+    member_id: 0xf2fe58e1
+    member_id: 0xdf6660f4
+    member_id: 0xf2cb3293
+    member_id: 0x2a3c445d
+  }
+}
 struct_union {
   id: 0xbc1c435b
   kind: STRUCT
@@ -263617,6 +258346,19 @@ struct_union {
     member_id: 0xe0f63eed
   }
 }
+struct_union {
+  id: 0xb623120e
+  kind: STRUCT
+  name: "xhci_ep_ctx"
+  definition {
+    bytesize: 32
+    member_id: 0x43272c66
+    member_id: 0x3efdd095
+    member_id: 0x8001f399
+    member_id: 0x67023990
+    member_id: 0xd4738ef3
+  }
+}
 struct_union {
   id: 0x9d27bc05
   kind: STRUCT
@@ -263932,6 +258674,19 @@ struct_union {
     member_id: 0x2d0814a0
   }
 }
+struct_union {
+  id: 0xe2d6574a
+  kind: STRUCT
+  name: "xhci_slot_ctx"
+  definition {
+    bytesize: 32
+    member_id: 0x1d443303
+    member_id: 0xb6174f2e
+    member_id: 0x8905c822
+    member_id: 0x6ba2a863
+    member_id: 0xd4ed0237
+  }
+}
 struct_union {
   id: 0x051dcd31
   kind: STRUCT
@@ -263993,6 +258748,29 @@ struct_union {
     member_id: 0xa72ba76c
   }
 }
+struct_union {
+  id: 0x92256367
+  kind: STRUCT
+  name: "xhci_vendor_ops"
+  definition {
+    bytesize: 120
+    member_id: 0xcc0a44cd
+    member_id: 0x19d3d4c2
+    member_id: 0x62d4e2e8
+    member_id: 0x50156eb5
+    member_id: 0x77a0ad98
+    member_id: 0xb2953bfa
+    member_id: 0x3965c2a5
+    member_id: 0x88a8ecb4
+    member_id: 0xc6a4da74
+    member_id: 0x3f6534a2
+    member_id: 0xd988303d
+    member_id: 0x2d08170f
+    member_id: 0x6376010c
+    member_id: 0xac894aec
+    member_id: 0xe0f63eed
+  }
+}
 struct_union {
   id: 0xbafe14c8
   kind: STRUCT
@@ -264618,23 +259396,6 @@ enumeration {
     }
   }
 }
-enumeration {
-  id: 0x7e388552
-  definition {
-    underlying_type_id: 0x4585663f
-    enumerator {
-      name: "FP_STATE_FREE"
-    }
-    enumerator {
-      name: "FP_STATE_HOST_OWNED"
-      value: 1
-    }
-    enumerator {
-      name: "FP_STATE_GUEST_OWNED"
-      value: 2
-    }
-  }
-}
 enumeration {
   id: 0x09f65231
   name: "OID"
@@ -265077,6 +259838,70 @@ enumeration {
     }
   }
 }
+enumeration {
+  id: 0x503181cf
+  name: "android_debug_per_cpu_symbol"
+  definition {
+    underlying_type_id: 0x4585663f
+    enumerator {
+      name: "ADS_IRQ_STACK_PTR"
+    }
+    enumerator {
+      name: "ADS_DEBUG_PER_CPU_END"
+      value: 1
+    }
+  }
+}
+enumeration {
+  id: 0x705ce9b7
+  name: "android_debug_symbol"
+  definition {
+    underlying_type_id: 0x4585663f
+    enumerator {
+      name: "ADS_SDATA"
+    }
+    enumerator {
+      name: "ADS_BSS_END"
+      value: 1
+    }
+    enumerator {
+      name: "ADS_PER_CPU_START"
+      value: 2
+    }
+    enumerator {
+      name: "ADS_PER_CPU_END"
+      value: 3
+    }
+    enumerator {
+      name: "ADS_TEXT"
+      value: 4
+    }
+    enumerator {
+      name: "ADS_SEND"
+      value: 5
+    }
+    enumerator {
+      name: "ADS_LINUX_BANNER"
+      value: 6
+    }
+    enumerator {
+      name: "ADS_TOTAL_CMA"
+      value: 7
+    }
+    enumerator {
+      name: "ADS_SLAB_CACHES"
+      value: 8
+    }
+    enumerator {
+      name: "ADS_SLAB_MUTEX"
+      value: 9
+    }
+    enumerator {
+      name: "ADS_END"
+      value: 10
+    }
+  }
+}
 enumeration {
   id: 0x635e163e
   name: "arch_timer_erratum_match_type"
@@ -272586,28 +267411,6 @@ enumeration {
     }
   }
 }
-enumeration {
-  id: 0xf101ec6d
-  name: "iodev_type"
-  definition {
-    underlying_type_id: 0x4585663f
-    enumerator {
-      name: "IODEV_CPUIF"
-    }
-    enumerator {
-      name: "IODEV_DIST"
-      value: 1
-    }
-    enumerator {
-      name: "IODEV_REDIST"
-      value: 2
-    }
-    enumerator {
-      name: "IODEV_ITS"
-      value: 3
-    }
-  }
-}
 enumeration {
   id: 0xe5b69de1
   name: "iommu_cap"
@@ -273100,35 +267903,6 @@ enumeration {
     }
   }
 }
-enumeration {
-  id: 0xb3f81878
-  name: "kvm_pgtable_stage2_flags"
-  definition {
-    underlying_type_id: 0x4585663f
-    enumerator {
-      name: "KVM_PGTABLE_S2_NOFWB"
-      value: 1
-    }
-    enumerator {
-      name: "KVM_PGTABLE_S2_IDMAP"
-      value: 2
-    }
-  }
-}
-enumeration {
-  id: 0xfd01d20e
-  name: "kvm_stat_kind"
-  definition {
-    underlying_type_id: 0x4585663f
-    enumerator {
-      name: "KVM_STAT_VM"
-    }
-    enumerator {
-      name: "KVM_STAT_VCPU"
-      value: 1
-    }
-  }
-}
 enumeration {
   id: 0x791ac8b7
   name: "l2tp_encap_type"
@@ -273500,44 +268274,6 @@ enumeration {
     }
   }
 }
-enumeration {
-  id: 0x98849204
-  name: "mmu_notifier_event"
-  definition {
-    underlying_type_id: 0x4585663f
-    enumerator {
-      name: "MMU_NOTIFY_UNMAP"
-    }
-    enumerator {
-      name: "MMU_NOTIFY_CLEAR"
-      value: 1
-    }
-    enumerator {
-      name: "MMU_NOTIFY_PROTECTION_VMA"
-      value: 2
-    }
-    enumerator {
-      name: "MMU_NOTIFY_PROTECTION_PAGE"
-      value: 3
-    }
-    enumerator {
-      name: "MMU_NOTIFY_SOFT_DIRTY"
-      value: 4
-    }
-    enumerator {
-      name: "MMU_NOTIFY_RELEASE"
-      value: 5
-    }
-    enumerator {
-      name: "MMU_NOTIFY_MIGRATE"
-      value: 6
-    }
-    enumerator {
-      name: "MMU_NOTIFY_EXCLUSIVE"
-      value: 7
-    }
-  }
-}
 enumeration {
   id: 0x73b81062
   name: "mode_set_atomic"
@@ -277560,6 +272296,20 @@ enumeration {
     }
   }
 }
+enumeration {
+  id: 0x9741c5fc
+  name: "snd_vendor_pcm_open_close"
+  definition {
+    underlying_type_id: 0x4585663f
+    enumerator {
+      name: "SOUND_PCM_CLOSE"
+    }
+    enumerator {
+      name: "SOUND_PCM_OPEN"
+      value: 1
+    }
+  }
+}
 enumeration {
   id: 0xbb98ef85
   name: "sock_shutdown_cmd"
@@ -280294,20 +275044,6 @@ enumeration {
     }
   }
 }
-enumeration {
-  id: 0xe357f5b0
-  name: "vgic_irq_config"
-  definition {
-    underlying_type_id: 0x4585663f
-    enumerator {
-      name: "VGIC_CONFIG_EDGE"
-    }
-    enumerator {
-      name: "VGIC_CONFIG_LEVEL"
-      value: 1
-    }
-  }
-}
 enumeration {
   id: 0xacd8d043
   name: "wb_reason"
@@ -280759,6 +275495,13 @@ function {
   parameter_id: 0x0490bb4a
   parameter_id: 0x3e10b518
 }
+function {
+  id: 0x03ec98c8
+  return_type_id: 0xe276adef
+  parameter_id: 0x3399c453
+  parameter_id: 0xe276adef
+  parameter_id: 0x6720d32f
+}
 function {
   id: 0x043864e3
   return_type_id: 0x181ee594
@@ -280990,6 +275733,11 @@ function {
   parameter_id: 0x3b04bead
   parameter_id: 0xf435685e
 }
+function {
+  id: 0x0bc7866e
+  return_type_id: 0x48b5725f
+  parameter_id: 0x6d7f5ff6
+}
 function {
   id: 0x0bdc9e9d
   return_type_id: 0x48b5725f
@@ -281129,6 +275877,13 @@ function {
   parameter_id: 0x0258f96e
   parameter_id: 0x39cc14ac
 }
+function {
+  id: 0x0f51af8b
+  return_type_id: 0xe276adef
+  parameter_id: 0x0ca27481
+  parameter_id: 0x3b461cc8
+  parameter_id: 0x3b461cc8
+}
 function {
   id: 0x0fe1d65c
   return_type_id: 0x17dabdcd
@@ -282232,6 +276987,12 @@ function {
   parameter_id: 0x4585663f
   parameter_id: 0x18bd6530
 }
+function {
+  id: 0x11228b4e
+  return_type_id: 0x48b5725f
+  parameter_id: 0x06835e9c
+  parameter_id: 0x06835e9c
+}
 function {
   id: 0x11248ef2
   return_type_id: 0xd5cc9c9a
@@ -282361,6 +277122,16 @@ function {
   return_type_id: 0x48b5725f
   parameter_id: 0x07f2af49
 }
+function {
+  id: 0x11673bbb
+  return_type_id: 0x48b5725f
+  parameter_id: 0x054f691a
+  parameter_id: 0x295c7202
+  parameter_id: 0x295c7202
+  parameter_id: 0xe62ebf07
+  parameter_id: 0x3b461cc8
+  parameter_id: 0x346c7967
+}
 function {
   id: 0x11691052
   return_type_id: 0x48b5725f
@@ -282640,11 +277411,6 @@ function {
   return_type_id: 0x48b5725f
   parameter_id: 0x049d4e97
 }
-function {
-  id: 0x11c00471
-  return_type_id: 0x48b5725f
-  parameter_id: 0x0561578b
-}
 function {
   id: 0x11c013b1
   return_type_id: 0x48b5725f
@@ -283395,14 +278161,6 @@ function {
   parameter_id: 0x0d7ce7cc
   parameter_id: 0x4585663f
 }
-function {
-  id: 0x12d3ed44
-  return_type_id: 0x48b5725f
-  parameter_id: 0x08dcfb76
-  parameter_id: 0x1b4ba19a
-  parameter_id: 0x4585663f
-  parameter_id: 0x33756485
-}
 function {
   id: 0x12d43657
   return_type_id: 0x48b5725f
@@ -284235,6 +278993,13 @@ function {
   parameter_id: 0x1d19a9d5
   parameter_id: 0xfc0e1dbd
 }
+function {
+  id: 0x142e1753
+  return_type_id: 0x48b5725f
+  parameter_id: 0x12e24ee1
+  parameter_id: 0x019dcb45
+  parameter_id: 0x228954ca
+}
 function {
   id: 0x142e3633
   return_type_id: 0x48b5725f
@@ -284246,6 +279011,12 @@ function {
   return_type_id: 0x48b5725f
   parameter_id: 0x1285100d
 }
+function {
+  id: 0x143955b1
+  return_type_id: 0x48b5725f
+  parameter_id: 0x12e24ee1
+  parameter_id: 0x0665e6b6
+}
 function {
   id: 0x1439657e
   return_type_id: 0x48b5725f
@@ -284592,6 +279363,13 @@ function {
   parameter_id: 0x4585663f
   parameter_id: 0x13580d6c
 }
+function {
+  id: 0x14b8ca3b
+  return_type_id: 0x48b5725f
+  parameter_id: 0x1285100d
+  parameter_id: 0x242fbc95
+  parameter_id: 0x4585663f
+}
 function {
   id: 0x14b97b66
   return_type_id: 0x48b5725f
@@ -284615,6 +279393,12 @@ function {
   return_type_id: 0x48b5725f
   parameter_id: 0x116785ed
 }
+function {
+  id: 0x14c2c0fe
+  return_type_id: 0x48b5725f
+  parameter_id: 0x1285100d
+  parameter_id: 0x3ef55b88
+}
 function {
   id: 0x14c5cbad
   return_type_id: 0x48b5725f
@@ -284723,12 +279507,26 @@ function {
   return_type_id: 0x48b5725f
   parameter_id: 0x11c449ec
 }
+function {
+  id: 0x14ea4bc0
+  return_type_id: 0x48b5725f
+  parameter_id: 0x1285100d
+  parameter_id: 0x34d79405
+}
 function {
   id: 0x14ed7da4
   return_type_id: 0x48b5725f
   parameter_id: 0x1d44326e
   parameter_id: 0xc9082b19
 }
+function {
+  id: 0x14f0456f
+  return_type_id: 0x48b5725f
+  parameter_id: 0x1285100d
+  parameter_id: 0x34d79405
+  parameter_id: 0x6720d32f
+  parameter_id: 0xf1a6dfed
+}
 function {
   id: 0x14f27dac
   return_type_id: 0x48b5725f
@@ -284824,6 +279622,13 @@ function {
   return_type_id: 0x33756485
   parameter_id: 0x92233392
 }
+function {
+  id: 0x1527b6ea
+  return_type_id: 0x48b5725f
+  parameter_id: 0x12e24ee1
+  parameter_id: 0x4585663f
+  parameter_id: 0x4585663f
+}
 function {
   id: 0x152d3031
   return_type_id: 0x48b5725f
@@ -284953,6 +279758,12 @@ function {
   parameter_id: 0x117e2995
   parameter_id: 0x6720d32f
 }
+function {
+  id: 0x155cca9b
+  return_type_id: 0x48b5725f
+  parameter_id: 0x15a30023
+  parameter_id: 0x2b16c036
+}
 function {
   id: 0x156275ac
   return_type_id: 0x48b5725f
@@ -285179,12 +279990,6 @@ function {
   parameter_id: 0x14b9453b
   parameter_id: 0x052fac00
 }
-function {
-  id: 0x15a35eaa
-  return_type_id: 0x48b5725f
-  parameter_id: 0x1dce0fdd
-  parameter_id: 0x92233392
-}
 function {
   id: 0x15a61d9b
   return_type_id: 0x48b5725f
@@ -286466,12 +281271,6 @@ function {
   parameter_id: 0x4585663f
   parameter_id: 0x4585663f
 }
-function {
-  id: 0x17b61d24
-  return_type_id: 0x48b5725f
-  parameter_id: 0x1d65d221
-  parameter_id: 0x1dce0fdd
-}
 function {
   id: 0x17b79b8a
   return_type_id: 0x48b5725f
@@ -286701,6 +281500,11 @@ function {
   return_type_id: 0x48b5725f
   parameter_id: 0x22cee855
 }
+function {
+  id: 0x183a04a1
+  return_type_id: 0x48b5725f
+  parameter_id: 0x228954ca
+}
 function {
   id: 0x184069d1
   return_type_id: 0x48b5725f
@@ -286798,6 +281602,16 @@ function {
   return_type_id: 0x48b5725f
   parameter_id: 0x238b8721
 }
+function {
+  id: 0x187ccd99
+  return_type_id: 0x17b5cc93
+  parameter_id: 0x0ca27481
+  parameter_id: 0x3b461cc8
+  parameter_id: 0x3b461cc8
+  parameter_id: 0x6720d32f
+  parameter_id: 0x3e6396e0
+  parameter_id: 0x6720d32f
+}
 function {
   id: 0x187d7a7f
   return_type_id: 0x48b5725f
@@ -287063,6 +281877,11 @@ function {
   parameter_id: 0x2cf6d46d
   parameter_id: 0x18bd6530
 }
+function {
+  id: 0x18f4e52e
+  return_type_id: 0x48b5725f
+  parameter_id: 0x21b2d2f4
+}
 function {
   id: 0x18f8b885
   return_type_id: 0x48b5725f
@@ -287393,6 +282212,12 @@ function {
   return_type_id: 0x48b5725f
   parameter_id: 0x24d8c7ab
 }
+function {
+  id: 0x19af92ca
+  return_type_id: 0x48b5725f
+  parameter_id: 0x2208f89a
+  parameter_id: 0x6d7f5ff6
+}
 function {
   id: 0x19b6a09f
   return_type_id: 0x48b5725f
@@ -287483,6 +282308,12 @@ function {
   parameter_id: 0x0130219f
   parameter_id: 0x6720d32f
 }
+function {
+  id: 0x19e2f0b6
+  return_type_id: 0x48b5725f
+  parameter_id: 0x21b2d2f4
+  parameter_id: 0x4585663f
+}
 function {
   id: 0x19e4b813
   return_type_id: 0x48b5725f
@@ -287546,12 +282377,6 @@ function {
   parameter_id: 0x33756485
   parameter_id: 0x33756485
 }
-function {
-  id: 0x1a162f77
-  return_type_id: 0x48b5725f
-  parameter_id: 0x2b8a97e8
-  parameter_id: 0x1b36c7a2
-}
 function {
   id: 0x1a1815c7
   return_type_id: 0x48b5725f
@@ -287569,22 +282394,6 @@ function {
   parameter_id: 0x2cd31328
   parameter_id: 0x6d7f5ff6
 }
-function {
-  id: 0x1a1970c3
-  return_type_id: 0x48b5725f
-  parameter_id: 0x2b8a97e8
-  parameter_id: 0x1b36c7a2
-  parameter_id: 0x33756485
-  parameter_id: 0xe0bb64fa
-}
-function {
-  id: 0x1a1a3ffb
-  return_type_id: 0x48b5725f
-  parameter_id: 0x2b8a97e8
-  parameter_id: 0x1b36c7a2
-  parameter_id: 0x33756485
-  parameter_id: 0x33756485
-}
 function {
   id: 0x1a27e882
   return_type_id: 0x48b5725f
@@ -287711,11 +282520,6 @@ function {
   parameter_id: 0x2ba06eea
   parameter_id: 0x02128e8a
 }
-function {
-  id: 0x1a7af469
-  return_type_id: 0x48b5725f
-  parameter_id: 0x2b8a97e8
-}
 function {
   id: 0x1a7b957f
   return_type_id: 0x48b5725f
@@ -287836,12 +282640,6 @@ function {
   parameter_id: 0x1259e377
   parameter_id: 0xe276adef
 }
-function {
-  id: 0x1aa50604
-  return_type_id: 0x48b5725f
-  parameter_id: 0x2b8a97e8
-  parameter_id: 0x37fc9b61
-}
 function {
   id: 0x1aa56a0d
   return_type_id: 0x48b5725f
@@ -287939,12 +282737,6 @@ function {
   return_type_id: 0x48b5725f
   parameter_id: 0x292cb268
 }
-function {
-  id: 0x1ad45e5f
-  return_type_id: 0x48b5725f
-  parameter_id: 0x28e1a5ae
-  parameter_id: 0x1d19a9d5
-}
 function {
   id: 0x1ad5d81c
   return_type_id: 0x48b5725f
@@ -288126,12 +282918,6 @@ function {
   return_type_id: 0x48b5725f
   parameter_id: 0x2e8ed696
 }
-function {
-  id: 0x1b3cbbb4
-  return_type_id: 0x48b5725f
-  parameter_id: 0x28e1a5ae
-  parameter_id: 0x6720d32f
-}
 function {
   id: 0x1b3d79eb
   return_type_id: 0x48b5725f
@@ -288250,6 +283036,13 @@ function {
   parameter_id: 0x2c32dd96
   parameter_id: 0x3e6239e1
 }
+function {
+  id: 0x1b6dacf7
+  return_type_id: 0x48b5725f
+  parameter_id: 0x2c32dd96
+  parameter_id: 0x3e6239e1
+  parameter_id: 0x030b9acf
+}
 function {
   id: 0x1b71ad71
   return_type_id: 0x48b5725f
@@ -288644,11 +283437,6 @@ function {
   parameter_id: 0x318f8bcb
   parameter_id: 0x3d2ef874
 }
-function {
-  id: 0x1c1113fb
-  return_type_id: 0x48b5725f
-  parameter_id: 0x322509a0
-}
 function {
   id: 0x1c155f01
   return_type_id: 0x48b5725f
@@ -288877,11 +283665,6 @@ function {
   parameter_id: 0x31b5a66f
   parameter_id: 0x2a670b41
 }
-function {
-  id: 0x1c5e9ece
-  return_type_id: 0x48b5725f
-  parameter_id: 0x331b3d77
-}
 function {
   id: 0x1c5ec399
   return_type_id: 0x48b5725f
@@ -289002,12 +283785,25 @@ function {
   parameter_id: 0x3760766d
   parameter_id: 0x7194a543
 }
+function {
+  id: 0x1c86b5f0
+  return_type_id: 0x48b5725f
+  parameter_id: 0x3176a085
+  parameter_id: 0x11cfee5a
+  parameter_id: 0x11cfee5a
+}
 function {
   id: 0x1c88dd20
   return_type_id: 0x48b5725f
   parameter_id: 0x33756485
   parameter_id: 0x33756485
 }
+function {
+  id: 0x1c93cad8
+  return_type_id: 0x48b5725f
+  parameter_id: 0x36f998d3
+  parameter_id: 0x6d7f5ff6
+}
 function {
   id: 0x1c941374
   return_type_id: 0x2060db23
@@ -289492,6 +284288,11 @@ function {
   parameter_id: 0x35c3dd06
   parameter_id: 0x335d253d
 }
+function {
+  id: 0x1d2637a7
+  return_type_id: 0x48b5725f
+  parameter_id: 0x36f998d3
+}
 function {
   id: 0x1d27ccfe
   return_type_id: 0x48b5725f
@@ -289870,15 +284671,6 @@ function {
   return_type_id: 0x48b5725f
   parameter_id: 0x3518a6ab
 }
-function {
-  id: 0x1de0d842
-  return_type_id: 0x48b5725f
-  parameter_id: 0x363b9249
-  parameter_id: 0x3c6958c4
-  parameter_id: 0x1b4ba19a
-  parameter_id: 0x4585663f
-  parameter_id: 0x33756485
-}
 function {
   id: 0x1de33115
   return_type_id: 0x48b5725f
@@ -290593,6 +285385,11 @@ function {
   parameter_id: 0x39c825ca
   parameter_id: 0x12eaeaa5
 }
+function {
+  id: 0x1ea499af
+  return_type_id: 0x48b5725f
+  parameter_id: 0x38f320f1
+}
 function {
   id: 0x1ea724c3
   return_type_id: 0x48b5725f
@@ -290908,6 +285705,15 @@ function {
   parameter_id: 0x120540d1
   parameter_id: 0x0b8758d9
 }
+function {
+  id: 0x1f0df99a
+  return_type_id: 0x48b5725f
+  parameter_id: 0x3eee6a0e
+  parameter_id: 0x054f691a
+  parameter_id: 0xe276adef
+  parameter_id: 0xe276adef
+  parameter_id: 0x6d7f5ff6
+}
 function {
   id: 0x1f0fd39d
   return_type_id: 0x48b5725f
@@ -291478,6 +286284,14 @@ function {
   parameter_id: 0x3e10b518
   parameter_id: 0xa52a0930
 }
+function {
+  id: 0x1fcbfdc9
+  return_type_id: 0x48b5725f
+  parameter_id: 0x3ef55b88
+  parameter_id: 0x3ef55b88
+  parameter_id: 0x5268af9d
+  parameter_id: 0x6d7f5ff6
+}
 function {
   id: 0x1fcd1693
   return_type_id: 0x48b5725f
@@ -291918,6 +286732,14 @@ function {
   parameter_id: 0x25ffeea5
   parameter_id: 0x0258f96e
 }
+function {
+  id: 0x299442f2
+  return_type_id: 0x0490bb4a
+  parameter_id: 0x4585663f
+  parameter_id: 0x6720d32f
+  parameter_id: 0x3e10b518
+  parameter_id: 0x25e45be7
+}
 function {
   id: 0x29da83bb
   return_type_id: 0x042af17e
@@ -291983,11 +286805,6 @@ function {
   parameter_id: 0xeb0f6de6
   parameter_id: 0x4585663f
 }
-function {
-  id: 0x2b6ce96f
-  return_type_id: 0x2b8a97e8
-  parameter_id: 0x1b36c7a2
-}
 function {
   id: 0x2b7baaf7
   return_type_id: 0x002136b3
@@ -292144,11 +286961,6 @@ function {
   return_type_id: 0x0c2e195c
   parameter_id: 0x1b8590a8
 }
-function {
-  id: 0x2e024bbc
-  return_type_id: 0x40e51470
-  parameter_id: 0x331b3d77
-}
 function {
   id: 0x2e14bb87
   return_type_id: 0xa8fff47c
@@ -292453,13 +287265,6 @@ function {
   parameter_id: 0x0ae4a2c7
   parameter_id: 0x33756485
 }
-function {
-  id: 0x33e7bc51
-  return_type_id: 0x33756485
-  parameter_id: 0x08dcfb76
-  parameter_id: 0x1b4ba19a
-  parameter_id: 0x4585663f
-}
 function {
   id: 0x340d6f59
   return_type_id: 0x33756485
@@ -292960,14 +287765,6 @@ function {
   parameter_id: 0xf435685e
   parameter_id: 0x1d19a9d5
 }
-function {
-  id: 0x3cd4485f
-  return_type_id: 0x33756485
-  parameter_id: 0x363b9249
-  parameter_id: 0x3c6958c4
-  parameter_id: 0x1b4ba19a
-  parameter_id: 0x4585663f
-}
 function {
   id: 0x3d0f6874
   return_type_id: 0x1c3dbe5a
@@ -293066,6 +287863,14 @@ function {
   parameter_id: 0x3e10b518
   parameter_id: 0xf1a6dfed
 }
+function {
+  id: 0x3e8d4bea
+  return_type_id: 0x33756485
+  parameter_id: 0x3f84ee3c
+  parameter_id: 0x33756485
+  parameter_id: 0x33756485
+  parameter_id: 0x6d7f5ff6
+}
 function {
   id: 0x3e902c00
   return_type_id: 0x0483e6f8
@@ -293227,6 +288032,12 @@ function {
   parameter_id: 0x3382a638
   parameter_id: 0x38d23361
 }
+function {
+  id: 0x4132c986
+  return_type_id: 0x04ca9246
+  parameter_id: 0x276a1779
+  parameter_id: 0x162ee618
+}
 function {
   id: 0x416927bc
   return_type_id: 0x00c83ba6
@@ -293273,6 +288084,11 @@ function {
   parameter_id: 0x1d33485a
   parameter_id: 0x27a7c613
 }
+function {
+  id: 0x429ad182
+  return_type_id: 0x18bd6530
+  parameter_id: 0x503181cf
+}
 function {
   id: 0x42a927f9
   return_type_id: 0xc9082b19
@@ -293396,6 +288212,12 @@ function {
   parameter_id: 0x18bd6530
   parameter_id: 0x3f54a013
 }
+function {
+  id: 0x45846d91
+  return_type_id: 0xc9082b19
+  parameter_id: 0x078316ff
+  parameter_id: 0x6720d32f
+}
 function {
   id: 0x45a8a3c4
   return_type_id: 0x00c83ba6
@@ -293569,6 +288391,11 @@ function {
   parameter_id: 0x397d00ab
   parameter_id: 0x6720d32f
 }
+function {
+  id: 0x4a818b9c
+  return_type_id: 0x18bd6530
+  parameter_id: 0x705ce9b7
+}
 function {
   id: 0x4abfefa4
   return_type_id: 0x0cbf60eb
@@ -293795,21 +288622,11 @@ function {
   return_type_id: 0x18bd6530
   parameter_id: 0x18150d9f
 }
-function {
-  id: 0x50a850bc
-  return_type_id: 0x92233392
-  parameter_id: 0x1dce0fdd
-}
 function {
   id: 0x50af222c
   return_type_id: 0x18bd6530
   parameter_id: 0x18e64f74
 }
-function {
-  id: 0x50b9e8bd
-  return_type_id: 0x18bd6530
-  parameter_id: 0x18bd6530
-}
 function {
   id: 0x50f3b181
   return_type_id: 0x18ea6ae3
@@ -295011,6 +289828,13 @@ function {
   parameter_id: 0x6720d32f
   parameter_id: 0xf435685e
 }
+function {
+  id: 0x5ef6b6b7
+  return_type_id: 0x18bd6530
+  parameter_id: 0x2efd5036
+  parameter_id: 0xf1a6dfed
+  parameter_id: 0x6720d32f
+}
 function {
   id: 0x5f133b10
   return_type_id: 0x18a2fb63
@@ -295195,6 +290019,13 @@ function {
   return_type_id: 0x0130219f
   parameter_id: 0x0130219f
 }
+function {
+  id: 0x65a73fe6
+  return_type_id: 0x3ccb45d9
+  parameter_id: 0x0ca27481
+  parameter_id: 0x3b19594b
+  parameter_id: 0x3fd547b8
+}
 function {
   id: 0x65d68df5
   return_type_id: 0x1977e57b
@@ -295436,11 +290267,6 @@ function {
   parameter_id: 0xc9082b19
   parameter_id: 0x6720d32f
 }
-function {
-  id: 0x6b9bebe6
-  return_type_id: 0x18bd6530
-  parameter_id: 0xf435685e
-}
 function {
   id: 0x6bb7aee3
   return_type_id: 0x7b6559c5
@@ -296107,6 +290933,11 @@ function {
   parameter_id: 0x6720d32f
   parameter_id: 0xf1a6dfed
 }
+function {
+  id: 0x8039c229
+  return_type_id: 0x2e19617e
+  parameter_id: 0x1285100d
+}
 function {
   id: 0x80cf4911
   return_type_id: 0x6720d32f
@@ -297806,12 +292637,6 @@ function {
   parameter_id: 0x6720d32f
   parameter_id: 0x6720d32f
 }
-function {
-  id: 0x90ad44c2
-  return_type_id: 0x6720d32f
-  parameter_id: 0x36f0529f
-  parameter_id: 0x246cd286
-}
 function {
   id: 0x90adbc21
   return_type_id: 0x6720d32f
@@ -298068,15 +292893,6 @@ function {
   return_type_id: 0x6720d32f
   parameter_id: 0x35d510c3
 }
-function {
-  id: 0x90f86afe
-  return_type_id: 0x6720d32f
-  parameter_id: 0x363b9249
-  parameter_id: 0x3c6958c4
-  parameter_id: 0x1b4ba19a
-  parameter_id: 0x4585663f
-  parameter_id: 0x33756485
-}
 function {
   id: 0x90fb83a9
   return_type_id: 0x6720d32f
@@ -298325,12 +293141,6 @@ function {
   parameter_id: 0x0277bf8a
   parameter_id: 0x07dcdbe1
 }
-function {
-  id: 0x9121ec42
-  return_type_id: 0x6720d32f
-  parameter_id: 0x322509a0
-  parameter_id: 0x0a134144
-}
 function {
   id: 0x91239923
   return_type_id: 0x6720d32f
@@ -298993,6 +293803,12 @@ function {
   parameter_id: 0x3c07fb40
   parameter_id: 0xc9082b19
 }
+function {
+  id: 0x91a5f8da
+  return_type_id: 0x6720d32f
+  parameter_id: 0x33756485
+  parameter_id: 0x3e10b518
+}
 function {
   id: 0x91a610ef
   return_type_id: 0x6720d32f
@@ -299554,12 +294370,6 @@ function {
   parameter_id: 0x18bd6530
   parameter_id: 0x07dcdbe1
 }
-function {
-  id: 0x91e5f6bf
-  return_type_id: 0x6720d32f
-  parameter_id: 0x322509a0
-  parameter_id: 0x3b15fe1d
-}
 function {
   id: 0x91e70ccb
   return_type_id: 0x6720d32f
@@ -299620,6 +294430,14 @@ function {
   return_type_id: 0x6720d32f
   parameter_id: 0x31ad3cde
 }
+function {
+  id: 0x91ec6dfe
+  return_type_id: 0x6720d32f
+  parameter_id: 0x32a623d7
+  parameter_id: 0x3176a085
+  parameter_id: 0x0d9c4ffe
+  parameter_id: 0xeeed68e6
+}
 function {
   id: 0x91ed8ab4
   return_type_id: 0x6720d32f
@@ -300031,12 +294849,6 @@ function {
   parameter_id: 0x18ea6ae3
   parameter_id: 0x0a134144
 }
-function {
-  id: 0x922d81eb
-  return_type_id: 0x6720d32f
-  parameter_id: 0x322509a0
-  parameter_id: 0xc9082b19
-}
 function {
   id: 0x922dbdf3
   return_type_id: 0x6720d32f
@@ -300279,6 +295091,11 @@ function {
   parameter_id: 0x3c0e9e79
   parameter_id: 0x38d23361
 }
+function {
+  id: 0x9261d8a0
+  return_type_id: 0x6720d32f
+  parameter_id: 0x3f84ee3c
+}
 function {
   id: 0x92625532
   return_type_id: 0x6720d32f
@@ -300765,6 +295582,14 @@ function {
   return_type_id: 0x6720d32f
   parameter_id: 0x3d3b5dd7
 }
+function {
+  id: 0x92d2af21
+  return_type_id: 0x6720d32f
+  parameter_id: 0x3e10b518
+  parameter_id: 0x3185812b
+  parameter_id: 0x4585663f
+  parameter_id: 0x4585663f
+}
 function {
   id: 0x92d3b873
   return_type_id: 0x6720d32f
@@ -302035,6 +296860,17 @@ function {
   parameter_id: 0x25b73daa
   parameter_id: 0x3e10b518
 }
+function {
+  id: 0x941967cc
+  return_type_id: 0x6720d32f
+  parameter_id: 0x22561ecb
+  parameter_id: 0x4585663f
+  parameter_id: 0x6720d32f
+  parameter_id: 0xf1a6dfed
+  parameter_id: 0x6720d32f
+  parameter_id: 0x6d7f5ff6
+  parameter_id: 0x6d7f5ff6
+}
 function {
   id: 0x941d79a6
   return_type_id: 0x6720d32f
@@ -302136,6 +296972,15 @@ function {
   parameter_id: 0x276a1779
   parameter_id: 0x064d6086
 }
+function {
+  id: 0x94459100
+  return_type_id: 0x6720d32f
+  parameter_id: 0x21069feb
+  parameter_id: 0x6720d32f
+  parameter_id: 0x6720d32f
+  parameter_id: 0x6720d32f
+  parameter_id: 0x08ba388c
+}
 function {
   id: 0x9445ee80
   return_type_id: 0x6720d32f
@@ -302741,6 +297586,13 @@ function {
   parameter_id: 0x26ee682a
   parameter_id: 0x4585663f
 }
+function {
+  id: 0x95353072
+  return_type_id: 0x6720d32f
+  parameter_id: 0x246dc7d4
+  parameter_id: 0x6d7f5ff6
+  parameter_id: 0x6d7f5ff6
+}
 function {
   id: 0x9535de1a
   return_type_id: 0x6720d32f
@@ -303113,6 +297965,13 @@ function {
   parameter_id: 0x6720d32f
   parameter_id: 0x13580d6c
 }
+function {
+  id: 0x95a406a6
+  return_type_id: 0x6720d32f
+  parameter_id: 0x26e55184
+  parameter_id: 0x6720d32f
+  parameter_id: 0x04ca9246
+}
 function {
   id: 0x95a45e65
   return_type_id: 0xb3e7bac9
@@ -304103,21 +298962,6 @@ function {
   parameter_id: 0x2edfae47
   parameter_id: 0x32a623d7
 }
-function {
-  id: 0x97024092
-  return_type_id: 0x6720d32f
-  parameter_id: 0x2b8a97e8
-  parameter_id: 0x1b36c7a2
-  parameter_id: 0x33756485
-}
-function {
-  id: 0x97028d47
-  return_type_id: 0x6720d32f
-  parameter_id: 0x2b8a97e8
-  parameter_id: 0x1b36c7a2
-  parameter_id: 0x33756485
-  parameter_id: 0x33756485
-}
 function {
   id: 0x9702dcaf
   return_type_id: 0x2668e644
@@ -304484,12 +299328,6 @@ function {
   parameter_id: 0x21207103
   parameter_id: 0x6d7f5ff6
 }
-function {
-  id: 0x97bdb4b8
-  return_type_id: 0x6720d32f
-  parameter_id: 0x2b8a97e8
-  parameter_id: 0x37fc9b61
-}
 function {
   id: 0x97c10137
   return_type_id: 0x0611572c
@@ -304880,6 +299718,22 @@ function {
   parameter_id: 0x33756485
   parameter_id: 0x18bd6530
 }
+function {
+  id: 0x98362533
+  return_type_id: 0x6720d32f
+  parameter_id: 0x12e24ee1
+  parameter_id: 0x4585663f
+  parameter_id: 0x6720d32f
+  parameter_id: 0x6d7f5ff6
+  parameter_id: 0xf1a6dfed
+  parameter_id: 0x6720d32f
+}
+function {
+  id: 0x9837b2b4
+  return_type_id: 0x6720d32f
+  parameter_id: 0x1285100d
+  parameter_id: 0x4585663f
+}
 function {
   id: 0x983c5682
   return_type_id: 0x6720d32f
@@ -305550,6 +300404,12 @@ function {
   parameter_id: 0x203f3220
   parameter_id: 0x0b0dddba
 }
+function {
+  id: 0x98c001f4
+  return_type_id: 0x3225ac75
+  parameter_id: 0x1285100d
+  parameter_id: 0x34d79405
+}
 function {
   id: 0x98c44e7d
   return_type_id: 0x6720d32f
@@ -305924,6 +300784,11 @@ function {
   parameter_id: 0x116785ed
   parameter_id: 0x3e10b518
 }
+function {
+  id: 0x9921a72c
+  return_type_id: 0x6720d32f
+  parameter_id: 0x1285100d
+}
 function {
   id: 0x9927b218
   return_type_id: 0x6720d32f
@@ -306027,6 +300892,11 @@ function {
   parameter_id: 0x104d069a
   parameter_id: 0x295c7202
 }
+function {
+  id: 0x99387097
+  return_type_id: 0x6720d32f
+  parameter_id: 0x12e24ee1
+}
 function {
   id: 0x9939118b
   return_type_id: 0x6720d32f
@@ -307720,12 +302590,6 @@ function {
   parameter_id: 0x198099dc
   parameter_id: 0x6d7f5ff6
 }
-function {
-  id: 0x9aaeaf98
-  return_type_id: 0x6720d32f
-  parameter_id: 0x1d65d221
-  parameter_id: 0x1dce0fdd
-}
 function {
   id: 0x9aaf4bc3
   return_type_id: 0x6720d32f
@@ -309679,6 +304543,15 @@ function {
   parameter_id: 0x92233392
   parameter_id: 0x92233392
 }
+function {
+  id: 0x9b80645e
+  return_type_id: 0x6720d32f
+  parameter_id: 0x18bd6530
+  parameter_id: 0x0b30ee00
+  parameter_id: 0x0a63398f
+  parameter_id: 0x6720d32f
+  parameter_id: 0x6720d32f
+}
 function {
   id: 0x9b82fce2
   return_type_id: 0x6720d32f
@@ -309837,6 +304710,16 @@ function {
   parameter_id: 0x18bd6530
   parameter_id: 0x082be49e
 }
+function {
+  id: 0x9b8fbd40
+  return_type_id: 0x6720d32f
+  parameter_id: 0x18bd6530
+  parameter_id: 0x0b7c4f67
+  parameter_id: 0x310ec01d
+  parameter_id: 0x6d7f5ff6
+  parameter_id: 0x00c72527
+  parameter_id: 0x18bd6530
+}
 function {
   id: 0x9b91093a
   return_type_id: 0x6720d32f
@@ -310335,6 +305218,17 @@ function {
   parameter_id: 0x18bd6530
   parameter_id: 0x064d6086
 }
+function {
+  id: 0x9bb6ab04
+  return_type_id: 0x6720d32f
+  parameter_id: 0x18bd6530
+  parameter_id: 0x06835e9c
+  parameter_id: 0x0a63398f
+  parameter_id: 0x6720d32f
+  parameter_id: 0x6720d32f
+  parameter_id: 0x6720d32f
+  parameter_id: 0x11cfee5a
+}
 function {
   id: 0x9bb6c325
   return_type_id: 0x6720d32f
@@ -312443,6 +307337,13 @@ function {
   parameter_id: 0x0b27dc43
   parameter_id: 0x34c92288
 }
+function {
+  id: 0x9c9b15ff
+  return_type_id: 0x6720d32f
+  parameter_id: 0x0d7ce7cc
+  parameter_id: 0x9741c5fc
+  parameter_id: 0x6720d32f
+}
 function {
   id: 0x9c9c5425
   return_type_id: 0x6720d32f
@@ -313205,6 +308106,11 @@ function {
   parameter_id: 0x10617cac
   parameter_id: 0xc9082b19
 }
+function {
+  id: 0x9d251990
+  return_type_id: 0x6720d32f
+  parameter_id: 0x0297eaff
+}
 function {
   id: 0x9d25c351
   return_type_id: 0x6720d32f
@@ -313633,6 +308539,13 @@ function {
   parameter_id: 0x054f691a
   parameter_id: 0x6720d32f
 }
+function {
+  id: 0x9d50188a
+  return_type_id: 0x6720d32f
+  parameter_id: 0x0258f96e
+  parameter_id: 0x100a15ee
+  parameter_id: 0x1bb6a471
+}
 function {
   id: 0x9d51e53b
   return_type_id: 0x6720d32f
@@ -314600,6 +309513,12 @@ function {
   parameter_id: 0x2cdbb77a
   parameter_id: 0xf435685e
 }
+function {
+  id: 0x9ddc45fb
+  return_type_id: 0x6720d32f
+  parameter_id: 0x0258f96e
+  parameter_id: 0x32a623d7
+}
 function {
   id: 0x9ddc5532
   return_type_id: 0x6720d32f
@@ -314796,6 +309715,14 @@ function {
   return_type_id: 0x6720d32f
   parameter_id: 0x01ae1e33
 }
+function {
+  id: 0x9dec0a70
+  return_type_id: 0x6720d32f
+  parameter_id: 0x0258f96e
+  parameter_id: 0x3e10b518
+  parameter_id: 0x051414e1
+  parameter_id: 0xf435685e
+}
 function {
   id: 0x9dec5d8d
   return_type_id: 0x6720d32f
@@ -315305,6 +310232,15 @@ function {
   parameter_id: 0x33b77109
   parameter_id: 0x0277bf8a
 }
+function {
+  id: 0x9e69dafa
+  return_type_id: 0x6720d32f
+  parameter_id: 0x0ca27481
+  parameter_id: 0x3399c453
+  parameter_id: 0x3b461cc8
+  parameter_id: 0x4585663f
+  parameter_id: 0x11d941b8
+}
 function {
   id: 0x9e6bce91
   return_type_id: 0x6720d32f
@@ -315607,6 +310543,14 @@ function {
   parameter_id: 0xc9082b19
   parameter_id: 0x07dcdbe1
 }
+function {
+  id: 0x9ec13de2
+  return_type_id: 0x6720d32f
+  parameter_id: 0x0d7ce7cc
+  parameter_id: 0x01ace255
+  parameter_id: 0x6720d32f
+  parameter_id: 0x6720d32f
+}
 function {
   id: 0x9ec5d248
   return_type_id: 0x6720d32f
@@ -316634,24 +311578,6 @@ function {
   parameter_id: 0x08a8dfa4
   parameter_id: 0x0258f96e
 }
-function {
-  id: 0x9fa510e8
-  return_type_id: 0x6720d32f
-  parameter_id: 0x08dcfb76
-  parameter_id: 0x0561578b
-  parameter_id: 0x1b4ba19a
-  parameter_id: 0x6720d32f
-  parameter_id: 0x18bd6530
-}
-function {
-  id: 0x9fa51880
-  return_type_id: 0x6720d32f
-  parameter_id: 0x08dcfb76
-  parameter_id: 0x0561578b
-  parameter_id: 0x1b4ba19a
-  parameter_id: 0x6720d32f
-  parameter_id: 0x391f15ea
-}
 function {
   id: 0x9fab680a
   return_type_id: 0x6720d32f
@@ -316877,14 +311803,6 @@ function {
   parameter_id: 0x078316ff
   parameter_id: 0xeab68ea2
 }
-function {
-  id: 0x9fcb5ff8
-  return_type_id: 0x6720d32f
-  parameter_id: 0x08dcfb76
-  parameter_id: 0x1b4ba19a
-  parameter_id: 0x4585663f
-  parameter_id: 0x33756485
-}
 function {
   id: 0x9fcca68f
   return_type_id: 0x6720d32f
@@ -317229,6 +312147,14 @@ function {
   return_type_id: 0x0a1edf98
   parameter_id: 0x2b8f13b3
 }
+function {
+  id: 0xa22a22cc
+  return_type_id: 0x1259e377
+  parameter_id: 0x0ca27481
+  parameter_id: 0x3861403d
+  parameter_id: 0x270c2906
+  parameter_id: 0x6720d32f
+}
 function {
   id: 0xa22b5357
   return_type_id: 0x1259e377
@@ -317740,13 +312666,6 @@ function {
   parameter_id: 0x2e8d5f05
   parameter_id: 0x3fe8ca70
 }
-function {
-  id: 0xaab3b130
-  return_type_id: 0xfc0e1dbd
-  parameter_id: 0x322509a0
-  parameter_id: 0x4585663f
-  parameter_id: 0x33756485
-}
 function {
   id: 0xaab8b473
   return_type_id: 0xfc0e1dbd
@@ -317825,6 +312744,15 @@ function {
   return_type_id: 0x1259e377
   parameter_id: 0x292ab2e2
 }
+function {
+  id: 0xabe6a73e
+  return_type_id: 0x21b2d2f4
+  parameter_id: 0x1285100d
+  parameter_id: 0xc9082b19
+  parameter_id: 0x5268af9d
+  parameter_id: 0x4585663f
+  parameter_id: 0xf1a6dfed
+}
 function {
   id: 0xabfb6aa8
   return_type_id: 0x3dcee85d
@@ -318396,6 +313324,11 @@ function {
   return_type_id: 0x0a747547
   parameter_id: 0x315b7e01
 }
+function {
+  id: 0xbeab1c63
+  return_type_id: 0x3176a085
+  parameter_id: 0x35d510c3
+}
 function {
   id: 0xbec298be
   return_type_id: 0x3176a085
@@ -319000,6 +313933,13 @@ function {
   return_type_id: 0x0a9a051a
   parameter_id: 0x0258f96e
 }
+function {
+  id: 0xcbd33190
+  return_type_id: 0x2718fd24
+  parameter_id: 0x1285100d
+  parameter_id: 0x34d79405
+  parameter_id: 0x4585663f
+}
 function {
   id: 0xcbea3bfa
   return_type_id: 0x65d74a06
@@ -319258,6 +314198,14 @@ function {
   parameter_id: 0x4585663f
   parameter_id: 0x1bf16028
 }
+function {
+  id: 0xd001e6e1
+  return_type_id: 0x36f998d3
+  parameter_id: 0x072e5f93
+  parameter_id: 0xf435685e
+  parameter_id: 0x914dbfdc
+  parameter_id: 0x295c7202
+}
 function {
   id: 0xd015e7bc
   return_type_id: 0x0ae4a2c7
@@ -319355,6 +314303,12 @@ function {
   parameter_id: 0x94ed3026
   parameter_id: 0x0a193bb7
 }
+function {
+  id: 0xd655ba3d
+  return_type_id: 0x3b0b4c9d
+  parameter_id: 0x1285100d
+  parameter_id: 0xf1a6dfed
+}
 function {
   id: 0xd673de47
   return_type_id: 0x02eb105a
@@ -319381,6 +314335,12 @@ function {
   id: 0xd6c91a51
   return_type_id: 0x02eb105a
 }
+function {
+  id: 0xd6e94dc1
+  return_type_id: 0x36f998d3
+  parameter_id: 0x105c8027
+  parameter_id: 0x300fdc99
+}
 function {
   id: 0xd742e545
   return_type_id: 0x26ad5dc1
@@ -319401,19 +314361,17 @@ function {
   parameter_id: 0x6720d32f
   parameter_id: 0x6d7f5ff6
 }
-function {
-  id: 0xd8625902
-  return_type_id: 0x6d7f5ff6
-  parameter_id: 0x92233392
-  parameter_id: 0x92233392
-  parameter_id: 0x1908b154
-}
 function {
   id: 0xd88df0fd
   return_type_id: 0x2309ad3e
   parameter_id: 0x6720d32f
   parameter_id: 0x6720d32f
 }
+function {
+  id: 0xd8e8dad0
+  return_type_id: 0x33558def
+  parameter_id: 0x4585663f
+}
 function {
   id: 0xd94d3717
   return_type_id: 0x02eb105a
@@ -319634,6 +314592,12 @@ function {
   parameter_id: 0x4585663f
   parameter_id: 0x4585663f
 }
+function {
+  id: 0xdf267053
+  return_type_id: 0x36f998d3
+  parameter_id: 0x3760766d
+  parameter_id: 0x300fdc99
+}
 function {
   id: 0xdf475327
   return_type_id: 0x030b9acf
@@ -319872,12 +314836,6 @@ function {
   parameter_id: 0x3a583251
   parameter_id: 0x33756485
 }
-function {
-  id: 0xe6385497
-  return_type_id: 0x6d7f5ff6
-  parameter_id: 0x6ee0bcff
-  parameter_id: 0xc9082b19
-}
 function {
   id: 0xe63fffaa
   return_type_id: 0x2e8ad82b
@@ -320119,6 +315077,15 @@ function {
   parameter_id: 0x3c5396d4
   parameter_id: 0x18bd6530
 }
+function {
+  id: 0xf0122aeb
+  return_type_id: 0x6d7f5ff6
+  parameter_id: 0x3e6396e0
+  parameter_id: 0x4585663f
+  parameter_id: 0xe2ce8d42
+  parameter_id: 0x0ca27481
+  parameter_id: 0x03942c7a
+}
 function {
   id: 0xf0196dc4
   return_type_id: 0x32a623d7
@@ -320251,6 +315218,11 @@ function {
   parameter_id: 0x3de54f8a
   parameter_id: 0x358ff5b7
 }
+function {
+  id: 0xf10ce2b4
+  return_type_id: 0x6d7f5ff6
+  parameter_id: 0x3ea2e6c1
+}
 function {
   id: 0xf1208847
   return_type_id: 0x6d7f5ff6
@@ -320324,6 +315296,12 @@ function {
   return_type_id: 0x6d7f5ff6
   parameter_id: 0x3c2755a3
 }
+function {
+  id: 0xf1ae1eac
+  return_type_id: 0x3e6239e1
+  parameter_id: 0x3e6239e1
+  parameter_id: 0x27a7c613
+}
 function {
   id: 0xf1b060ff
   return_type_id: 0x6d7f5ff6
@@ -320522,6 +315500,19 @@ function {
   return_type_id: 0x6d7f5ff6
   parameter_id: 0x31fe2b41
 }
+function {
+  id: 0xf2e4f0d1
+  return_type_id: 0x26e55184
+  parameter_id: 0x3e10b518
+  parameter_id: 0x0b4ebfc7
+  parameter_id: 0x6720d32f
+  parameter_id: 0x6720d32f
+  parameter_id: 0x18bd6530
+  parameter_id: 0x28b7a3b7
+  parameter_id: 0x043574da
+  parameter_id: 0x6720d32f
+  parameter_id: 0x6720d32f
+}
 function {
   id: 0xf2ee299f
   return_type_id: 0x6d7f5ff6
@@ -320601,6 +315592,11 @@ function {
   parameter_id: 0x0ee13889
   parameter_id: 0x358ff5b7
 }
+function {
+  id: 0xf34d29c1
+  return_type_id: 0x6d7f5ff6
+  parameter_id: 0x37a5cb14
+}
 function {
   id: 0xf354bbbc
   return_type_id: 0x26e55184
@@ -321035,6 +316031,13 @@ function {
   parameter_id: 0x188b9e81
   parameter_id: 0x3ea31487
 }
+function {
+  id: 0xf87e0015
+  return_type_id: 0x3e6239e1
+  parameter_id: 0x18bd6530
+  parameter_id: 0x3e6239e1
+  parameter_id: 0x0379c823
+}
 function {
   id: 0xf87eb23d
   return_type_id: 0x6d7f5ff6
@@ -321118,6 +316121,12 @@ function {
   return_type_id: 0x6d7f5ff6
   parameter_id: 0x1d44326e
 }
+function {
+  id: 0xfa01df81
+  return_type_id: 0x6d7f5ff6
+  parameter_id: 0x1285100d
+  parameter_id: 0x0130219f
+}
 function {
   id: 0xfa126b6a
   return_type_id: 0x6d7f5ff6
@@ -321150,6 +316159,13 @@ function {
   parameter_id: 0x3e909b01
   parameter_id: 0x33756485
 }
+function {
+  id: 0xfa84c0ac
+  return_type_id: 0x6d7f5ff6
+  parameter_id: 0x1285100d
+  parameter_id: 0x242fbc95
+  parameter_id: 0x4585663f
+}
 function {
   id: 0xfaa21496
   return_type_id: 0x6d7f5ff6
@@ -321237,6 +316253,14 @@ function {
   parameter_id: 0x4585663f
   parameter_id: 0x4585663f
 }
+function {
+  id: 0xfc093226
+  return_type_id: 0x6d7f5ff6
+  parameter_id: 0x09427c40
+  parameter_id: 0x3e6239e1
+  parameter_id: 0x15a30023
+  parameter_id: 0x4585663f
+}
 function {
   id: 0xfc2e3179
   return_type_id: 0x6d7f5ff6
@@ -321511,6 +316535,12 @@ function {
   id: 0xfea45b04
   return_type_id: 0x6d7f5ff6
 }
+function {
+  id: 0xfebe0504
+  return_type_id: 0x6d7f5ff6
+  parameter_id: 0x03942c7a
+  parameter_id: 0x3fd547b8
+}
 function {
   id: 0xfec3d248
   return_type_id: 0x6d7f5ff6
@@ -321541,6 +316571,12 @@ function {
   parameter_id: 0x12c0ba43
   parameter_id: 0x3f063da2
 }
+function {
+  id: 0xfee76c7c
+  return_type_id: 0x1b2ca025
+  parameter_id: 0x3b04bead
+  parameter_id: 0x6720d32f
+}
 function {
   id: 0xfeedb339
   return_type_id: 0x6d7f5ff6
@@ -323231,6 +318267,15 @@ elf_symbol {
   type_id: 0x5f133b10
   full_name: "__irq_domain_add"
 }
+elf_symbol {
+  id: 0xc37fd40e
+  name: "__irq_domain_alloc_fwnode"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xdc739bfc
+  type_id: 0x299442f2
+  full_name: "__irq_domain_alloc_fwnode"
+}
 elf_symbol {
   id: 0xe064ac65
   name: "__irq_resolve_mapping"
@@ -324230,6 +319275,15 @@ elf_symbol {
   type_id: 0x1dbb54c5
   full_name: "__rt_mutex_init"
 }
+elf_symbol {
+  id: 0x99aa632e
+  name: "__sbitmap_queue_get"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x0a991166
+  type_id: 0x99387097
+  full_name: "__sbitmap_queue_get"
+}
 elf_symbol {
   id: 0xe68925b8
   name: "__scsi_add_device"
@@ -324617,6 +319671,15 @@ elf_symbol {
   type_id: 0x918cb258
   full_name: "__trace_bprintk"
 }
+elf_symbol {
+  id: 0x46adfea4
+  name: "__trace_bputs"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xb1e25684
+  type_id: 0x91a5f8da
+  full_name: "__trace_bputs"
+}
 elf_symbol {
   id: 0x233d8b34
   name: "__trace_puts"
@@ -326156,6 +321219,15 @@ elf_symbol {
   type_id: 0x9bdc9aae
   full_name: "__traceiter_android_vh_dup_task_struct"
 }
+elf_symbol {
+  id: 0x7ebac47a
+  name: "__traceiter_android_vh_enable_thermal_power_throttle"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xc7fd7b7d
+  type_id: 0x9be885da
+  full_name: "__traceiter_android_vh_enable_thermal_power_throttle"
+}
 elf_symbol {
   id: 0xf586d5b6
   name: "__traceiter_android_vh_encrypt_page"
@@ -326183,6 +321255,15 @@ elf_symbol {
   type_id: 0x9a1e34e7
   full_name: "__traceiter_android_vh_file_is_tiny_bypass"
 }
+elf_symbol {
+  id: 0xc189c2a7
+  name: "__traceiter_android_vh_free_one_page_bypass"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x790c91fa
+  type_id: 0x9bb6ab04
+  full_name: "__traceiter_android_vh_free_one_page_bypass"
+}
 elf_symbol {
   id: 0x5ecff02f
   name: "__traceiter_android_vh_free_task"
@@ -326345,6 +321426,15 @@ elf_symbol {
   type_id: 0x9b342f25
   full_name: "__traceiter_android_vh_get_thermal_zone_device"
 }
+elf_symbol {
+  id: 0xdbe4202a
+  name: "__traceiter_android_vh_gic_set_affinity"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xc710bc43
+  type_id: 0x9b8fbd40
+  full_name: "__traceiter_android_vh_gic_set_affinity"
+}
 elf_symbol {
   id: 0x88586647
   name: "__traceiter_android_vh_gic_v3_suspend"
@@ -326525,6 +321615,15 @@ elf_symbol {
   type_id: 0x9bb68fe1
   full_name: "__traceiter_android_vh_meminfo_cache_adjust"
 }
+elf_symbol {
+  id: 0xea8ce2b0
+  name: "__traceiter_android_vh_meminfo_proc_show"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xbe919740
+  type_id: 0x9bb62df9
+  full_name: "__traceiter_android_vh_meminfo_proc_show"
+}
 elf_symbol {
   id: 0xe44dacb1
   name: "__traceiter_android_vh_mmap_region"
@@ -326741,6 +321840,15 @@ elf_symbol {
   type_id: 0x9bd7019d
   full_name: "__traceiter_android_vh_record_rwsem_lock_starttime"
 }
+elf_symbol {
+  id: 0x8d62858f
+  name: "__traceiter_android_vh_rmqueue_smallest_bypass"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x9969b000
+  type_id: 0x9b80645e
+  full_name: "__traceiter_android_vh_rmqueue_smallest_bypass"
+}
 elf_symbol {
   id: 0xcef5d79f
   name: "__traceiter_android_vh_rproc_recovery"
@@ -329261,6 +324369,15 @@ elf_symbol {
   type_id: 0x18ccbd2c
   full_name: "__tracepoint_android_vh_dup_task_struct"
 }
+elf_symbol {
+  id: 0x188eab44
+  name: "__tracepoint_android_vh_enable_thermal_power_throttle"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0x13db5a5d
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_android_vh_enable_thermal_power_throttle"
+}
 elf_symbol {
   id: 0xe7584e1c
   name: "__tracepoint_android_vh_encrypt_page"
@@ -329288,6 +324405,15 @@ elf_symbol {
   type_id: 0x18ccbd2c
   full_name: "__tracepoint_android_vh_file_is_tiny_bypass"
 }
+elf_symbol {
+  id: 0x04a824b5
+  name: "__tracepoint_android_vh_free_one_page_bypass"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0xb8e1bbb2
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_android_vh_free_one_page_bypass"
+}
 elf_symbol {
   id: 0xe6918e09
   name: "__tracepoint_android_vh_free_task"
@@ -329450,6 +324576,15 @@ elf_symbol {
   type_id: 0x18ccbd2c
   full_name: "__tracepoint_android_vh_get_thermal_zone_device"
 }
+elf_symbol {
+  id: 0x60a121b4
+  name: "__tracepoint_android_vh_gic_set_affinity"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0x2b46dd56
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_android_vh_gic_set_affinity"
+}
 elf_symbol {
   id: 0xf18e312d
   name: "__tracepoint_android_vh_gic_v3_suspend"
@@ -329630,6 +324765,15 @@ elf_symbol {
   type_id: 0x18ccbd2c
   full_name: "__tracepoint_android_vh_meminfo_cache_adjust"
 }
+elf_symbol {
+  id: 0xa5b4e5b2
+  name: "__tracepoint_android_vh_meminfo_proc_show"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0xd7997ac2
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_android_vh_meminfo_proc_show"
+}
 elf_symbol {
   id: 0xb6da564f
   name: "__tracepoint_android_vh_mmap_region"
@@ -329846,6 +324990,15 @@ elf_symbol {
   type_id: 0x18ccbd2c
   full_name: "__tracepoint_android_vh_record_rwsem_lock_starttime"
 }
+elf_symbol {
+  id: 0x04365139
+  name: "__tracepoint_android_vh_rmqueue_smallest_bypass"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0x48db8869
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_android_vh_rmqueue_smallest_bypass"
+}
 elf_symbol {
   id: 0xd94bc301
   name: "__tracepoint_android_vh_rproc_recovery"
@@ -331916,6 +327069,15 @@ elf_symbol {
   type_id: 0xca4b711f
   full_name: "alloc_io_pgtable_ops"
 }
+elf_symbol {
+  id: 0x9cff6ebf
+  name: "alloc_iova_fast"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x1565176f
+  type_id: 0x3e8d4bea
+  full_name: "alloc_iova_fast"
+}
 elf_symbol {
   id: 0xcf6df527
   name: "alloc_netdev_mqs"
@@ -332015,6 +327177,26 @@ elf_symbol {
   type_id: 0x933f3b0e
   full_name: "amba_request_regions"
 }
+elf_symbol {
+  id: 0x5653e7da
+  name: "android_debug_per_cpu_symbol"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x8ee3d8d9
+  namespace: "MINIDUMP"
+  type_id: 0x429ad182
+  full_name: "android_debug_per_cpu_symbol"
+}
+elf_symbol {
+  id: 0xffaebc56
+  name: "android_debug_symbol"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x1d505a43
+  namespace: "MINIDUMP"
+  type_id: 0x4a818b9c
+  full_name: "android_debug_symbol"
+}
 elf_symbol {
   id: 0xd8dbec6e
   name: "android_rvh_probe_register"
@@ -332515,6 +327697,15 @@ elf_symbol {
   type_id: 0x15f0919b
   full_name: "bio_associate_blkg"
 }
+elf_symbol {
+  id: 0xaa6c907e
+  name: "bio_associate_blkg_from_css"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x73f8f3ea
+  type_id: 0x155cca9b
+  full_name: "bio_associate_blkg_from_css"
+}
 elf_symbol {
   id: 0xb2553250
   name: "bio_chain"
@@ -332713,6 +327904,15 @@ elf_symbol {
   type_id: 0x1738d1f7
   full_name: "blk_abort_request"
 }
+elf_symbol {
+  id: 0x1516f6b7
+  name: "blk_bio_list_merge"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x693f756e
+  type_id: 0xfc093226
+  full_name: "blk_bio_list_merge"
+}
 elf_symbol {
   id: 0x4ffac461
   name: "blk_crypto_keyslot_index"
@@ -332803,6 +328003,15 @@ elf_symbol {
   type_id: 0x1738d1f7
   full_name: "blk_mq_complete_request"
 }
+elf_symbol {
+  id: 0x0467bac1
+  name: "blk_mq_debugfs_rq_show"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xec127399
+  type_id: 0x9c7b6f16
+  full_name: "blk_mq_debugfs_rq_show"
+}
 elf_symbol {
   id: 0x6458d26a
   name: "blk_mq_destroy_queue"
@@ -332902,6 +328111,24 @@ elf_symbol {
   type_id: 0xc97bfe9f
   full_name: "blk_mq_rq_cpu"
 }
+elf_symbol {
+  id: 0xff90ba37
+  name: "blk_mq_run_hw_queue"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x46c2c44f
+  type_id: 0x19af92ca
+  full_name: "blk_mq_run_hw_queue"
+}
+elf_symbol {
+  id: 0xff19eaec
+  name: "blk_mq_run_hw_queues"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x7400eefe
+  type_id: 0x137d33fc
+  full_name: "blk_mq_run_hw_queues"
+}
 elf_symbol {
   id: 0x49ee3f1e
   name: "blk_mq_sched_mark_restart_hctx"
@@ -333316,6 +328543,15 @@ elf_symbol {
   type_id: 0x1eabf44d
   full_name: "blk_start_plug"
 }
+elf_symbol {
+  id: 0x163b934e
+  name: "blk_stat_disable_accounting"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x24fe2120
+  type_id: 0x12c8ce83
+  full_name: "blk_stat_disable_accounting"
+}
 elf_symbol {
   id: 0xb78983c5
   name: "blk_stat_enable_accounting"
@@ -334700,6 +329936,15 @@ elf_symbol {
   type_id: 0x1e99dfd1
   full_name: "cec_unregister_adapter"
 }
+elf_symbol {
+  id: 0x4d06ba53
+  name: "cgroup_add_dfl_cftypes"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x86093f58
+  type_id: 0x9f4f3809
+  full_name: "cgroup_add_dfl_cftypes"
+}
 elf_symbol {
   id: 0x3c85cae0
   name: "cgroup_add_legacy_cftypes"
@@ -335877,6 +331122,15 @@ elf_symbol {
   type_id: 0xa1d613d8
   full_name: "copy_from_kernel_nofault"
 }
+elf_symbol {
+  id: 0xd71898b4
+  name: "copy_highpage"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x54d1223a
+  type_id: 0x11228b4e
+  full_name: "copy_highpage"
+}
 elf_symbol {
   id: 0xd89255c2
   name: "cpu_all_bits"
@@ -336399,6 +331653,15 @@ elf_symbol {
   type_id: 0x01f9081c
   full_name: "cpufreq_update_limits"
 }
+elf_symbol {
+  id: 0x4b049d5c
+  name: "cpufreq_update_policy"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xc37f9c6e
+  type_id: 0x01f9081c
+  full_name: "cpufreq_update_policy"
+}
 elf_symbol {
   id: 0x0c67e2fe
   name: "cpufreq_update_util_data"
@@ -338474,6 +333737,15 @@ elf_symbol {
   type_id: 0x91cab466
   full_name: "devfreq_add_governor"
 }
+elf_symbol {
+  id: 0x15eb01e7
+  name: "devfreq_cooling_em_register"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xa153b759
+  type_id: 0x4132c986
+  full_name: "devfreq_cooling_em_register"
+}
 elf_symbol {
   id: 0x647c0881
   name: "devfreq_cooling_unregister"
@@ -338924,6 +334196,15 @@ elf_symbol {
   type_id: 0x9defdaa5
   full_name: "device_property_read_string"
 }
+elf_symbol {
+  id: 0xe592ed14
+  name: "device_property_read_string_array"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x1caa071f
+  type_id: 0x9dec0a70
+  full_name: "device_property_read_string_array"
+}
 elf_symbol {
   id: 0x90a9db6c
   name: "device_property_read_u16_array"
@@ -339194,6 +334475,15 @@ elf_symbol {
   type_id: 0xa671941e
   full_name: "devm_clk_get_optional"
 }
+elf_symbol {
+  id: 0x8837a38c
+  name: "devm_clk_get_optional_enabled"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xab66b87e
+  type_id: 0xa671941e
+  full_name: "devm_clk_get_optional_enabled"
+}
 elf_symbol {
   id: 0x0d9ec99a
   name: "devm_clk_hw_register"
@@ -339356,6 +334646,15 @@ elf_symbol {
   type_id: 0x9d47faa0
   full_name: "devm_extcon_register_notifier"
 }
+elf_symbol {
+  id: 0xf4b697c0
+  name: "devm_extcon_register_notifier_all"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xa0b271d0
+  type_id: 0x9d50188a
+  full_name: "devm_extcon_register_notifier_all"
+}
 elf_symbol {
   id: 0x9218e37d
   name: "devm_free_irq"
@@ -344954,6 +340253,15 @@ elf_symbol {
   type_id: 0x1653799a
   full_name: "drm_plane_enable_fb_damage_clips"
 }
+elf_symbol {
+  id: 0xf06cd4b3
+  name: "drm_plane_from_index"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x1555a37a
+  type_id: 0xfee76c7c
+  full_name: "drm_plane_from_index"
+}
 elf_symbol {
   id: 0x8984b2e1
   name: "drm_poll"
@@ -345539,6 +340847,15 @@ elf_symbol {
   type_id: 0x140e294e
   full_name: "dst_release"
 }
+elf_symbol {
+  id: 0xe09fd784
+  name: "dummy_irq_chip"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0x06ae18cc
+  type_id: 0xadd7ccb6
+  full_name: "dummy_irq_chip"
+}
 elf_symbol {
   id: 0xded28924
   name: "dump_backtrace"
@@ -346691,6 +342008,15 @@ elf_symbol {
   type_id: 0x165a4073
   full_name: "free_io_pgtable_ops"
 }
+elf_symbol {
+  id: 0x998ad938
+  name: "free_iova_fast"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xdd8c10f6
+  type_id: 0x1fb862d7
+  full_name: "free_iova_fast"
+}
 elf_symbol {
   id: 0x27e49ce0
   name: "free_irq"
@@ -346961,6 +342287,15 @@ elf_symbol {
   type_id: 0x36f1d1fd
   full_name: "fwnode_get_next_child_node"
 }
+elf_symbol {
+  id: 0xff713254
+  name: "fwnode_get_phy_node"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xd42ed8cf
+  type_id: 0x3842a55f
+  full_name: "fwnode_get_phy_node"
+}
 elf_symbol {
   id: 0x02e45228
   name: "fwnode_gpiod_get_index"
@@ -350177,6 +345512,15 @@ elf_symbol {
   type_id: 0x100e6fc8
   full_name: "icc_sync_state"
 }
+elf_symbol {
+  id: 0x309b98f1
+  name: "icmp6_send"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xa41c6eed
+  type_id: 0x11673bbb
+  full_name: "icmp6_send"
+}
 elf_symbol {
   id: 0x58de8ff6
   name: "ida_alloc_range"
@@ -350951,6 +346295,24 @@ elf_symbol {
   type_id: 0x9882219f
   full_name: "inet_ioctl"
 }
+elf_symbol {
+  id: 0x601b2cac
+  name: "inet_proto_csum_replace4"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x8ea3f5f8
+  type_id: 0x1f0df99a
+  full_name: "inet_proto_csum_replace4"
+}
+elf_symbol {
+  id: 0xea35f0d0
+  name: "inet_select_addr"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xb4915426
+  type_id: 0x03ec98c8
+  full_name: "inet_select_addr"
+}
 elf_symbol {
   id: 0x7ded1ffe
   name: "init_dummy_netdev"
@@ -351428,6 +346790,15 @@ elf_symbol {
   type_id: 0x9823bcf6
   full_name: "io_schedule_timeout"
 }
+elf_symbol {
+  id: 0xfe45d0d9
+  name: "ioc_find_get_icq"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x91ab2f0b
+  type_id: 0xd9de6af9
+  full_name: "ioc_find_get_icq"
+}
 elf_symbol {
   id: 0xffca97cd
   name: "ioc_lookup_icq"
@@ -351716,6 +347087,15 @@ elf_symbol {
   type_id: 0x96c4a3ba
   full_name: "iommu_map"
 }
+elf_symbol {
+  id: 0x3d770021
+  name: "iommu_map_atomic"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xf6ea81c3
+  type_id: 0x96c4a3ba
+  full_name: "iommu_map_atomic"
+}
 elf_symbol {
   id: 0x21c33dfe
   name: "iommu_map_sg"
@@ -351842,6 +347222,15 @@ elf_symbol {
   type_id: 0x189472bc
   full_name: "iov_iter_revert"
 }
+elf_symbol {
+  id: 0x6c6beb07
+  name: "iova_domain_init_rcaches"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x0ff6a3a3
+  type_id: 0x9261d8a0
+  full_name: "iova_domain_init_rcaches"
+}
 elf_symbol {
   id: 0x1be0f35f
   name: "ip6_dst_hoplimit"
@@ -351851,6 +347240,15 @@ elf_symbol {
   type_id: 0x99169bf2
   full_name: "ip6_dst_hoplimit"
 }
+elf_symbol {
+  id: 0xd9fe9b1d
+  name: "ip6_find_1stfragopt"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xf459168d
+  type_id: 0x9cf9beaa
+  full_name: "ip6_find_1stfragopt"
+}
 elf_symbol {
   id: 0x5a7fbd45
   name: "ip6_local_out"
@@ -351869,6 +347267,15 @@ elf_symbol {
   type_id: 0x9edc3d1c
   full_name: "ip6_route_me_harder"
 }
+elf_symbol {
+  id: 0x807f9d22
+  name: "ip6_route_output_flags"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xc7f6396b
+  type_id: 0xa22a22cc
+  full_name: "ip6_route_output_flags"
+}
 elf_symbol {
   id: 0x6cd920cf
   name: "ip_compute_csum"
@@ -351959,6 +347366,15 @@ elf_symbol {
   type_id: 0xffbaa126
   full_name: "ipv6_dev_find"
 }
+elf_symbol {
+  id: 0x1e69bfb6
+  name: "ipv6_dev_get_saddr"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x255a1a5c
+  type_id: 0x9e69dafa
+  full_name: "ipv6_dev_get_saddr"
+}
 elf_symbol {
   id: 0x274071bc
   name: "ipv6_ext_hdr"
@@ -351977,6 +347393,15 @@ elf_symbol {
   type_id: 0x926eec8b
   full_name: "ipv6_find_hdr"
 }
+elf_symbol {
+  id: 0xd70b3ff0
+  name: "ipv6_select_ident"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xfb276934
+  type_id: 0x0f51af8b
+  full_name: "ipv6_select_ident"
+}
 elf_symbol {
   id: 0x1f294d29
   name: "ipv6_skip_exthdr"
@@ -352211,6 +347636,15 @@ elf_symbol {
   type_id: 0x9abe486f
   full_name: "irq_domain_disconnect_hierarchy"
 }
+elf_symbol {
+  id: 0x3fa49947
+  name: "irq_domain_free_fwnode"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x36fc4cbc
+  type_id: 0x11bc7f41
+  full_name: "irq_domain_free_fwnode"
+}
 elf_symbol {
   id: 0x327b1cbb
   name: "irq_domain_free_irqs_common"
@@ -353166,6 +348600,15 @@ elf_symbol {
   type_id: 0x5eef7e83
   full_name: "kmem_cache_alloc"
 }
+elf_symbol {
+  id: 0x86921e4b
+  name: "kmem_cache_alloc_node"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xf1e19a13
+  type_id: 0x5ef6b6b7
+  full_name: "kmem_cache_alloc_node"
+}
 elf_symbol {
   id: 0x56f23732
   name: "kmem_cache_create"
@@ -354804,6 +350247,15 @@ elf_symbol {
   type_id: 0xf1236ad6
   full_name: "mac_pton"
 }
+elf_symbol {
+  id: 0x5a1c51ee
+  name: "mark_page_accessed"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x1265d1cb
+  type_id: 0x11388634
+  full_name: "mark_page_accessed"
+}
 elf_symbol {
   id: 0xe4eac6bd
   name: "mas_empty_area_rev"
@@ -357257,6 +352709,15 @@ elf_symbol {
   type_id: 0x104c9db8
   full_name: "nf_conntrack_destroy"
 }
+elf_symbol {
+  id: 0x8b0d44a9
+  name: "nf_conntrack_find_get"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x1c96002d
+  type_id: 0x65a73fe6
+  full_name: "nf_conntrack_find_get"
+}
 elf_symbol {
   id: 0xb2e54d47
   name: "nf_ct_attach"
@@ -357275,6 +352736,33 @@ elf_symbol {
   type_id: 0xf33b99db
   full_name: "nf_ct_delete"
 }
+elf_symbol {
+  id: 0xb4e99805
+  name: "nf_ct_destroy"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x3b08a8f0
+  type_id: 0x104c9db8
+  full_name: "nf_ct_destroy"
+}
+elf_symbol {
+  id: 0x471faa17
+  name: "nf_ct_get_tuplepr"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xa5fac5ac
+  type_id: 0xf0122aeb
+  full_name: "nf_ct_get_tuplepr"
+}
+elf_symbol {
+  id: 0x82e37620
+  name: "nf_ct_invert_tuple"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xfe731af8
+  type_id: 0xfebe0504
+  full_name: "nf_ct_invert_tuple"
+}
 elf_symbol {
   id: 0x43078d96
   name: "nf_register_net_hooks"
@@ -357581,6 +353069,15 @@ elf_symbol {
   type_id: 0x15334a4f
   full_name: "nla_strscpy"
 }
+elf_symbol {
+  id: 0x39787440
+  name: "node_states"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0xe7b7da04
+  type_id: 0x8483d98a
+  full_name: "node_states"
+}
 elf_symbol {
   id: 0x7f258c4e
   name: "nonseekable_open"
@@ -358184,6 +353681,15 @@ elf_symbol {
   type_id: 0x91a3a43e
   full_name: "of_drm_get_panel_orientation"
 }
+elf_symbol {
+  id: 0x33b9622b
+  name: "of_find_all_nodes"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x65267db7
+  type_id: 0x7bef1e3b
+  full_name: "of_find_all_nodes"
+}
 elf_symbol {
   id: 0x985c43d8
   name: "of_find_backlight_by_node"
@@ -359210,6 +354716,15 @@ elf_symbol {
   type_id: 0x91296bda
   full_name: "open_candev"
 }
+elf_symbol {
+  id: 0x67bce5b1
+  name: "orderly_poweroff"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x56256e8a
+  type_id: 0x0bc7866e
+  full_name: "orderly_poweroff"
+}
 elf_symbol {
   id: 0x57ecab02
   name: "out_of_line_wait_on_bit"
@@ -359627,6 +355142,15 @@ elf_symbol {
   type_id: 0x92c2d86d
   full_name: "param_set_uint"
 }
+elf_symbol {
+  id: 0xe48076c0
+  name: "param_set_uint_minmax"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x4d337ca1
+  type_id: 0x92d2af21
+  full_name: "param_set_uint_minmax"
+}
 elf_symbol {
   id: 0x1eafdf64
   name: "param_set_ulong"
@@ -360779,6 +356303,15 @@ elf_symbol {
   type_id: 0xbf8f4ed4
   full_name: "phy_connect"
 }
+elf_symbol {
+  id: 0x866cf90c
+  name: "phy_connect_direct"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xa779f726
+  type_id: 0x91ec6dfe
+  full_name: "phy_connect_direct"
+}
 elf_symbol {
   id: 0x5ebc16d0
   name: "phy_disconnect"
@@ -360896,6 +356429,15 @@ elf_symbol {
   type_id: 0x9f7fc723
   full_name: "phy_exit"
 }
+elf_symbol {
+  id: 0x6cf83bd0
+  name: "phy_find_first"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x8d92c7a5
+  type_id: 0xbeab1c63
+  full_name: "phy_find_first"
+}
 elf_symbol {
   id: 0x0dfe21ad
   name: "phy_get"
@@ -360905,6 +356447,15 @@ elf_symbol {
   type_id: 0x1154b37f
   full_name: "phy_get"
 }
+elf_symbol {
+  id: 0x7de90fab
+  name: "phy_get_pause"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x7d110178
+  type_id: 0x1c86b5f0
+  full_name: "phy_get_pause"
+}
 elf_symbol {
   id: 0x30e87de6
   name: "phy_init"
@@ -361400,6 +356951,15 @@ elf_symbol {
   type_id: 0x92acc9b8
   full_name: "phylink_ethtool_set_wol"
 }
+elf_symbol {
+  id: 0x03646fd6
+  name: "phylink_expects_phy"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x4278d56a
+  type_id: 0xf10ce2b4
+  full_name: "phylink_expects_phy"
+}
 elf_symbol {
   id: 0x2c092465
   name: "phylink_fwnode_phy_connect"
@@ -362111,6 +357671,15 @@ elf_symbol {
   type_id: 0xad77a8f0
   full_name: "platform_find_device_by_driver"
 }
+elf_symbol {
+  id: 0x072cf683
+  name: "platform_get_ethdev_address"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x89592771
+  type_id: 0x9ddc45fb
+  full_name: "platform_get_ethdev_address"
+}
 elf_symbol {
   id: 0xb11c92aa
   name: "platform_get_irq"
@@ -363245,6 +358814,15 @@ elf_symbol {
   type_id: 0x57c99e27
   full_name: "pskb_put"
 }
+elf_symbol {
+  id: 0x3758c51f
+  name: "pskb_trim_rcsum_slow"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xda1052b5
+  type_id: 0x9dc52cf1
+  full_name: "pskb_trim_rcsum_slow"
+}
 elf_symbol {
   id: 0xea6abe92
   name: "pstore_register"
@@ -363362,6 +358940,15 @@ elf_symbol {
   type_id: 0x18d41dd9
   full_name: "put_disk"
 }
+elf_symbol {
+  id: 0x5db8ecdc
+  name: "put_io_context"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xc9e0a706
+  type_id: 0x1ea499af
+  full_name: "put_io_context"
+}
 elf_symbol {
   id: 0x01768311
   name: "put_iova_domain"
@@ -366224,6 +361811,15 @@ elf_symbol {
   type_id: 0x8e47c273
   full_name: "rps_needed"
 }
+elf_symbol {
+  id: 0xec5e9065
+  name: "rt6_lookup"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x1ea53a03
+  type_id: 0x187ccd99
+  full_name: "rt6_lookup"
+}
 elf_symbol {
   id: 0x264c5308
   name: "rt_mutex_lock"
@@ -366485,6 +362081,60 @@ elf_symbol {
   type_id: 0x1192ec84
   full_name: "sb800_prefetch"
 }
+elf_symbol {
+  id: 0x806f167c
+  name: "sbitmap_add_wait_queue"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x4981b0e2
+  type_id: 0x142e1753
+  full_name: "sbitmap_add_wait_queue"
+}
+elf_symbol {
+  id: 0xf13ba64e
+  name: "sbitmap_any_bit_set"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x499f6a97
+  type_id: 0xf34d29c1
+  full_name: "sbitmap_any_bit_set"
+}
+elf_symbol {
+  id: 0xe4f77cb7
+  name: "sbitmap_del_wait_queue"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xfab6c92b
+  type_id: 0x183a04a1
+  full_name: "sbitmap_del_wait_queue"
+}
+elf_symbol {
+  id: 0x12f98f54
+  name: "sbitmap_init_node"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x8be9a5cf
+  type_id: 0x941967cc
+  full_name: "sbitmap_init_node"
+}
+elf_symbol {
+  id: 0x85d0ffae
+  name: "sbitmap_queue_clear"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xcfb42d08
+  type_id: 0x1527b6ea
+  full_name: "sbitmap_queue_clear"
+}
+elf_symbol {
+  id: 0xe160a711
+  name: "sbitmap_queue_init_node"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xe4bd68f7
+  type_id: 0x98362533
+  full_name: "sbitmap_queue_init_node"
+}
 elf_symbol {
   id: 0x4513114c
   name: "sbitmap_queue_min_shallow_depth"
@@ -366494,6 +362144,24 @@ elf_symbol {
   type_id: 0x1536d7b3
   full_name: "sbitmap_queue_min_shallow_depth"
 }
+elf_symbol {
+  id: 0x3af97828
+  name: "sbitmap_queue_resize"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x67a07059
+  type_id: 0x1536d7b3
+  full_name: "sbitmap_queue_resize"
+}
+elf_symbol {
+  id: 0x6375c31d
+  name: "sbitmap_queue_show"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xee37b200
+  type_id: 0x143955b1
+  full_name: "sbitmap_queue_show"
+}
 elf_symbol {
   id: 0x56cb7a36
   name: "sbitmap_weight"
@@ -367547,6 +363215,24 @@ elf_symbol {
   type_id: 0x42749d40
   full_name: "seq_hlist_start_head"
 }
+elf_symbol {
+  id: 0xe5f1a4c5
+  name: "seq_list_next"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xe7d4daac
+  type_id: 0xf87e0015
+  full_name: "seq_list_next"
+}
+elf_symbol {
+  id: 0x1405c2fb
+  name: "seq_list_start"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xff1e9dd8
+  type_id: 0xf1ae1eac
+  full_name: "seq_list_start"
+}
 elf_symbol {
   id: 0xe0349007
   name: "seq_lseek"
@@ -368457,6 +364143,15 @@ elf_symbol {
   type_id: 0x6ecc6402
   full_name: "sk_alloc"
 }
+elf_symbol {
+  id: 0x1295815b
+  name: "sk_capable"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x9bced1ab
+  type_id: 0xf1208847
+  full_name: "sk_capable"
+}
 elf_symbol {
   id: 0xd7cc5056
   name: "sk_common_release"
@@ -370761,6 +366456,15 @@ elf_symbol {
   type_id: 0x9b2aae3f
   full_name: "snd_usb_power_domain_set"
 }
+elf_symbol {
+  id: 0x25a85408
+  name: "snd_vendor_set_ops"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xadf3f0b9
+  type_id: 0x9d251990
+  full_name: "snd_vendor_set_ops"
+}
 elf_symbol {
   id: 0x32cae5ee
   name: "snprintf"
@@ -372933,6 +368637,15 @@ elf_symbol {
   type_id: 0xf354bbbc
   full_name: "thermal_zone_device_register"
 }
+elf_symbol {
+  id: 0xed549fd4
+  name: "thermal_zone_device_register_with_trips"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xfcd9aad1
+  type_id: 0xf2e4f0d1
+  full_name: "thermal_zone_device_register_with_trips"
+}
 elf_symbol {
   id: 0x73954c59
   name: "thermal_zone_device_unregister"
@@ -372969,6 +368682,15 @@ elf_symbol {
   type_id: 0xf2d19814
   full_name: "thermal_zone_get_zone_by_name"
 }
+elf_symbol {
+  id: 0x61ab1273
+  name: "thermal_zone_unbind_cooling_device"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x13f7391c
+  type_id: 0x95a406a6
+  full_name: "thermal_zone_unbind_cooling_device"
+}
 elf_symbol {
   id: 0x68e98442
   name: "thread_group_cputime_adjusted"
@@ -373041,6 +368763,15 @@ elf_symbol {
   type_id: 0x90e86d28
   full_name: "timer_of_init"
 }
+elf_symbol {
+  id: 0x5da495c5
+  name: "timer_reduce"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x75c21753
+  type_id: 0x92c0b65c
+  full_name: "timer_reduce"
+}
 elf_symbol {
   id: 0xdc3e523b
   name: "timer_unstable_counter_workaround"
@@ -373572,6 +369303,15 @@ elf_symbol {
   type_id: 0x15000153
   full_name: "ttm_bo_unlock_delayed_workqueue"
 }
+elf_symbol {
+  id: 0xf35fc966
+  name: "ttm_bo_unmap_virtual"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xb6ff6422
+  type_id: 0x19832066
+  full_name: "ttm_bo_unmap_virtual"
+}
 elf_symbol {
   id: 0x05d29e21
   name: "ttm_bo_unpin"
@@ -373662,6 +369402,15 @@ elf_symbol {
   type_id: 0x197f4904
   full_name: "ttm_bo_vunmap"
 }
+elf_symbol {
+  id: 0x46252c06
+  name: "ttm_bo_wait"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xe6de126c
+  type_id: 0x95353072
+  full_name: "ttm_bo_wait"
+}
 elf_symbol {
   id: 0x7d656c6a
   name: "ttm_device_fini"
@@ -373689,6 +369438,15 @@ elf_symbol {
   type_id: 0x1b6d6e11
   full_name: "ttm_eu_backoff_reservation"
 }
+elf_symbol {
+  id: 0x42083e9a
+  name: "ttm_eu_fence_buffer_objects"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x844d1fc4
+  type_id: 0x1b6dacf7
+  full_name: "ttm_eu_fence_buffer_objects"
+}
 elf_symbol {
   id: 0x697b29f0
   name: "ttm_eu_reserve_buffers"
@@ -374319,6 +370077,42 @@ elf_symbol {
   type_id: 0xc564dee2
   full_name: "tty_write_room"
 }
+elf_symbol {
+  id: 0xfb5efe2e
+  name: "typec_altmode_attention"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x398e7f4f
+  type_id: 0x1e02170b
+  full_name: "typec_altmode_attention"
+}
+elf_symbol {
+  id: 0x58687602
+  name: "typec_altmode_notify"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xabc1a359
+  type_id: 0x90f57fd0
+  full_name: "typec_altmode_notify"
+}
+elf_symbol {
+  id: 0xe7fb597f
+  name: "typec_altmode_update_active"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xa9986484
+  type_id: 0x1c93cad8
+  full_name: "typec_altmode_update_active"
+}
+elf_symbol {
+  id: 0xe6cbb47e
+  name: "typec_altmode_vdm"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xe01054ea
+  type_id: 0x93177804
+  full_name: "typec_altmode_vdm"
+}
 elf_symbol {
   id: 0x0d23e13a
   name: "typec_find_port_data_role"
@@ -374337,6 +370131,15 @@ elf_symbol {
   type_id: 0x9204ce69
   full_name: "typec_find_port_power_role"
 }
+elf_symbol {
+  id: 0xe9d634b5
+  name: "typec_find_power_role"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x2d1e301d
+  type_id: 0x9204ce69
+  full_name: "typec_find_power_role"
+}
 elf_symbol {
   id: 0x84b20708
   name: "typec_get_drvdata"
@@ -374346,6 +370149,15 @@ elf_symbol {
   type_id: 0x5b4eac6a
   full_name: "typec_get_drvdata"
 }
+elf_symbol {
+  id: 0xb8c4fc82
+  name: "typec_match_altmode"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x3fa48e72
+  type_id: 0xd001e6e1
+  full_name: "typec_match_altmode"
+}
 elf_symbol {
   id: 0x8fafe0a6
   name: "typec_mux_get_drvdata"
@@ -374391,6 +370203,15 @@ elf_symbol {
   type_id: 0x1caf35fa
   full_name: "typec_mux_unregister"
 }
+elf_symbol {
+  id: 0x6dffcd52
+  name: "typec_partner_register_altmode"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x853b52c9
+  type_id: 0xd6e94dc1
+  full_name: "typec_partner_register_altmode"
+}
 elf_symbol {
   id: 0xe9bfa224
   name: "typec_partner_set_identity"
@@ -374418,6 +370239,15 @@ elf_symbol {
   type_id: 0x163dd09d
   full_name: "typec_partner_set_svdm_version"
 }
+elf_symbol {
+  id: 0x4fe4e1e0
+  name: "typec_port_register_altmode"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x545d0306
+  type_id: 0xdf267053
+  full_name: "typec_port_register_altmode"
+}
 elf_symbol {
   id: 0x22d09ebb
   name: "typec_register_partner"
@@ -374445,6 +370275,15 @@ elf_symbol {
   type_id: 0x1e585388
   full_name: "typec_set_data_role"
 }
+elf_symbol {
+  id: 0x7e6ad5ea
+  name: "typec_set_mode"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x8519551e
+  type_id: 0x91c47df8
+  full_name: "typec_set_mode"
+}
 elf_symbol {
   id: 0xfb60a10e
   name: "typec_set_orientation"
@@ -374508,6 +370347,15 @@ elf_symbol {
   type_id: 0x1197e2e5
   full_name: "typec_switch_unregister"
 }
+elf_symbol {
+  id: 0xcbaf28c3
+  name: "typec_unregister_altmode"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x308ea05e
+  type_id: 0x1d2637a7
+  full_name: "typec_unregister_altmode"
+}
 elf_symbol {
   id: 0x098b2c4d
   name: "typec_unregister_partner"
@@ -375039,6 +370887,15 @@ elf_symbol {
   type_id: 0x11ebebf2
   full_name: "ufshcd_mcq_config_esi"
 }
+elf_symbol {
+  id: 0x71dad1b2
+  name: "ufshcd_mcq_config_mac"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xd1787215
+  type_id: 0x125cb480
+  full_name: "ufshcd_mcq_config_mac"
+}
 elf_symbol {
   id: 0x051c0489
   name: "ufshcd_mcq_enable_esi"
@@ -375048,6 +370905,15 @@ elf_symbol {
   type_id: 0x1178942c
   full_name: "ufshcd_mcq_enable_esi"
 }
+elf_symbol {
+  id: 0x562c9a11
+  name: "ufshcd_mcq_make_queues_operational"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x1d22bd73
+  type_id: 0x1178942c
+  full_name: "ufshcd_mcq_make_queues_operational"
+}
 elf_symbol {
   id: 0x56d1da85
   name: "ufshcd_mcq_poll_cqe_lock"
@@ -375066,6 +370932,15 @@ elf_symbol {
   type_id: 0x30f8e5d3
   full_name: "ufshcd_mcq_poll_cqe_nolock"
 }
+elf_symbol {
+  id: 0xaefd3622
+  name: "ufshcd_mcq_read_cqis"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xeafc7b98
+  type_id: 0x45846d91
+  full_name: "ufshcd_mcq_read_cqis"
+}
 elf_symbol {
   id: 0x3ecd46f0
   name: "ufshcd_mcq_write_cqis"
@@ -375948,6 +371823,15 @@ elf_symbol {
   type_id: 0xbf6cd8a9
   full_name: "usb_calc_bus_time"
 }
+elf_symbol {
+  id: 0x23a5ab99
+  name: "usb_choose_configuration"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xf7b90cc4
+  type_id: 0x9edfdadc
+  full_name: "usb_choose_configuration"
+}
 elf_symbol {
   id: 0x2a589f64
   name: "usb_clear_halt"
@@ -380601,6 +376485,15 @@ elf_symbol {
   type_id: 0xa2843be3
   full_name: "xfrm_lookup"
 }
+elf_symbol {
+  id: 0x6b55b9d2
+  name: "xfrm_state_afinfo_get_rcu"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xa60f4d57
+  type_id: 0xd8e8dad0
+  full_name: "xfrm_state_afinfo_get_rcu"
+}
 elf_symbol {
   id: 0xeb912db7
   name: "xfrm_state_lookup_byspi"
@@ -380619,6 +376512,24 @@ elf_symbol {
   type_id: 0x62e6e159
   full_name: "xfrm_stateonly_find"
 }
+elf_symbol {
+  id: 0x994cfb6c
+  name: "xhci_add_endpoint"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x3a365b04
+  type_id: 0x94ebfe13
+  full_name: "xhci_add_endpoint"
+}
+elf_symbol {
+  id: 0x8c2045ca
+  name: "xhci_address_device"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x945be478
+  type_id: 0x94eb1868
+  full_name: "xhci_address_device"
+}
 elf_symbol {
   id: 0xdf73207c
   name: "xhci_alloc_command"
@@ -380637,6 +376548,33 @@ elf_symbol {
   type_id: 0x99afdc89
   full_name: "xhci_alloc_erst"
 }
+elf_symbol {
+  id: 0x209bd6b9
+  name: "xhci_bus_resume"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x1a9d5630
+  type_id: 0x94deebf7
+  full_name: "xhci_bus_resume"
+}
+elf_symbol {
+  id: 0x68d92b40
+  name: "xhci_bus_suspend"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x78c05195
+  type_id: 0x94deebf7
+  full_name: "xhci_bus_suspend"
+}
+elf_symbol {
+  id: 0x520c06c0
+  name: "xhci_check_trb_in_td_math"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x6a82fc7a
+  type_id: 0x9921a72c
+  full_name: "xhci_check_trb_in_td_math"
+}
 elf_symbol {
   id: 0xa6eac918
   name: "xhci_free_command"
@@ -380664,6 +376602,24 @@ elf_symbol {
   type_id: 0xcd9f7f34
   full_name: "xhci_get_endpoint_index"
 }
+elf_symbol {
+  id: 0xc9a9e8ab
+  name: "xhci_get_ep_ctx"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xfb992afc
+  type_id: 0xcbd33190
+  full_name: "xhci_get_ep_ctx"
+}
+elf_symbol {
+  id: 0xa2b73df4
+  name: "xhci_get_slot_ctx"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x5b7d19e7
+  type_id: 0x98c001f4
+  full_name: "xhci_get_slot_ctx"
+}
 elf_symbol {
   id: 0x71f2808e
   name: "xhci_init_driver"
@@ -380673,6 +376629,24 @@ elf_symbol {
   type_id: 0x14d9dc3c
   full_name: "xhci_init_driver"
 }
+elf_symbol {
+  id: 0x246bf5fe
+  name: "xhci_initialize_ring_info"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xdb8be866
+  type_id: 0x19e2f0b6
+  full_name: "xhci_initialize_ring_info"
+}
+elf_symbol {
+  id: 0x96be3ac9
+  name: "xhci_link_segments"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x9a727e20
+  type_id: 0x1fcbfdc9
+  full_name: "xhci_link_segments"
+}
 elf_symbol {
   id: 0xfa57b81b
   name: "xhci_queue_stop_endpoint"
@@ -380682,6 +376656,15 @@ elf_symbol {
   type_id: 0x99011cda
   full_name: "xhci_queue_stop_endpoint"
 }
+elf_symbol {
+  id: 0x9d21209c
+  name: "xhci_remove_stream_mapping"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x462a6e6b
+  type_id: 0x18f4e52e
+  full_name: "xhci_remove_stream_mapping"
+}
 elf_symbol {
   id: 0x4603c1d4
   name: "xhci_resume"
@@ -380727,6 +376710,15 @@ elf_symbol {
   type_id: 0x94deebf7
   full_name: "xhci_run"
 }
+elf_symbol {
+  id: 0xcf411a0e
+  name: "xhci_segment_free"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xd8efaa99
+  type_id: 0x14c2c0fe
+  full_name: "xhci_segment_free"
+}
 elf_symbol {
   id: 0xb834cd77
   name: "xhci_suspend"
@@ -380745,6 +376737,15 @@ elf_symbol {
   type_id: 0xb367c064
   full_name: "xhci_trb_virt_to_dma"
 }
+elf_symbol {
+  id: 0xd777027b
+  name: "xhci_vendor_get_ops"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x773c097f
+  type_id: 0x8039c229
+  full_name: "xhci_vendor_get_ops"
+}
 elf_symbol {
   id: 0x23b2a72a
   name: "xp_alloc"
@@ -381256,6 +377257,7 @@ interface {
   symbol_id: 0x1c57a05b
   symbol_id: 0xdf2d2827
   symbol_id: 0x70f1b87e
+  symbol_id: 0xc37fd40e
   symbol_id: 0xe064ac65
   symbol_id: 0xafc169af
   symbol_id: 0xcaf40f72
@@ -381367,6 +377369,7 @@ interface {
   symbol_id: 0x2b453adc
   symbol_id: 0xd5276fa4
   symbol_id: 0x98379aaf
+  symbol_id: 0x99aa632e
   symbol_id: 0xe68925b8
   symbol_id: 0x6e3bb1cf
   symbol_id: 0x0166be18
@@ -381410,6 +377413,7 @@ interface {
   symbol_id: 0xdb99fd00
   symbol_id: 0xf7de9a97
   symbol_id: 0x6356c7e1
+  symbol_id: 0x46adfea4
   symbol_id: 0x233d8b34
   symbol_id: 0xa5905957
   symbol_id: 0x17dfc6db
@@ -381581,9 +377585,11 @@ interface {
   symbol_id: 0x9dbd7b92
   symbol_id: 0x42312ccc
   symbol_id: 0xf432d1c9
+  symbol_id: 0x7ebac47a
   symbol_id: 0xf586d5b6
   symbol_id: 0x1f554c2a
   symbol_id: 0x93a4717b
+  symbol_id: 0xc189c2a7
   symbol_id: 0x5ecff02f
   symbol_id: 0xe3ce1f52
   symbol_id: 0x3272ce60
@@ -381602,6 +377608,7 @@ interface {
   symbol_id: 0x9fe60f0c
   symbol_id: 0x83b45f32
   symbol_id: 0x1df03151
+  symbol_id: 0xdbe4202a
   symbol_id: 0x88586647
   symbol_id: 0xdb6662e8
   symbol_id: 0x64c2fe7a
@@ -381622,6 +377629,7 @@ interface {
   symbol_id: 0x96b60e0b
   symbol_id: 0x3431d426
   symbol_id: 0x8c174a7d
+  symbol_id: 0xea8ce2b0
   symbol_id: 0xe44dacb1
   symbol_id: 0x5612c9d1
   symbol_id: 0xa77effd1
@@ -381646,6 +377654,7 @@ interface {
   symbol_id: 0x0fa39b81
   symbol_id: 0x92518ec5
   symbol_id: 0x9792c22e
+  symbol_id: 0x8d62858f
   symbol_id: 0xcef5d79f
   symbol_id: 0x91384eff
   symbol_id: 0x3ef508a2
@@ -381926,9 +377935,11 @@ interface {
   symbol_id: 0xe2d7542c
   symbol_id: 0x988719fa
   symbol_id: 0x732a182b
+  symbol_id: 0x188eab44
   symbol_id: 0xe7584e1c
   symbol_id: 0x0d418d38
   symbol_id: 0x50a83025
+  symbol_id: 0x04a824b5
   symbol_id: 0xe6918e09
   symbol_id: 0x4d4fd1cc
   symbol_id: 0xace80c56
@@ -381947,6 +377958,7 @@ interface {
   symbol_id: 0x828646be
   symbol_id: 0x4756cfec
   symbol_id: 0x8b7beb3b
+  symbol_id: 0x60a121b4
   symbol_id: 0xf18e312d
   symbol_id: 0xf68497fa
   symbol_id: 0xb6603d58
@@ -381967,6 +377979,7 @@ interface {
   symbol_id: 0x78341cfd
   symbol_id: 0xac62c748
   symbol_id: 0xa2bd1edf
+  symbol_id: 0xa5b4e5b2
   symbol_id: 0xb6da564f
   symbol_id: 0x41c8d09b
   symbol_id: 0xe2ad11db
@@ -381991,6 +378004,7 @@ interface {
   symbol_id: 0xef7ad117
   symbol_id: 0x4568ff8f
   symbol_id: 0xe918e2ec
+  symbol_id: 0x04365139
   symbol_id: 0xd94bc301
   symbol_id: 0x3fc5ffc9
   symbol_id: 0xa3915d70
@@ -382221,6 +378235,7 @@ interface {
   symbol_id: 0xc8c5af1c
   symbol_id: 0xdeecf7a4
   symbol_id: 0xeba70df6
+  symbol_id: 0x9cff6ebf
   symbol_id: 0xcf6df527
   symbol_id: 0x00374dfe
   symbol_id: 0xb77c96c5
@@ -382232,6 +378247,8 @@ interface {
   symbol_id: 0x8480d9c1
   symbol_id: 0xb7d7d836
   symbol_id: 0xacb3d1d3
+  symbol_id: 0x5653e7da
+  symbol_id: 0xffaebc56
   symbol_id: 0xd8dbec6e
   symbol_id: 0x95eaf556
   symbol_id: 0xf2d017ff
@@ -382288,6 +378305,7 @@ interface {
   symbol_id: 0x49201db3
   symbol_id: 0xacc709b0
   symbol_id: 0x2b2698f0
+  symbol_id: 0xaa6c907e
   symbol_id: 0xb2553250
   symbol_id: 0xb389e6a5
   symbol_id: 0x3a8604de
@@ -382310,6 +378328,7 @@ interface {
   symbol_id: 0xb5b2d835
   symbol_id: 0x226328f4
   symbol_id: 0x0b5d5f1c
+  symbol_id: 0x1516f6b7
   symbol_id: 0x4ffac461
   symbol_id: 0xad8bab96
   symbol_id: 0x528ef002
@@ -382320,6 +378339,7 @@ interface {
   symbol_id: 0x0d1fc920
   symbol_id: 0xd34c6466
   symbol_id: 0x51c471d6
+  symbol_id: 0x0467bac1
   symbol_id: 0x6458d26a
   symbol_id: 0x2e876bee
   symbol_id: 0x1996f188
@@ -382331,6 +378351,8 @@ interface {
   symbol_id: 0x1f81c0c0
   symbol_id: 0xcebb0cec
   symbol_id: 0x27ae2b17
+  symbol_id: 0xff90ba37
+  symbol_id: 0xff19eaec
   symbol_id: 0x49ee3f1e
   symbol_id: 0x646a1dc6
   symbol_id: 0xc40c1fbe
@@ -382377,6 +378399,7 @@ interface {
   symbol_id: 0x835f3bf3
   symbol_id: 0xdc30e4d6
   symbol_id: 0xcb1ad79b
+  symbol_id: 0x163b934e
   symbol_id: 0xb78983c5
   symbol_id: 0xe6192860
   symbol_id: 0xf40ec9b3
@@ -382531,6 +378554,7 @@ interface {
   symbol_id: 0xc4e53e95
   symbol_id: 0xba1a33c8
   symbol_id: 0xe2dc88d9
+  symbol_id: 0x4d06ba53
   symbol_id: 0x3c85cae0
   symbol_id: 0x4ce62869
   symbol_id: 0x6d77f512
@@ -382662,6 +378686,7 @@ interface {
   symbol_id: 0xca337eb1
   symbol_id: 0x9e7d8d76
   symbol_id: 0x610edc84
+  symbol_id: 0xd71898b4
   symbol_id: 0xd89255c2
   symbol_id: 0x962b6a68
   symbol_id: 0x33bbeca6
@@ -382720,6 +378745,7 @@ interface {
   symbol_id: 0x131ff67b
   symbol_id: 0xbbbf4eda
   symbol_id: 0xb6965ce8
+  symbol_id: 0x4b049d5c
   symbol_id: 0x0c67e2fe
   symbol_id: 0xc6155c06
   symbol_id: 0xce563c27
@@ -382951,6 +378977,7 @@ interface {
   symbol_id: 0xfc7749bc
   symbol_id: 0x55a1ee95
   symbol_id: 0x04c32c7c
+  symbol_id: 0x15eb01e7
   symbol_id: 0x647c0881
   symbol_id: 0x19e74e36
   symbol_id: 0xdb9d4783
@@ -383001,6 +379028,7 @@ interface {
   symbol_id: 0xd0ac64f7
   symbol_id: 0xa1e3330b
   symbol_id: 0x85ab844f
+  symbol_id: 0xe592ed14
   symbol_id: 0x90a9db6c
   symbol_id: 0xde1fbc57
   symbol_id: 0xa161f29a
@@ -383031,6 +379059,7 @@ interface {
   symbol_id: 0xf770e060
   symbol_id: 0xfe156c9a
   symbol_id: 0xf569682d
+  symbol_id: 0x8837a38c
   symbol_id: 0x0d9ec99a
   symbol_id: 0x61438d3a
   symbol_id: 0xdeeb802d
@@ -383049,6 +379078,7 @@ interface {
   symbol_id: 0xbcab4e4a
   symbol_id: 0xa77979a2
   symbol_id: 0x56724950
+  symbol_id: 0xf4b697c0
   symbol_id: 0x9218e37d
   symbol_id: 0xc8de14e8
   symbol_id: 0xaf5de696
@@ -383669,6 +379699,7 @@ interface {
   symbol_id: 0xd08fdb4b
   symbol_id: 0x9082bb51
   symbol_id: 0x87ced39a
+  symbol_id: 0xf06cd4b3
   symbol_id: 0x8984b2e1
   symbol_id: 0x22bf134d
   symbol_id: 0xee902d0d
@@ -383734,6 +379765,7 @@ interface {
   symbol_id: 0x383fe893
   symbol_id: 0xa9bf10bc
   symbol_id: 0xc70188be
+  symbol_id: 0xe09fd784
   symbol_id: 0xded28924
   symbol_id: 0xe3421d56
   symbol_id: 0xda364c85
@@ -383862,6 +379894,7 @@ interface {
   symbol_id: 0x0513219e
   symbol_id: 0x1b00ff86
   symbol_id: 0x9b815cdc
+  symbol_id: 0x998ad938
   symbol_id: 0x27e49ce0
   symbol_id: 0xa0e729a5
   symbol_id: 0xe330aff9
@@ -383892,6 +379925,7 @@ interface {
   symbol_id: 0x11780300
   symbol_id: 0x183013c2
   symbol_id: 0x55d636ec
+  symbol_id: 0xff713254
   symbol_id: 0x02e45228
   symbol_id: 0x90df3dac
   symbol_id: 0x98cceeb9
@@ -384249,6 +380283,7 @@ interface {
   symbol_id: 0x92a80b79
   symbol_id: 0x17b1a06d
   symbol_id: 0x5e075973
+  symbol_id: 0x309b98f1
   symbol_id: 0x58de8ff6
   symbol_id: 0xb9a0744d
   symbol_id: 0x9c458796
@@ -384335,6 +380370,8 @@ interface {
   symbol_id: 0xbf4f0b58
   symbol_id: 0x6e6a2ec5
   symbol_id: 0xca2771be
+  symbol_id: 0x601b2cac
+  symbol_id: 0xea35f0d0
   symbol_id: 0x7ded1ffe
   symbol_id: 0xe42479db
   symbol_id: 0xd8b14976
@@ -384388,6 +380425,7 @@ interface {
   symbol_id: 0x6b8c216a
   symbol_id: 0x6f047c6e
   symbol_id: 0xd67bf9ed
+  symbol_id: 0xfe45d0d9
   symbol_id: 0xffca97cd
   symbol_id: 0x99224733
   symbol_id: 0xa4eabc87
@@ -384420,6 +380458,7 @@ interface {
   symbol_id: 0x119c23e5
   symbol_id: 0x9aea043a
   symbol_id: 0xbfb0ba46
+  symbol_id: 0x3d770021
   symbol_id: 0x21c33dfe
   symbol_id: 0x6c972a39
   symbol_id: 0x5334a8b4
@@ -384434,9 +380473,12 @@ interface {
   symbol_id: 0x71726a83
   symbol_id: 0xffb394c4
   symbol_id: 0x48a6183b
+  symbol_id: 0x6c6beb07
   symbol_id: 0x1be0f35f
+  symbol_id: 0xd9fe9b1d
   symbol_id: 0x5a7fbd45
   symbol_id: 0x7837fb7f
+  symbol_id: 0x807f9d22
   symbol_id: 0x6cd920cf
   symbol_id: 0x5234b1b5
   symbol_id: 0xaed020d7
@@ -384447,8 +380489,10 @@ interface {
   symbol_id: 0x39f87265
   symbol_id: 0xd35aa56c
   symbol_id: 0xfd0a8a39
+  symbol_id: 0x1e69bfb6
   symbol_id: 0x274071bc
   symbol_id: 0x8b22b24d
+  symbol_id: 0xd70b3ff0
   symbol_id: 0x1f294d29
   symbol_id: 0xc610fcd6
   symbol_id: 0x915bc321
@@ -384475,6 +380519,7 @@ interface {
   symbol_id: 0x5e13f2f1
   symbol_id: 0x135db1d2
   symbol_id: 0xba41ecd4
+  symbol_id: 0x3fa49947
   symbol_id: 0x327b1cbb
   symbol_id: 0x61a826d2
   symbol_id: 0x3cc69c51
@@ -384581,6 +380626,7 @@ interface {
   symbol_id: 0xa64fdec4
   symbol_id: 0xcbec700e
   symbol_id: 0x394ce3dd
+  symbol_id: 0x86921e4b
   symbol_id: 0x56f23732
   symbol_id: 0xa5a4fafa
   symbol_id: 0xc37ba22c
@@ -384763,6 +380809,7 @@ interface {
   symbol_id: 0x01bea327
   symbol_id: 0x4f31c756
   symbol_id: 0x7bd17841
+  symbol_id: 0x5a1c51ee
   symbol_id: 0xe4eac6bd
   symbol_id: 0x602510fe
   symbol_id: 0x304a5133
@@ -385036,8 +381083,12 @@ interface {
   symbol_id: 0xbbd2a0ab
   symbol_id: 0x57abe80f
   symbol_id: 0xc8ea3547
+  symbol_id: 0x8b0d44a9
   symbol_id: 0xb2e54d47
   symbol_id: 0x1b589c40
+  symbol_id: 0xb4e99805
+  symbol_id: 0x471faa17
+  symbol_id: 0x82e37620
   symbol_id: 0x43078d96
   symbol_id: 0x619db28f
   symbol_id: 0x36bc8d13
@@ -385072,6 +381123,7 @@ interface {
   symbol_id: 0x49027247
   symbol_id: 0x85e07b67
   symbol_id: 0x6359420c
+  symbol_id: 0x39787440
   symbol_id: 0x7f258c4e
   symbol_id: 0x64e6aa0b
   symbol_id: 0x1560f116
@@ -385139,6 +381191,7 @@ interface {
   symbol_id: 0xd37bdc53
   symbol_id: 0x1d42003f
   symbol_id: 0xf3b2b115
+  symbol_id: 0x33b9622b
   symbol_id: 0x985c43d8
   symbol_id: 0xd5545a99
   symbol_id: 0x9f89ff97
@@ -385253,6 +381306,7 @@ interface {
   symbol_id: 0xd9c8585e
   symbol_id: 0xa50d59b7
   symbol_id: 0x224cb6b2
+  symbol_id: 0x67bce5b1
   symbol_id: 0x57ecab02
   symbol_id: 0x27d0c7b6
   symbol_id: 0x28b33064
@@ -385299,6 +381353,7 @@ interface {
   symbol_id: 0x34de6be7
   symbol_id: 0x9cc61d04
   symbol_id: 0x07e4f5ea
+  symbol_id: 0xe48076c0
   symbol_id: 0x1eafdf64
   symbol_id: 0x67d6372c
   symbol_id: 0x0a48d5ac
@@ -385427,6 +381482,7 @@ interface {
   symbol_id: 0x81e2991f
   symbol_id: 0xc278f4fa
   symbol_id: 0x9c15bd7a
+  symbol_id: 0x866cf90c
   symbol_id: 0x5ebc16d0
   symbol_id: 0xb39736f6
   symbol_id: 0x9d35d830
@@ -385440,7 +381496,9 @@ interface {
   symbol_id: 0x992e8b3c
   symbol_id: 0xcd9e585e
   symbol_id: 0x69eeb51b
+  symbol_id: 0x6cf83bd0
   symbol_id: 0x0dfe21ad
+  symbol_id: 0x7de90fab
   symbol_id: 0x30e87de6
   symbol_id: 0x6fc1e83f
   symbol_id: 0x0e1df21c
@@ -385496,6 +381554,7 @@ interface {
   symbol_id: 0xeab149af
   symbol_id: 0x0a235dd5
   symbol_id: 0xa92902da
+  symbol_id: 0x03646fd6
   symbol_id: 0x2c092465
   symbol_id: 0x161b2b54
   symbol_id: 0x707a35cb
@@ -385575,6 +381634,7 @@ interface {
   symbol_id: 0xe8ed13a6
   symbol_id: 0x2c91b5be
   symbol_id: 0xf8b12136
+  symbol_id: 0x072cf683
   symbol_id: 0xb11c92aa
   symbol_id: 0xaa322a74
   symbol_id: 0x0d9f5d07
@@ -385701,6 +381761,7 @@ interface {
   symbol_id: 0x7fc27c29
   symbol_id: 0x9dc0e748
   symbol_id: 0x2251af59
+  symbol_id: 0x3758c51f
   symbol_id: 0xea6abe92
   symbol_id: 0xbbb52558
   symbol_id: 0x5b447f09
@@ -385714,6 +381775,7 @@ interface {
   symbol_id: 0x11d4227b
   symbol_id: 0x71551ba9
   symbol_id: 0x435b99c6
+  symbol_id: 0x5db8ecdc
   symbol_id: 0x01768311
   symbol_id: 0x1744651d
   symbol_id: 0x9103dd70
@@ -386032,6 +382094,7 @@ interface {
   symbol_id: 0x74c27ecd
   symbol_id: 0x80913de9
   symbol_id: 0xbffd1c46
+  symbol_id: 0xec5e9065
   symbol_id: 0x264c5308
   symbol_id: 0x205145e9
   symbol_id: 0x0eff96d9
@@ -386061,7 +382124,15 @@ interface {
   symbol_id: 0x8fb082a6
   symbol_id: 0x570df167
   symbol_id: 0x84f045c2
+  symbol_id: 0x806f167c
+  symbol_id: 0xf13ba64e
+  symbol_id: 0xe4f77cb7
+  symbol_id: 0x12f98f54
+  symbol_id: 0x85d0ffae
+  symbol_id: 0xe160a711
   symbol_id: 0x4513114c
+  symbol_id: 0x3af97828
+  symbol_id: 0x6375c31d
   symbol_id: 0x56cb7a36
   symbol_id: 0xe8c754b0
   symbol_id: 0x12fb2fd6
@@ -386179,6 +382250,8 @@ interface {
   symbol_id: 0xb2b0c8fa
   symbol_id: 0xfb710d3e
   symbol_id: 0x0af60b8b
+  symbol_id: 0xe5f1a4c5
+  symbol_id: 0x1405c2fb
   symbol_id: 0xe0349007
   symbol_id: 0xfae0b182
   symbol_id: 0x9ef87854
@@ -386280,6 +382353,7 @@ interface {
   symbol_id: 0x4f6b19f1
   symbol_id: 0xd4ea779d
   symbol_id: 0x67a38bc7
+  symbol_id: 0x1295815b
   symbol_id: 0xd7cc5056
   symbol_id: 0x40df740b
   symbol_id: 0x89a97545
@@ -386536,6 +382610,7 @@ interface {
   symbol_id: 0xd2e3da2e
   symbol_id: 0x14184fbf
   symbol_id: 0x3b425caf
+  symbol_id: 0x25a85408
   symbol_id: 0x32cae5ee
   symbol_id: 0x0651ce31
   symbol_id: 0x194db723
@@ -386778,10 +382853,12 @@ interface {
   symbol_id: 0x96242237
   symbol_id: 0x571b278c
   symbol_id: 0x3272fe14
+  symbol_id: 0xed549fd4
   symbol_id: 0x73954c59
   symbol_id: 0x0f9699eb
   symbol_id: 0x66782435
   symbol_id: 0x793a755b
+  symbol_id: 0x61ab1273
   symbol_id: 0x68e98442
   symbol_id: 0x1cf36c3c
   symbol_id: 0x9fc8421c
@@ -386790,6 +382867,7 @@ interface {
   symbol_id: 0x6642e9e1
   symbol_id: 0x4063e8a2
   symbol_id: 0x78e97bdd
+  symbol_id: 0x5da495c5
   symbol_id: 0xdc3e523b
   symbol_id: 0x3934d205
   symbol_id: 0xa603e7df
@@ -386849,6 +382927,7 @@ interface {
   symbol_id: 0xf57e37fe
   symbol_id: 0xb0b2d21a
   symbol_id: 0xd755dcd0
+  symbol_id: 0xf35fc966
   symbol_id: 0x05d29e21
   symbol_id: 0x370666f8
   symbol_id: 0xaf95f073
@@ -386859,9 +382938,11 @@ interface {
   symbol_id: 0x17314b18
   symbol_id: 0xfa2cb6b6
   symbol_id: 0xc4fae65d
+  symbol_id: 0x46252c06
   symbol_id: 0x7d656c6a
   symbol_id: 0x19abe185
   symbol_id: 0x07c1d025
+  symbol_id: 0x42083e9a
   symbol_id: 0x697b29f0
   symbol_id: 0x88860085
   symbol_id: 0x27015d04
@@ -386932,20 +383013,29 @@ interface {
   symbol_id: 0x6590f3a5
   symbol_id: 0x8e95f895
   symbol_id: 0x30438a62
+  symbol_id: 0xfb5efe2e
+  symbol_id: 0x58687602
+  symbol_id: 0xe7fb597f
+  symbol_id: 0xe6cbb47e
   symbol_id: 0x0d23e13a
   symbol_id: 0xd02d0c21
+  symbol_id: 0xe9d634b5
   symbol_id: 0x84b20708
+  symbol_id: 0xb8c4fc82
   symbol_id: 0x8fafe0a6
   symbol_id: 0x6d4f7368
   symbol_id: 0x29215b38
   symbol_id: 0x1ee037b1
   symbol_id: 0x13f409fa
+  symbol_id: 0x6dffcd52
   symbol_id: 0xe9bfa224
   symbol_id: 0x0df14bce
   symbol_id: 0xd6fc8732
+  symbol_id: 0x4fe4e1e0
   symbol_id: 0x22d09ebb
   symbol_id: 0xad69345e
   symbol_id: 0x381c401c
+  symbol_id: 0x7e6ad5ea
   symbol_id: 0xfb60a10e
   symbol_id: 0xc632b16e
   symbol_id: 0xe95b649e
@@ -386953,6 +383043,7 @@ interface {
   symbol_id: 0xaab0b041
   symbol_id: 0x5800606d
   symbol_id: 0xae69b1ad
+  symbol_id: 0xcbaf28c3
   symbol_id: 0x098b2c4d
   symbol_id: 0x008276ec
   symbol_id: 0xe9c62c61
@@ -387012,9 +383103,12 @@ interface {
   symbol_id: 0xcd6f9634
   symbol_id: 0xba7435fd
   symbol_id: 0xb59c5eaf
+  symbol_id: 0x71dad1b2
   symbol_id: 0x051c0489
+  symbol_id: 0x562c9a11
   symbol_id: 0x56d1da85
   symbol_id: 0xe74af45a
+  symbol_id: 0xaefd3622
   symbol_id: 0x3ecd46f0
   symbol_id: 0xde541a7b
   symbol_id: 0xe6e08555
@@ -387113,6 +383207,7 @@ interface {
   symbol_id: 0xb9dd1d1a
   symbol_id: 0x3d66dcb8
   symbol_id: 0x1f68a496
+  symbol_id: 0x23a5ab99
   symbol_id: 0x2a589f64
   symbol_id: 0x7da41bc7
   symbol_id: 0x795a4305
@@ -387630,22 +383725,35 @@ interface {
   symbol_id: 0x248b3536
   symbol_id: 0x950a62ac
   symbol_id: 0x8f8f2df9
+  symbol_id: 0x6b55b9d2
   symbol_id: 0xeb912db7
   symbol_id: 0x64876ecd
+  symbol_id: 0x994cfb6c
+  symbol_id: 0x8c2045ca
   symbol_id: 0xdf73207c
   symbol_id: 0xd232cbb1
+  symbol_id: 0x209bd6b9
+  symbol_id: 0x68d92b40
+  symbol_id: 0x520c06c0
   symbol_id: 0xa6eac918
   symbol_id: 0xc46f1f1f
   symbol_id: 0xf30af7b3
+  symbol_id: 0xc9a9e8ab
+  symbol_id: 0xa2b73df4
   symbol_id: 0x71f2808e
+  symbol_id: 0x246bf5fe
+  symbol_id: 0x96be3ac9
   symbol_id: 0xfa57b81b
+  symbol_id: 0x9d21209c
   symbol_id: 0x4603c1d4
   symbol_id: 0x54c09325
   symbol_id: 0xf1838f43
   symbol_id: 0x9324879f
   symbol_id: 0xcde37345
+  symbol_id: 0xcf411a0e
   symbol_id: 0xb834cd77
   symbol_id: 0x5827485d
+  symbol_id: 0xd777027b
   symbol_id: 0x23b2a72a
   symbol_id: 0xf407269f
   symbol_id: 0xe0308dad
diff --git a/android/abi_gki_aarch64_exynos b/android/abi_gki_aarch64_exynos
index 19441f4ee7d8..a3b16126c54e 100644
--- a/android/abi_gki_aarch64_exynos
+++ b/android/abi_gki_aarch64_exynos
@@ -220,6 +220,7 @@
   dma_fence_release
   dma_fence_remove_callback
   dma_fence_signal
+  dma_fence_signal_locked
   dma_fence_wait_timeout
   dma_free_attrs
   dma_heap_buffer_alloc
@@ -322,6 +323,7 @@
   enable_irq
   eth_type_trans
   fd_install
+  fget
   _find_first_bit
   _find_last_bit
   _find_next_and_bit
@@ -467,10 +469,12 @@
   kmemdup
   kobject_add
   kobject_create_and_add
+  kobject_get
   kobject_init
   kobject_init_and_add
   kobject_put
   kobject_uevent_env
+  kobj_sysfs_ops
   krealloc
   kstrdup
   kstrndup
@@ -605,6 +609,7 @@
   of_reserved_mem_lookup
   of_root
   of_thermal_get_ntrips
+  on_each_cpu_cond_mask
   panic
   panic_notifier_list
   param_array_ops
@@ -633,6 +638,7 @@
   perf_trace_run_bpf_submit
   phy_power_off
   phy_power_on
+  phy_set_mode_ext
   pinconf_generic_dt_node_to_map
   pinctrl_dev_get_drvdata
   pinctrl_lookup_state
@@ -646,6 +652,7 @@
   platform_driver_unregister
   platform_get_irq
   platform_get_irq_byname
+  platform_get_irq_byname_optional
   platform_get_resource
   platform_get_resource_byname
   __platform_register_drivers
@@ -655,6 +662,8 @@
   __pm_runtime_disable
   pm_runtime_enable
   pm_runtime_forbid
+  pm_runtime_force_resume
+  pm_runtime_force_suspend
   __pm_runtime_idle
   pm_runtime_no_callbacks
   __pm_runtime_resume
@@ -934,9 +943,11 @@
   up_write
   usb_add_function
   usb_copy_descriptors
+  usb_enable_autosuspend
   usb_ep_autoconfig
   usb_function_register
   usb_function_unregister
+  usb_hcd_is_primary_hcd
   usb_hub_find_child
   usb_interface_id
   usb_put_function_instance
@@ -1149,8 +1160,32 @@
   __tracepoint_workqueue_execute_end
   __tracepoint_workqueue_execute_start
 
+# required by dw_mmc-exynos.ko
+  mmc_wait_for_req
+
+# required by dw_mmc.ko
+  debugfs_create_x64
+  device_property_read_string_array
+  dma_map_sg_attrs
+  mmc_add_host
+  mmc_alloc_host
+  mmc_can_gpio_cd
+  mmc_detect_change
+  mmc_free_host
+  mmc_gpio_get_cd
+  mmc_gpio_get_ro
+  mmc_of_parse
+  mmc_regulator_get_supply
+  mmc_regulator_set_ocr
+  mmc_regulator_set_vqmmc
+  mmc_remove_host
+  mmc_request_done
+  sdio_signal_irq
+
 # required by dwc3-exynos-usb.ko
+  device_create_managed_software_node
   platform_device_add
+  platform_device_add_resources
   platform_device_alloc
   platform_device_del
   platform_device_put
@@ -1377,7 +1412,6 @@
   drm_crtc_enable_color_mgmt
   drm_crtc_handle_vblank
   drm_crtc_vblank_get
-  drm_dev_has_vblank
   drm_display_mode_to_videomode
   drm_edid_to_sad
   drm_format_info
@@ -1452,6 +1486,7 @@
 
 # required by exynos-hypervisor.ko
   __arm_smccc_hvc
+  kimage_vaddr
   __pkvm_load_el2_module
   __pkvm_register_el2_call
 
@@ -1472,6 +1507,17 @@
 # required by exynos-ssld.ko
   driver_register
 
+# required by exynos-usb-audio-offloading.ko
+  snd_ctl_add
+  snd_ctl_new1
+  snd_vendor_set_ops
+  __traceiter_android_rvh_audio_usb_offload_disconnect
+  __traceiter_android_vh_audio_usb_offload_connect
+  __tracepoint_android_rvh_audio_usb_offload_disconnect
+  __tracepoint_android_vh_audio_usb_offload_connect
+  usb_choose_configuration
+  usb_ifnum_to_if
+
 # required by exynos9945_sound.ko
   clk_bulk_disable
   clk_bulk_enable
@@ -1514,6 +1560,9 @@
   __tracepoint_clock_set_rate
   update_devfreq
 
+# required by exynos_esca.ko
+  debugfs_lookup
+
 # required by exynos_mct_v3.ko
   clockevents_config_and_register
   __clocksource_register_scale
@@ -1704,6 +1753,10 @@
   __traceiter_android_rvh_gic_v3_set_affinity
   __tracepoint_android_rvh_gic_v3_set_affinity
 
+# required by irq-gic-vh.ko
+  __traceiter_android_vh_gic_set_affinity
+  __tracepoint_android_vh_gic_set_affinity
+
 # required by is-actuator-ak737x.ko
   v4l2_i2c_subdev_init
 
@@ -1742,9 +1795,7 @@
 
 # required by mpam_arch.ko
   bitmap_alloc
-  kobj_sysfs_ops
   kstrtou16
-  on_each_cpu_cond_mask
 
 # required by nanohub.ko
   arch_timer_read_counter
@@ -1767,8 +1818,6 @@
   cpuidle_resume_and_unlock
   dev_pm_opp_find_freq_floor
   dma_fence_free
-  dma_fence_signal_locked
-  fget
   vsprintf
 
 # required by pablo-icpu.ko
@@ -1829,7 +1878,6 @@
   pci_generic_config_write
   pci_get_device
   pci_rescan_bus
-  platform_get_irq_byname_optional
 
 # required by pinctrl-samsung-core.ko
   fwnode_handle_put
@@ -1981,7 +2029,6 @@
   vprintk_emit
 
 # required by scsc_mx.ko
-  kobject_get
   kobject_uevent
 
 # required by scsc_platform_mif.ko
@@ -2065,6 +2112,7 @@
   backlight_device_unregister
   __bitmap_xor
   capable
+  copy_highpage
   devfreq_monitor_resume
   devfreq_monitor_start
   devfreq_monitor_stop
@@ -2165,12 +2213,15 @@
   idr_get_next
   idr_replace
   jiffies64_to_msecs
+  mark_page_accessed
   memremap
   memunmap
   mmu_notifier_synchronize
   page_pinner_inited
   __page_pinner_put_page
+  param_get_charp
   param_ops_hexint
+  param_set_charp
   pci_assign_unassigned_bus_resources
   pci_bus_resource_n
   pcie_bandwidth_available
@@ -2196,13 +2247,19 @@
   rb_first_postorder
   __rb_insert_augmented
   rb_next_postorder
+  reclaim_shmem_address_space
   request_firmware_into_buf
   seq_putc
   seq_write
+  set_page_dirty
   sg_alloc_table_from_pages_segment
+  shmem_file_setup
+  shmem_read_mapping_page_gfp
   si_meminfo
   sysfs_remove_files
+  __traceiter_android_vh_meminfo_proc_show
   __traceiter_gpu_mem_total
+  __tracepoint_android_vh_meminfo_proc_show
   __tracepoint_gpu_mem_total
   ttm_bo_eviction_valuable
   ttm_bo_init_reserved
@@ -2217,6 +2274,7 @@
   ttm_bo_put
   ttm_bo_set_bulk_move
   ttm_bo_unlock_delayed_workqueue
+  ttm_bo_unmap_virtual
   ttm_bo_unpin
   ttm_bo_validate
   ttm_bo_vm_access
@@ -2225,9 +2283,11 @@
   ttm_bo_vm_fault_reserved
   ttm_bo_vm_open
   ttm_bo_vm_reserve
+  ttm_bo_wait
   ttm_device_fini
   ttm_device_init
   ttm_eu_backoff_reservation
+  ttm_eu_fence_buffer_objects
   ttm_eu_reserve_buffers
   ttm_glob
   ttm_lru_bulk_move_tail
@@ -2392,7 +2452,7 @@
   ufshcd_dme_get_attr
   ufshcd_dme_set_attr
   ufshcd_hold
-  ufshcd_mcq_poll_cqe_nolock
+  ufshcd_mcq_poll_cqe_lock
   ufshcd_mcq_write_cqis
   ufshcd_pltfrm_init
   ufshcd_release
@@ -2416,6 +2476,25 @@
   kthread_complete_and_exit
   usb_speed_string
 
+# required by xhci-exynos-audio.ko
+  dma_pool_alloc
+  dma_pool_free
+  __kmalloc_node
+  kmalloc_node_trace
+  xhci_add_endpoint
+  xhci_address_device
+  xhci_check_trb_in_td_math
+  xhci_get_endpoint_index
+  xhci_get_ep_ctx
+  xhci_get_slot_ctx
+  xhci_initialize_ring_info
+  xhci_link_segments
+  xhci_remove_stream_mapping
+  xhci_ring_alloc
+  xhci_segment_free
+  xhci_trb_virt_to_dma
+  xhci_vendor_get_ops
+
 # required by xhci-exynos.ko
   device_property_read_u32_array
   device_set_wakeup_enable
@@ -2426,10 +2505,10 @@
   usb_add_hcd
   __usb_create_hcd
   usb_disabled
-  usb_enable_autosuspend
-  usb_hcd_is_primary_hcd
   usb_put_hcd
   usb_remove_hcd
+  xhci_bus_resume
+  xhci_bus_suspend
   xhci_gen_setup
   xhci_init_driver
   xhci_resume
@@ -2440,3 +2519,61 @@
   cpufreq_quick_get_max
   kthread_bind_mask
   stpcpy
+
+# preserved by --additions-only
+  __alloc_percpu_gfp
+  arc4_crypt
+  arc4_setkey
+  __cpu_present_mask
+  crc32_be
+  crypto_aead_decrypt
+  crypto_aead_encrypt
+  crypto_aead_setauthsize
+  crypto_aead_setkey
+  crypto_alloc_aead
+  crypto_alloc_skcipher
+  __crypto_memneq
+  crypto_shash_finup
+  crypto_shash_setkey
+  crypto_skcipher_decrypt
+  crypto_skcipher_encrypt
+  crypto_skcipher_setkey
+  __crypto_xor
+  dev_fetch_sw_netstats
+  drm_dev_has_vblank
+  eth_mac_addr
+  ethtool_op_get_link
+  get_random_u16
+  __hw_addr_init
+  __hw_addr_sync
+  __hw_addr_unsync
+  kernel_param_lock
+  kernel_param_unlock
+  kfree_skb_list_reason
+  ktime_get_seconds
+  memmove
+  netdev_info
+  netdev_set_default_ethtool_ops
+  netif_receive_skb_list
+  net_ratelimit
+  pskb_expand_head
+  ___pskb_trim
+  rhashtable_free_and_destroy
+  rhashtable_insert_slow
+  rhltable_init
+  __rht_bucket_nested
+  rht_bucket_nested
+  rht_bucket_nested_insert
+  round_jiffies
+  round_jiffies_relative
+  round_jiffies_up
+  sg_init_one
+  skb_checksum_help
+  skb_clone_sk
+  skb_complete_wifi_ack
+  skb_ensure_writable
+  __skb_get_hash
+  __skb_gso_segment
+  tasklet_unlock_wait
+  ufshcd_mcq_poll_cqe_nolock
+  unregister_netdevice_many
diff --git a/android/abi_gki_aarch64_exynosauto b/android/abi_gki_aarch64_exynosauto
new file mode 100644
index 000000000000..da26fd1faca5
--- /dev/null
+++ b/android/abi_gki_aarch64_exynosauto
@@ -0,0 +1,156 @@
+[abi_symbol_list]
+# commonly used symbols
+  clk_prepare
+  clk_unprepare
+  _dev_err
+  _dev_info
+  devm_kmalloc
+  devm_request_threaded_irq
+  _dev_warn
+  dma_set_coherent_mask
+  dma_set_mask
+  kfree
+  kmalloc_caches
+  kmalloc_trace
+  __list_add_valid
+  log_post_read_mmio
+  log_post_write_mmio
+  log_read_mmio
+  log_write_mmio
+  module_layout
+  of_find_property
+  of_property_read_variable_u32_array
+  __platform_driver_register
+  _printk
+  __put_task_struct
+  _raw_spin_lock_irqsave
+  _raw_spin_unlock_irqrestore
+  snprintf
+  __stack_chk_fail
+
+# required by exynos-chipid_v2.ko
+  kasprintf
+  of_device_is_available
+  of_find_matching_node_and_match
+  of_find_node_opts_by_path
+  of_iomap
+  of_property_read_string
+  soc_device_register
+  subsys_system_register
+
+# required by exynos_tty.ko
+  atomic_notifier_chain_register
+  clk_disable
+  clk_enable
+  clk_get_rate
+  clk_set_rate
+  __const_udelay
+  dev_driver_string
+  device_create_file
+  devm_clk_get
+  devm_ioremap
+  devm_kfree
+  devm_pinctrl_get
+  disable_irq_nosync
+  dma_get_slave_caps
+  dma_map_page_attrs
+  dma_release_channel
+  dma_request_chan
+  dma_sync_single_for_cpu
+  dma_sync_single_for_device
+  dma_unmap_page_attrs
+  do_SAK
+  enable_irq
+  free_irq
+  gic_nonsecure_priorities
+  handle_sysrq
+  iomem_resource
+  is_vmalloc_addr
+  jiffies
+  kmalloc_large
+  of_alias_get_id
+  of_get_property
+  of_match_node
+  oops_in_progress
+  panic_notifier_list
+  pinctrl_lookup_state
+  pinctrl_select_state
+  platform_driver_unregister
+  platform_get_irq
+  platform_get_resource
+  _raw_spin_trylock
+  register_console
+  regmap_read
+  regmap_update_bits_base
+  __release_region
+  __request_region
+  request_threaded_irq
+  sched_clock
+  sg_init_table
+  sscanf
+  syscon_regmap_lookup_by_phandle
+  sysrq_mask
+  tty_flip_buffer_push
+  tty_insert_flip_string_fixed_flag
+  tty_kref_put
+  tty_port_tty_get
+  uart_add_one_port
+  uart_console_write
+  uart_get_baud_rate
+  uart_parse_options
+  uart_register_driver
+  uart_remove_one_port
+  uart_resume_port
+  uart_set_options
+  uart_suspend_port
+  uart_try_toggle_sysrq
+  uart_unregister_driver
+  uart_update_timeout
+  uart_write_wakeup
+  __warn_printk
+
+# required by pl330.ko
+  alt_cb_patch_nops
+  amba_driver_register
+  amba_driver_unregister
+  debugfs_create_file
+  dev_err_probe
+  devm_free_irq
+  devm_ioremap_resource
+  __devm_reset_control_get
+  dma_alloc_attrs
+  dma_async_device_register
+  dma_async_device_unregister
+  dma_async_tx_descriptor_init
+  dmaengine_unmap_put
+  dma_free_attrs
+  dma_get_slave_channel
+  dma_map_resource
+  dma_unmap_resource
+  __kmalloc
+  ktime_get_mono_fast_ns
+  __list_del_entry_valid
+  loops_per_jiffy
+  of_dma_controller_free
+  of_dma_controller_register
+  pm_runtime_force_resume
+  pm_runtime_force_suspend
+  pm_runtime_irq_safe
+  __pm_runtime_resume
+  pm_runtime_set_autosuspend_delay
+  __pm_runtime_suspend
+  __pm_runtime_use_autosuspend
+  _raw_spin_lock
+  _raw_spin_unlock
+  reset_control_assert
+  reset_control_deassert
+  seq_lseek
+  seq_printf
+  seq_puts
+  seq_read
+  sg_next
+  single_open
+  single_release
+  tasklet_kill
+  __tasklet_schedule
+  tasklet_setup
diff --git a/android/abi_gki_aarch64_galaxy b/android/abi_gki_aarch64_galaxy
index 76989b7b20b3..ebe4fa10620a 100644
--- a/android/abi_gki_aarch64_galaxy
+++ b/android/abi_gki_aarch64_galaxy
@@ -62,6 +62,7 @@
   _dev_info
   __devm_alloc_percpu
   devm_bitmap_zalloc
+  devm_clk_get_optional_enabled
   devm_gen_pool_create
   devm_gpiod_get_index
   devm_ioremap
@@ -77,6 +78,7 @@
   dma_alloc_attrs
   dma_free_attrs
   down_write
+  dummy_irq_chip
   elevator_alloc
   elv_bio_merge_ok
   elv_rb_add
@@ -129,6 +131,7 @@
   I_BDEV
   iio_channel_get
   iio_channel_release
+  iio_read_channel_raw
   init_task
   init_timer_key
   input_close_device
@@ -140,6 +143,8 @@
   ioremap_prot
   iounmap
   iov_iter_kvec
+  __irq_domain_alloc_fwnode
+  irq_domain_free_fwnode
   jiffies
   kasan_flag_enabled
   kasprintf
@@ -218,12 +223,16 @@
   param_ops_ullong
   param_set_uint
   __per_cpu_offset
+  phy_connect_direct
+  phy_find_first
+  phy_get_pause
   phy_resolve_aneg_linkmode
   phy_start_aneg
   pinctrl_get
   pinctrl_put
   __platform_driver_register
   platform_driver_unregister
+  platform_get_ethdev_address
   preempt_schedule
   print_hex_dump
   _printk
@@ -311,8 +320,10 @@
   __traceiter_android_vh_is_fpsimd_save
   __traceiter_android_vh_madvise_pageout_swap_entry
   __traceiter_android_vh_madvise_swapin_walk_pmd_entry
+  __traceiter_android_vh_meminfo_cache_adjust
   __traceiter_android_vh_mutex_wait_finish
   __traceiter_android_vh_mutex_wait_start
+  __traceiter_android_vh_process_madvise_end
   __traceiter_android_vh_ptype_head
   __traceiter_android_vh_rtmutex_wait_finish
   __traceiter_android_vh_rtmutex_wait_start
@@ -320,16 +331,14 @@
   __traceiter_android_vh_rwsem_read_wait_start
   __traceiter_android_vh_rwsem_write_wait_finish
   __traceiter_android_vh_rwsem_write_wait_start
-  __traceiter_android_vh_process_madvise_end
   __traceiter_android_vh_sched_show_task
   __traceiter_android_vh_show_smap
+  __traceiter_android_vh_si_mem_available_adjust
+  __traceiter_android_vh_si_meminfo_adjust
   __traceiter_android_vh_smaps_pte_entry
   __traceiter_android_vh_try_to_freeze_todo
   __traceiter_android_vh_try_to_freeze_todo_unfrozen
   __traceiter_android_vh_watchdog_timer_softlockup
-  __traceiter_android_vh_meminfo_cache_adjust
-  __traceiter_android_vh_si_mem_available_adjust
-  __traceiter_android_vh_si_meminfo_adjust
   __traceiter_block_rq_insert
   __traceiter_console
   __traceiter_hrtimer_expire_entry
@@ -352,8 +361,10 @@
   __tracepoint_android_vh_is_fpsimd_save
   __tracepoint_android_vh_madvise_pageout_swap_entry
   __tracepoint_android_vh_madvise_swapin_walk_pmd_entry
+  __tracepoint_android_vh_meminfo_cache_adjust
   __tracepoint_android_vh_mutex_wait_finish
   __tracepoint_android_vh_mutex_wait_start
+  __tracepoint_android_vh_process_madvise_end
   __tracepoint_android_vh_ptype_head
   __tracepoint_android_vh_rtmutex_wait_finish
   __tracepoint_android_vh_rtmutex_wait_start
@@ -361,16 +372,14 @@
   __tracepoint_android_vh_rwsem_read_wait_start
   __tracepoint_android_vh_rwsem_write_wait_finish
   __tracepoint_android_vh_rwsem_write_wait_start
-  __tracepoint_android_vh_process_madvise_end
   __tracepoint_android_vh_sched_show_task
   __tracepoint_android_vh_show_smap
+  __tracepoint_android_vh_si_mem_available_adjust
+  __tracepoint_android_vh_si_meminfo_adjust
   __tracepoint_android_vh_smaps_pte_entry
   __tracepoint_android_vh_try_to_freeze_todo
   __tracepoint_android_vh_try_to_freeze_todo_unfrozen
   __tracepoint_android_vh_watchdog_timer_softlockup
-  __tracepoint_android_vh_meminfo_cache_adjust
-  __tracepoint_android_vh_si_mem_available_adjust
-  __tracepoint_android_vh_si_meminfo_adjust
   __tracepoint_block_rq_insert
   __tracepoint_console
   __tracepoint_hrtimer_expire_entry
diff --git a/android/abi_gki_aarch64_mtk b/android/abi_gki_aarch64_mtk
index f3af0c1114ba..e3872c033f45 100644
--- a/android/abi_gki_aarch64_mtk
+++ b/android/abi_gki_aarch64_mtk
@@ -98,10 +98,10 @@
   blocking_notifier_call_chain
   blocking_notifier_chain_register
   blocking_notifier_chain_unregister
+  bpf_trace_run1
   bpf_trace_run10
   bpf_trace_run11
   bpf_trace_run12
-  bpf_trace_run1
   bpf_trace_run2
   bpf_trace_run3
   bpf_trace_run4
@@ -690,8 +690,11 @@
   drm_atomic_helper_commit_modeset_disables
   drm_atomic_helper_commit_modeset_enables
   drm_atomic_helper_commit_planes
+  __drm_atomic_helper_connector_destroy_state
   drm_atomic_helper_connector_destroy_state
+  __drm_atomic_helper_connector_duplicate_state
   drm_atomic_helper_connector_duplicate_state
+  __drm_atomic_helper_connector_reset
   drm_atomic_helper_connector_reset
   __drm_atomic_helper_crtc_destroy_state
   __drm_atomic_helper_crtc_duplicate_state
@@ -1089,6 +1092,7 @@
   ida_destroy
   ida_free
   idr_alloc
+  idr_alloc_cyclic
   idr_alloc_u32
   idr_destroy
   idr_find
@@ -1180,6 +1184,7 @@
   iommu_report_device_fault
   iommu_unmap
   ioremap_prot
+  io_schedule_timeout
   iounmap
   iov_iter_init
   iov_iter_kvec
@@ -1235,9 +1240,9 @@
   is_vmalloc_addr
   iterate_dir
   iterate_fd
+  jiffies
   jiffies_64_to_clock_t
   jiffies64_to_nsecs
-  jiffies
   jiffies_to_msecs
   jiffies_to_usecs
   kasan_flag_enabled
@@ -1430,8 +1435,8 @@
   memremap
   memscan
   mem_section
-  memset64
   memset
+  memset64
   __memset_io
   memstart_addr
   memunmap
@@ -1563,8 +1568,8 @@
   nla_find
   nla_memcpy
   __nla_parse
-  nla_put_64bit
   nla_put
+  nla_put_64bit
   nla_put_nohdr
   nla_reserve
   nla_strscpy
@@ -1687,6 +1692,8 @@
   out_of_line_wait_on_bit_timeout
   overflowuid
   page_endio
+  page_pinner_inited
+  __page_pinner_put_page
   page_pool_alloc_pages
   page_pool_create
   page_pool_destroy
@@ -1856,6 +1863,7 @@
   pm_runtime_force_suspend
   pm_runtime_get_if_active
   __pm_runtime_idle
+  pm_runtime_irq_safe
   __pm_runtime_resume
   pm_runtime_set_autosuspend_delay
   __pm_runtime_set_status
@@ -2061,6 +2069,7 @@
   remove_proc_subtree
   remove_wait_queue
   request_firmware
+  request_firmware_direct
   request_firmware_nowait
   __request_module
   __request_percpu_irq
@@ -2123,6 +2132,7 @@
   rtnl_unregister
   rtnl_unregister_all
   runqueues
+  sbitmap_weight
   sched_clock
   sched_clock_register
   sched_feat_keys
@@ -2145,11 +2155,13 @@
   scnprintf
   scsi_autopm_get_device
   scsi_autopm_put_device
+  scsi_block_requests
   scsi_device_get
   scsi_device_put
   scsi_execute_cmd
   __scsi_iterate_devices
   scsi_print_sense_hdr
+  scsi_unblock_requests
   sdio_claim_host
   sdio_claim_irq
   sdio_disable_func
@@ -2283,6 +2295,7 @@
   skb_try_coalesce
   skb_tstamp_tx
   skb_unlink
+  sk_capable
   sk_common_release
   sk_error_report
   sk_filter_trim_cap
@@ -2501,6 +2514,7 @@
   tasklist_lock
   __task_pid_nr_ns
   __task_rq_lock
+  task_rq_lock
   thermal_cooling_device_unregister
   thermal_of_cooling_device_register
   thermal_pressure
@@ -2576,6 +2590,7 @@
   __traceiter_android_rvh_tick_entry
   __traceiter_android_rvh_try_to_wake_up
   __traceiter_android_rvh_try_to_wake_up_success
+  __traceiter_android_rvh_uclamp_eff_get
   __traceiter_android_rvh_update_cpu_capacity
   __traceiter_android_rvh_wake_up_new_task
   __traceiter_android_vh_alter_futex_plist_add
@@ -2670,6 +2685,7 @@
   __tracepoint_android_rvh_tick_entry
   __tracepoint_android_rvh_try_to_wake_up
   __tracepoint_android_rvh_try_to_wake_up_success
+  __tracepoint_android_rvh_uclamp_eff_get
   __tracepoint_android_rvh_update_cpu_capacity
   __tracepoint_android_rvh_wake_up_new_task
   __tracepoint_android_vh_alter_futex_plist_add
@@ -2801,6 +2817,7 @@
   udp_tunnel6_xmit_skb
   udp_tunnel_sock_release
   udp_tunnel_xmit_skb
+  ufshcd_config_pwr_mode
   ufshcd_delay_us
   ufshcd_dme_configure_adapt
   ufshcd_dme_get_attr
@@ -2810,14 +2827,19 @@
   ufshcd_get_pwr_dev_param
   ufshcd_hba_enable
   ufshcd_hba_stop
+  ufshcd_hold
   ufshcd_init_pwr_dev_param
   ufshcd_link_recovery
   ufshcd_make_hba_operational
+  ufshcd_mcq_config_mac
+  ufshcd_mcq_make_queues_operational
+  ufshcd_mcq_read_cqis
   ufshcd_pltfrm_init
   ufshcd_query_attr
   ufshcd_query_descriptor_retry
   ufshcd_query_flag
   ufshcd_read_desc_param
+  ufshcd_release
   ufshcd_remove
   ufshcd_resume_complete
   ufshcd_runtime_resume
diff --git a/android/abi_gki_aarch64_oplus b/android/abi_gki_aarch64_oplus
index a5812def9b5b..e06e98d72020 100644
--- a/android/abi_gki_aarch64_oplus
+++ b/android/abi_gki_aarch64_oplus
@@ -8,6 +8,7 @@
   blk_rq_map_user
   blk_rq_map_user_iov
   blk_start_plug
+  cgroup_add_dfl_cftypes
   cgroup_add_legacy_cftypes
   console_printk
   cpufreq_frequency_table_get_index
diff --git a/android/abi_gki_aarch64_pixel b/android/abi_gki_aarch64_pixel
index 06d7a6c7e801..73ea56df4c25 100644
--- a/android/abi_gki_aarch64_pixel
+++ b/android/abi_gki_aarch64_pixel
@@ -11,6 +11,7 @@
   alarm_try_to_cancel
   alloc_chrdev_region
   alloc_etherdev_mqs
+  alloc_iova_fast
   alloc_netdev_mqs
   __alloc_pages
   alloc_pages_exact
@@ -770,6 +771,7 @@
   frame_vector_create
   frame_vector_destroy
   frame_vector_to_pages
+  free_iova_fast
   free_irq
   free_netdev
   __free_pages
@@ -800,11 +802,13 @@
   gen_pool_add_owner
   gen_pool_alloc_algo_owner
   gen_pool_avail
+  gen_pool_best_fit
   gen_pool_create
   gen_pool_destroy
   gen_pool_first_fit_align
   gen_pool_free_owner
   gen_pool_has_addr
+  gen_pool_set_algo
   gen_pool_size
   get_cpu_device
   get_cpu_idle_time
@@ -921,6 +925,7 @@
   inc_zone_page_state
   inet_csk_get_port
   init_dummy_netdev
+  init_iova_domain
   init_net
   init_pid_ns
   __init_rwsem
@@ -990,6 +995,7 @@
   io_schedule
   io_schedule_timeout
   iounmap
+  iova_domain_init_rcaches
   ip_compute_csum
   ip_send_check
   __irq_alloc_descs
@@ -1492,6 +1498,7 @@
   ___pskb_trim
   put_device
   put_disk
+  put_iova_domain
   __put_net
   put_pid
   put_sg_io_hdr
@@ -1959,6 +1966,8 @@
   topology_update_thermal_pressure
   _totalram_pages
   touch_softlockup_watchdog
+  __trace_bprintk
+  __trace_bputs
   trace_event_buffer_commit
   trace_event_buffer_reserve
   trace_event_printf
diff --git a/android/abi_gki_aarch64_qcom b/android/abi_gki_aarch64_qcom
index 6a43499fb225..df8f0db3cc5c 100644
--- a/android/abi_gki_aarch64_qcom
+++ b/android/abi_gki_aarch64_qcom
@@ -951,6 +951,7 @@
   drm_gem_object_init
   drm_gem_object_lookup
   drm_gem_object_release
+  drm_gem_prime_export
   drm_gem_prime_fd_to_handle
   drm_gem_prime_handle_to_fd
   drm_gem_private_object_init
@@ -1018,6 +1019,7 @@
   drm_panel_remove
   drm_plane_cleanup
   drm_plane_create_rotation_property
+  drm_plane_from_index
   drm_poll
   drm_prime_gem_destroy
   drm_prime_pages_to_sg
@@ -1147,6 +1149,7 @@
   fwnode_get_name
   fwnode_get_named_child_node
   fwnode_get_next_child_node
+  fwnode_get_phy_node
   fwnode_handle_get
   fwnode_handle_put
   fwnode_property_present
@@ -1234,10 +1237,10 @@
   gh_rm_notifier_unregister
   gh_rm_register_platform_ops
   gh_rm_unregister_platform_ops
+  gic_nonsecure_priorities
   gic_v3_cpu_init
   gic_v3_dist_init
   gic_v3_dist_wait_for_rwp
-  gic_nonsecure_priorities
   gov_attr_set_init
   gov_attr_set_put
   governor_sysfs_ops
@@ -1541,6 +1544,7 @@
   iommu_group_set_iommudata
   iommu_iova_to_phys
   iommu_map
+  iommu_map_atomic
   iommu_map_sg
   iommu_present
   iommu_put_resv_regions
@@ -2311,6 +2315,7 @@
   phylink_ethtool_set_eee
   phylink_ethtool_set_pauseparam
   phylink_ethtool_set_wol
+  phylink_expects_phy
   phylink_fwnode_phy_connect
   phylink_generic_validate
   phylink_get_eee_err
@@ -3335,12 +3340,12 @@
   __traceiter_android_vh_binder_set_priority
   __traceiter_android_vh_binder_wakeup_ilocked
   __traceiter_android_vh_build_sched_domains
+  __traceiter_android_vh_check_hibernation_swap
   __traceiter_android_vh_check_uninterrupt_tasks
   __traceiter_android_vh_check_uninterrupt_tasks_done
   __traceiter_android_vh_cpufreq_fast_switch
   __traceiter_android_vh_cpufreq_resolve_freq
   __traceiter_android_vh_cpufreq_target
-  __traceiter_android_vh_check_hibernation_swap
   __traceiter_android_vh_cpu_idle_enter
   __traceiter_android_vh_cpu_idle_exit
   __traceiter_android_vh_cpuidle_psci_enter
@@ -3348,20 +3353,20 @@
   __traceiter_android_vh_disable_thermal_cooling_stats
   __traceiter_android_vh_do_wake_up_sync
   __traceiter_android_vh_dump_throttled_rt_tasks
-  __traceiter_android_vh_free_task
   __traceiter_android_vh_encrypt_page
+  __traceiter_android_vh_free_task
   __traceiter_android_vh_ftrace_dump_buffer
   __traceiter_android_vh_ftrace_format_check
   __traceiter_android_vh_ftrace_oops_enter
   __traceiter_android_vh_ftrace_oops_exit
   __traceiter_android_vh_ftrace_size_check
-  __traceiter_android_vh_ignore_dmabuf_vmap_bounds
   __traceiter_android_vh_gic_v3_suspend
+  __traceiter_android_vh_ignore_dmabuf_vmap_bounds
+  __traceiter_android_vh_init_aes_encrypt
   __traceiter_android_vh_ipi_stop
   __traceiter_android_vh_jiffies_update
   __traceiter_android_vh_kswapd_per_node
   __traceiter_android_vh_mpam_set
-  __traceiter_android_vh_init_aes_encrypt
   __traceiter_android_vh_post_image_save
   __traceiter_android_vh_printk_hotplug
   __traceiter_android_vh_rproc_recovery
@@ -3478,12 +3483,12 @@
   __tracepoint_android_vh_binder_set_priority
   __tracepoint_android_vh_binder_wakeup_ilocked
   __tracepoint_android_vh_build_sched_domains
+  __tracepoint_android_vh_check_hibernation_swap
   __tracepoint_android_vh_check_uninterrupt_tasks
   __tracepoint_android_vh_check_uninterrupt_tasks_done
   __tracepoint_android_vh_cpufreq_fast_switch
   __tracepoint_android_vh_cpufreq_resolve_freq
   __tracepoint_android_vh_cpufreq_target
-  __tracepoint_android_vh_check_hibernation_swap
   __tracepoint_android_vh_cpu_idle_enter
   __tracepoint_android_vh_cpu_idle_exit
   __tracepoint_android_vh_cpuidle_psci_enter
@@ -3491,20 +3496,20 @@
   __tracepoint_android_vh_disable_thermal_cooling_stats
   __tracepoint_android_vh_do_wake_up_sync
   __tracepoint_android_vh_dump_throttled_rt_tasks
-  __tracepoint_android_vh_free_task
   __tracepoint_android_vh_encrypt_page
+  __tracepoint_android_vh_free_task
   __tracepoint_android_vh_ftrace_dump_buffer
   __tracepoint_android_vh_ftrace_format_check
   __tracepoint_android_vh_ftrace_oops_enter
   __tracepoint_android_vh_ftrace_oops_exit
   __tracepoint_android_vh_ftrace_size_check
-  __tracepoint_android_vh_ignore_dmabuf_vmap_bounds
   __tracepoint_android_vh_gic_v3_suspend
+  __tracepoint_android_vh_ignore_dmabuf_vmap_bounds
+  __tracepoint_android_vh_init_aes_encrypt
   __tracepoint_android_vh_ipi_stop
   __tracepoint_android_vh_jiffies_update
   __tracepoint_android_vh_kswapd_per_node
   __tracepoint_android_vh_mpam_set
-  __tracepoint_android_vh_init_aes_encrypt
   __tracepoint_android_vh_post_image_save
   __tracepoint_android_vh_printk_hotplug
   __tracepoint_android_vh_rproc_recovery
diff --git a/android/abi_gki_aarch64_unisoc b/android/abi_gki_aarch64_unisoc
index f2724b1aa984..bb8ad74d357d 100644
--- a/android/abi_gki_aarch64_unisoc
+++ b/android/abi_gki_aarch64_unisoc
@@ -1,5 +1,6 @@
 [abi_symbol_list]
 # commonly used symbols
+  access_process_vm
   add_cpu
   add_wait_queue
   add_wait_queue_exclusive
@@ -14,6 +15,8 @@
   __alloc_skb
   alloc_workqueue
   alt_cb_patch_nops
+  android_debug_per_cpu_symbol
+  android_debug_symbol
   arch_freq_scale
   __arch_copy_from_user
   __arch_copy_to_user
@@ -171,6 +174,7 @@
   dma_unmap_page_attrs
   do_trace_netlink_extack
   double_rq_lock
+  down
   down_read
   down_write
   driver_unregister
@@ -181,6 +185,7 @@
   __dynamic_dev_dbg
   __dynamic_netdev_dbg
   __dynamic_pr_debug
+  inet_proto_csum_replace4
   init_task
   enable_irq
   eth_mac_addr
@@ -191,7 +196,10 @@
   eth_type_trans
   eth_validate_addr
   extcon_get_state
+  filp_open_block
+  find_get_pid
   _find_next_bit
+  find_task_by_vpid
   finish_wait
   flush_delayed_work
   flush_work
@@ -217,6 +225,7 @@
   get_device
   __get_free_pages
   get_random_bytes
+  get_zeroed_page
   gic_nonsecure_priorities
   gpiochip_disable_irq
   gpiochip_enable_irq
@@ -286,6 +295,10 @@
   kmem_cache_destroy
   kmem_cache_free
   kmemdup
+  kmsg_dump_get_buffer
+  kmsg_dump_register
+  kmsg_dump_rewind
+  kmsg_dump_unregister
   kobject_uevent
   kobject_uevent_env
   ksoftirqd
@@ -310,11 +323,13 @@
   log_post_write_mmio
   log_read_mmio
   log_write_mmio
+  mas_find
   mbox_chan_received_data
   mbox_chan_txdone
   memcpy
   memmove
   memset
+  mem_section
   memstart_addr
   migrate_swap
   misc_deregister
@@ -354,12 +369,15 @@
   netlink_unicast
   net_ratelimit
   nf_conntrack_destroy
+  nf_conntrack_find_get
+  nf_ct_destroy
   nla_memcpy
   __nla_parse
   nla_put
   nla_put_64bit
   nla_strscpy
   __nlmsg_put
+  node_states
   noop_llseek
   nr_cpu_ids
   ns_capable
@@ -437,9 +455,11 @@
   __pskb_copy_fclone
   pskb_expand_head
   __pskb_pull_tail
+  pskb_trim_rcsum_slow
   put_cmsg
   put_device
   __put_net
+  put_pid
   __put_task_struct
   queue_delayed_work_on
   queue_work_on
@@ -498,6 +518,7 @@
   request_threaded_irq
   return_address
   root_task_group
+  rt6_lookup
   rtc_time64_to_tm
   rtnl_is_locked
   rtnl_link_register
@@ -513,6 +534,7 @@
   scnprintf
   security_sk_clone
   security_sock_graft
+  send_sig_info
   seq_buf_printf
   seq_lseek
   seq_printf
@@ -688,6 +710,7 @@
   __traceiter_android_vh_cpufreq_target
   __traceiter_android_vh_cpu_idle_enter
   __traceiter_android_vh_cpu_idle_exit
+  __traceiter_android_vh_enable_thermal_power_throttle
   __traceiter_android_vh_get_thermal_zone_device
   __traceiter_android_vh_modify_thermal_request_freq
   __traceiter_android_vh_modify_thermal_target_freq
@@ -765,6 +788,7 @@
   __tracepoint_android_vh_cpufreq_target
   __tracepoint_android_vh_cpu_idle_enter
   __tracepoint_android_vh_cpu_idle_exit
+  __tracepoint_android_vh_enable_thermal_power_throttle
   __tracepoint_android_vh_get_thermal_zone_device
   __tracepoint_android_vh_modify_thermal_request_freq
   __tracepoint_android_vh_modify_thermal_target_freq
@@ -819,6 +843,7 @@
   unregister_pernet_device
   unregister_pernet_subsys
   unregister_pm_notifier
+  up
   up_read
   up_write
   update_rq_clock
@@ -1204,6 +1229,17 @@
   sock_common_recvmsg
   sock_common_setsockopt
 
+# required by ims_bridge.ko
+  icmp6_send
+  inet_select_addr
+  ip6_find_1stfragopt
+  ip6_route_output_flags
+  ipv6_dev_get_saddr
+  ipv6_select_ident
+  nf_ct_get_tuplepr
+  nf_ct_invert_tuple
+  xfrm_state_afinfo_get_rcu
+
 # required by kfifo_buf.ko
   devres_add
   __devres_alloc_node
@@ -1444,6 +1480,9 @@
   power_supply_put
   power_supply_temp2resist_simple
 
+# required by sc27xx_pd.ko
+  devm_extcon_register_notifier_all
+
 # required by sc27xx_typec.ko
   devm_extcon_dev_allocate
   devm_extcon_dev_register
@@ -1543,6 +1582,9 @@
   kthread_queue_work
   kthread_worker_fn
 
+# required by sprd-charger-manager.ko
+  orderly_poweroff
+
 # required by sprd-dma.ko
   dma_async_device_register
   dma_async_device_unregister
@@ -1651,6 +1693,30 @@
   dev_pm_opp_add
   update_devfreq
 
+# required by sprd_tcpm.ko
+  typec_altmode_attention
+  typec_altmode_notify
+  typec_altmode_update_active
+  typec_altmode_vdm
+  typec_find_power_role
+  typec_match_altmode
+  typec_partner_register_altmode
+  typec_port_register_altmode
+  typec_set_mode
+  typec_unregister_altmode
+
+# required by sprd_thermal_ctl.ko
+  cpufreq_quick_get_max
+  devfreq_cooling_em_register
+  devfreq_cooling_unregister
+
+# required by sprd_soc_thm.ko
+  thermal_of_zone_unregister
+  thermal_zone_bind_cooling_device
+  thermal_zone_device_register_with_trips
+  thermal_zone_device_update
+  thermal_zone_unbind_cooling_device
+
 # required by sprd_hwspinlock.ko
   devm_hwspin_lock_register
 
@@ -1796,6 +1862,7 @@
   sk_stop_timer
   sock_recvmsg
   sock_rfree
+  strcasecmp
   strchr
   strrchr
   sysctl_vals
diff --git a/android/abi_gki_aarch64_vivo b/android/abi_gki_aarch64_vivo
index 934892f00111..69d634eb4fa5 100644
--- a/android/abi_gki_aarch64_vivo
+++ b/android/abi_gki_aarch64_vivo
@@ -164,6 +164,7 @@
   __kfifo_to_user
   __kfifo_to_user_r
   __kmalloc
+  __kmalloc_node
   __kmalloc_node_track_caller
   __kthread_init_worker
   __list_add_valid
@@ -240,6 +241,7 @@
   __reset_control_get
   __rht_bucket_nested
   __rt_mutex_init
+  __sbitmap_queue_get
   __scsi_add_device
   __scsi_iterate_devices
   __scsi_print_sense
@@ -430,6 +432,7 @@
   __traceiter_android_vh_update_topology_flags_workfn
   __traceiter_android_vh_watchdog_timer_softlockup
   __traceiter_binder_transaction_received
+  __traceiter_block_rq_insert
   __traceiter_clock_set_rate
   __traceiter_console
   __traceiter_cpu_frequency_limits
@@ -598,6 +601,7 @@
   __tracepoint_android_vh_update_topology_flags_workfn
   __tracepoint_android_vh_watchdog_timer_softlockup
   __tracepoint_binder_transaction_received
+  __tracepoint_block_rq_insert
   __tracepoint_clock_set_rate
   __tracepoint_console
   __tracepoint_cpu_frequency_limits
@@ -798,12 +802,14 @@
   bitmap_release_region
   bitmap_to_arr32
   bitmap_zalloc
+  blk_bio_list_merge
   blk_execute_rq
   blk_execute_rq_nowait
   blk_mq_alloc_request
   blk_mq_alloc_sq_tag_set
   blk_mq_alloc_tag_set
   blk_mq_complete_request
+  blk_mq_debugfs_rq_show
   blk_mq_end_request
   blk_mq_end_request_batch
   blk_mq_free_request
@@ -814,6 +820,7 @@
   blk_mq_quiesce_queue
   blk_mq_requeue_request
   blk_mq_rq_cpu
+  blk_mq_run_hw_queue
   blk_mq_start_request
   blk_mq_start_stopped_hw_queues
   blk_mq_stop_hw_queue
@@ -843,6 +850,8 @@
   blk_rq_map_user_io
   blk_rq_map_user_iov
   blk_rq_unmap_user
+  blk_stat_disable_accounting
+  blk_stat_enable_accounting
   blk_status_to_errno
   blk_update_request
   blkdev_get_by_dev
@@ -1986,6 +1995,9 @@
   edac_device_free_ctl_info
   edac_device_handle_ce_count
   edac_device_handle_ue_count
+  elv_register
+  elv_unregister
+  elevator_alloc
   em_cpu_get
   emergency_restart
   enable_irq
@@ -3832,6 +3844,15 @@
   safe_candev_priv
   sampling_rate_store
   sb800_prefetch
+  sbitmap_add_wait_queue
+  sbitmap_any_bit_set
+  sbitmap_del_wait_queue
+  sbitmap_init_node
+  sbitmap_queue_clear
+  sbitmap_queue_init_node
+  sbitmap_queue_min_shallow_depth
+  sbitmap_queue_resize
+  sbitmap_queue_show
   scatterwalk_ffwd
   scatterwalk_map_and_copy
   sched_clock
@@ -3924,6 +3945,8 @@
   seq_hex_dump
   seq_hlist_next
   seq_hlist_start_head
+  seq_list_next
+  seq_list_start
   seq_lseek
   seq_open
   seq_printf
@@ -4419,6 +4442,7 @@
   timecounter_cyc2time
   timecounter_init
   timecounter_read
+  timer_reduce
   timer_unstable_counter_workaround
   timespec64_to_jiffies
   tipc_dump_done
diff --git a/android/abi_gki_aarch64_xiaomi b/android/abi_gki_aarch64_xiaomi
index 0435b3d6b107..b0e34e78b178 100644
--- a/android/abi_gki_aarch64_xiaomi
+++ b/android/abi_gki_aarch64_xiaomi
@@ -144,6 +144,9 @@
   sbitmap_weight
   scsi_done
   scsi_remove_device
+  param_get_bool
+  blk_mq_unique_tag
+  param_set_uint_minmax
 
 #required by mi_sched.ko
   __traceiter_android_vh_scheduler_tick
@@ -186,6 +189,34 @@
   io_cgrp_subsys_on_dfl_key
   ioc_lookup_icq
   bdi_dev_name
+  blk_mq_run_hw_queues
+  blkcg_policy_register
+  elv_register
+  blkcg_policy_unregister
+  elv_rb_former_request
+  elv_rb_latter_request
+  elevator_alloc
+  blk_stat_enable_accounting
+  blkcg_deactivate_policy
+  blk_stat_disable_accounting
+  sbitmap_queue_min_shallow_depth
+  blk_mq_sched_try_merge
+  elv_bio_merge_ok
+  elv_rb_find
+  elv_rb_del
+  elv_rb_add
+  elv_rqhash_del
+  ioc_find_get_icq
+  put_io_context
+  blk_mq_sched_try_insert_merge
+  elv_unregister
+  __tracepoint_block_rq_insert
+  elv_rqhash_add
+  __traceiter_block_rq_insert
+  kmem_cache_alloc_node
+  bio_associate_blkg_from_css
+  kernfs_path_from_node
+  blkcg_activate_policy
 
 #required by metis.ko module
   __traceiter_android_vh_rwsem_read_wait_start
@@ -205,6 +236,7 @@
   __tracepoint_android_rvh_set_cpus_allowed_comm
   __tracepoint_android_rvh_dequeue_task
   cpuset_cpus_allowed
+  cpufreq_update_policy
 
 #required by millet.ko
   __traceiter_android_vh_binder_wait_for_work
@@ -231,6 +263,9 @@
 #required by touch module
   power_supply_is_system_supplied
 
+#required by mi-power.ko
+  class_create_file_ns
+
 #required by mi_mempool.ko
   __traceiter_android_vh_alloc_pages_reclaim_bypass
   __traceiter_android_vh_alloc_pages_failure_bypass
@@ -255,3 +290,19 @@
   tty_port_close_start
   tty_port_lower_dtr_rts
   tty_port_close_end
+
+#required by mtdoops.ko
+  of_node_name_prefix
+  bdi_unregister
+
+#required by dispaly.ko
+  mipi_dsi_dcs_set_display_off
+
+#required by debug_ext.ko
+  of_find_all_nodes
+
+# required by mi_mem_center.ko
+  __traceiter_android_vh_rmqueue_smallest_bypass
+  __tracepoint_android_vh_rmqueue_smallest_bypass
+  __traceiter_android_vh_free_one_page_bypass
+  __tracepoint_android_vh_free_one_page_bypass
diff --git a/android/abi_gki_protected_exports_aarch64 b/android/abi_gki_protected_exports_aarch64
index 6b40237c253a..e4792af0a0ef 100644
--- a/android/abi_gki_protected_exports_aarch64
+++ b/android/abi_gki_protected_exports_aarch64
@@ -334,4 +334,14 @@ wpan_phy_for_each
 wpan_phy_free
 wpan_phy_new
 wpan_phy_register
-wpan_phy_unregister
\ No newline at end of file
+wpan_phy_unregister
+wwan_create_port
+wwan_get_debugfs_dir
+wwan_port_get_drvdata
+wwan_port_rx
+wwan_port_txoff
+wwan_port_txon
+wwan_put_debugfs_dir
+wwan_register_ops
+wwan_remove_port
+wwan_unregister_ops
\ No newline at end of file
diff --git a/android/abi_gki_protected_exports_x86_64 b/android/abi_gki_protected_exports_x86_64
index 6b40237c253a..e4792af0a0ef 100644
--- a/android/abi_gki_protected_exports_x86_64
+++ b/android/abi_gki_protected_exports_x86_64
@@ -334,4 +334,14 @@ wpan_phy_for_each
 wpan_phy_free
 wpan_phy_new
 wpan_phy_register
-wpan_phy_unregister
\ No newline at end of file
+wpan_phy_unregister
+wwan_create_port
+wwan_get_debugfs_dir
+wwan_port_get_drvdata
+wwan_port_rx
+wwan_port_txoff
+wwan_port_txon
+wwan_put_debugfs_dir
+wwan_register_ops
+wwan_remove_port
+wwan_unregister_ops
\ No newline at end of file
diff --git a/android/gki_aarch64_protected_modules b/android/gki_aarch64_protected_modules
index 2a232a69f4a5..d6b0777dd474 100644
--- a/android/gki_aarch64_protected_modules
+++ b/android/gki_aarch64_protected_modules
@@ -23,6 +23,7 @@ drivers/net/usb/r8152.ko
 drivers/net/usb/r8153_ecm.ko
 drivers/net/usb/rtl8150.ko
 drivers/net/usb/usbnet.ko
+drivers/net/wwan/wwan.ko
 drivers/usb/class/cdc-acm.ko
 drivers/usb/serial/ftdi_sio.ko
 drivers/usb/serial/usbserial.ko
diff --git a/android/gki_system_dlkm_modules b/android/gki_system_dlkm_modules
deleted file mode 100644
index 70befe1a9dcf..000000000000
--- a/android/gki_system_dlkm_modules
+++ /dev/null
@@ -1,59 +0,0 @@
-drivers/block/zram/zram.ko
-drivers/bluetooth/btbcm.ko
-drivers/bluetooth/btqca.ko
-drivers/bluetooth/btsdio.ko
-drivers/bluetooth/hci_uart.ko
-drivers/net/can/dev/can-dev.ko
-drivers/net/can/slcan/slcan.ko
-drivers/net/can/vcan.ko
-drivers/net/mii.ko
-drivers/net/ppp/bsd_comp.ko
-drivers/net/ppp/ppp_deflate.ko
-drivers/net/ppp/ppp_generic.ko
-drivers/net/ppp/ppp_mppe.ko
-drivers/net/ppp/pppox.ko
-drivers/net/ppp/pptp.ko
-drivers/net/slip/slhc.ko
-drivers/net/usb/aqc111.ko
-drivers/net/usb/asix.ko
-drivers/net/usb/ax88179_178a.ko
-drivers/net/usb/cdc_eem.ko
-drivers/net/usb/cdc_ether.ko
-drivers/net/usb/cdc_ncm.ko
-drivers/net/usb/r8152.ko
-drivers/net/usb/r8153_ecm.ko
-drivers/net/usb/rtl8150.ko
-drivers/net/usb/usbnet.ko
-drivers/usb/class/cdc-acm.ko
-drivers/usb/serial/ftdi_sio.ko
-drivers/usb/serial/usbserial.ko
-kernel/kheaders.ko
-lib/crypto/libarc4.ko
-mm/zsmalloc.ko
-net/6lowpan/6lowpan.ko
-net/6lowpan/nhc_dest.ko
-net/6lowpan/nhc_fragment.ko
-net/6lowpan/nhc_hop.ko
-net/6lowpan/nhc_ipv6.ko
-net/6lowpan/nhc_mobility.ko
-net/6lowpan/nhc_routing.ko
-net/6lowpan/nhc_udp.ko
-net/8021q/8021q.ko
-net/bluetooth/bluetooth.ko
-net/bluetooth/hidp/hidp.ko
-net/bluetooth/rfcomm/rfcomm.ko
-net/can/can.ko
-net/can/can-bcm.ko
-net/can/can-gw.ko
-net/can/can-raw.ko
-net/ieee802154/6lowpan/ieee802154_6lowpan.ko
-net/ieee802154/ieee802154.ko
-net/ieee802154/ieee802154_socket.ko
-net/l2tp/l2tp_core.ko
-net/l2tp/l2tp_ppp.ko
-net/mac802154/mac802154.ko
-net/nfc/nfc.ko
-net/rfkill/rfkill.ko
-net/tipc/diag.ko
-net/tipc/tipc.ko
-
diff --git a/android/gki_x86_64_protected_modules b/android/gki_x86_64_protected_modules
index 2a232a69f4a5..d6b0777dd474 100644
--- a/android/gki_x86_64_protected_modules
+++ b/android/gki_x86_64_protected_modules
@@ -23,6 +23,7 @@ drivers/net/usb/r8152.ko
 drivers/net/usb/r8153_ecm.ko
 drivers/net/usb/rtl8150.ko
 drivers/net/usb/usbnet.ko
+drivers/net/wwan/wwan.ko
 drivers/usb/class/cdc-acm.ko
 drivers/usb/serial/ftdi_sio.ko
 drivers/usb/serial/usbserial.ko
diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
index 29782a39fffa..a354cff562ed 100644
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -115,7 +115,7 @@ CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
 CONFIG_CLEANCACHE=y
 CONFIG_CMA=y
 CONFIG_CMA_DEBUGFS=y
-CONFIG_CMA_AREAS=16
+CONFIG_CMA_AREAS=32
 # CONFIG_ZONE_DMA is not set
 CONFIG_ZONE_DEVICE=y
 CONFIG_ANON_VMA_NAME=y
@@ -365,6 +365,8 @@ CONFIG_USB_NET_AQC111=m
 # CONFIG_WLAN_VENDOR_TI is not set
 # CONFIG_WLAN_VENDOR_ZYDAS is not set
 # CONFIG_WLAN_VENDOR_QUANTENNA is not set
+CONFIG_WWAN=m
+# CONFIG_WWAN_DEBUGFS is not set
 CONFIG_INPUT_EVDEV=y
 CONFIG_KEYBOARD_GPIO=y
 # CONFIG_MOUSE_PS2 is not set
@@ -575,6 +577,7 @@ CONFIG_GENERIC_PHY=y
 CONFIG_POWERCAP=y
 CONFIG_ANDROID_BINDER_IPC=y
 CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_DEBUG_SYMBOLS=y
 CONFIG_ANDROID_VENDOR_HOOKS=y
 CONFIG_ANDROID_DEBUG_KINFO=y
 CONFIG_LIBNVDIMM=y
diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h
index 740a62f88a10..af442f82699d 100644
--- a/arch/arm64/include/asm/kvm_host.h
+++ b/arch/arm64/include/asm/kvm_host.h
@@ -203,6 +203,11 @@ struct kvm_arch {
 	/* Mandated version of PSCI */
 	u32 psci_version;
 
+#ifndef __GENKSYMS__
+	/* Protects VM-scoped configuration data */
+	struct mutex config_lock;
+#endif
+
 	/*
 	 * If we encounter a data abort without valid instruction syndrome
 	 * information, report this to user space.  User space can (and
@@ -350,7 +355,11 @@ struct kvm_cpu_context {
 
 	u64 sys_regs[NR_SYS_REGS];
 
+#ifdef __GENKSYMS__
 	struct kvm_vcpu *__hyp_running_vcpu;
+#else
+	void *__hyp_running_vcpu;
+#endif
 };
 
 struct kvm_host_data {
@@ -509,6 +518,9 @@ struct kvm_vcpu_arch {
 
 	/* vcpu power state */
 	struct kvm_mp_state mp_state;
+#ifndef __GENKSYMS__
+	spinlock_t mp_state_lock;
+#endif
 
 	union {
 		/* Cache some mmu pages needed inside spinlock regions */
diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h
index 57fc7f17d9c8..ffaa502a4d42 100644
--- a/arch/arm64/include/asm/memory.h
+++ b/arch/arm64/include/asm/memory.h
@@ -253,9 +253,11 @@ static inline const void *__tag_set(const void *addr, u8 tag)
 }
 
 #ifdef CONFIG_KASAN_HW_TAGS
-#define arch_enable_tagging_sync()		mte_enable_kernel_sync()
-#define arch_enable_tagging_async()		mte_enable_kernel_async()
-#define arch_enable_tagging_asymm()		mte_enable_kernel_asymm()
+#define arch_enable_tag_checks_sync()		mte_enable_kernel_sync()
+#define arch_enable_tag_checks_async()		mte_enable_kernel_async()
+#define arch_enable_tag_checks_asymm()		mte_enable_kernel_asymm()
+#define arch_suppress_tag_checks_start()	mte_enable_tco()
+#define arch_suppress_tag_checks_stop()		mte_disable_tco()
 #define arch_force_async_tag_fault()		mte_check_tfsr_exit()
 #define arch_get_random_tag()			mte_get_random_tag()
 #define arch_get_mem_tag(addr)			mte_get_mem_tag(addr)
diff --git a/arch/arm64/include/asm/mte-kasan.h b/arch/arm64/include/asm/mte-kasan.h
index 9f79425fc65a..2e98028c1965 100644
--- a/arch/arm64/include/asm/mte-kasan.h
+++ b/arch/arm64/include/asm/mte-kasan.h
@@ -13,8 +13,73 @@
 
 #include <linux/types.h>
 
+#ifdef CONFIG_KASAN_HW_TAGS
+
+/* Whether the MTE asynchronous mode is enabled. */
+DECLARE_STATIC_KEY_FALSE(mte_async_or_asymm_mode);
+
+static inline bool system_uses_mte_async_or_asymm_mode(void)
+{
+	return static_branch_unlikely(&mte_async_or_asymm_mode);
+}
+
+#else /* CONFIG_KASAN_HW_TAGS */
+
+static inline bool system_uses_mte_async_or_asymm_mode(void)
+{
+	return false;
+}
+
+#endif /* CONFIG_KASAN_HW_TAGS */
+
 #ifdef CONFIG_ARM64_MTE
 
+/*
+ * The Tag Check Flag (TCF) mode for MTE is per EL, hence TCF0
+ * affects EL0 and TCF affects EL1 irrespective of which TTBR is
+ * used.
+ * The kernel accesses TTBR0 usually with LDTR/STTR instructions
+ * when UAO is available, so these would act as EL0 accesses using
+ * TCF0.
+ * However futex.h code uses exclusives which would be executed as
+ * EL1, this can potentially cause a tag check fault even if the
+ * user disables TCF0.
+ *
+ * To address the problem we set the PSTATE.TCO bit in uaccess_enable()
+ * and reset it in uaccess_disable().
+ *
+ * The Tag check override (TCO) bit disables temporarily the tag checking
+ * preventing the issue.
+ */
+static inline void mte_disable_tco(void)
+{
+	asm volatile(ALTERNATIVE("nop", SET_PSTATE_TCO(0),
+				 ARM64_MTE, CONFIG_KASAN_HW_TAGS));
+}
+
+static inline void mte_enable_tco(void)
+{
+	asm volatile(ALTERNATIVE("nop", SET_PSTATE_TCO(1),
+				 ARM64_MTE, CONFIG_KASAN_HW_TAGS));
+}
+
+/*
+ * These functions disable tag checking only if in MTE async mode
+ * since the sync mode generates exceptions synchronously and the
+ * nofault or load_unaligned_zeropad can handle them.
+ */
+static inline void __mte_disable_tco_async(void)
+{
+	if (system_uses_mte_async_or_asymm_mode())
+		mte_disable_tco();
+}
+
+static inline void __mte_enable_tco_async(void)
+{
+	if (system_uses_mte_async_or_asymm_mode())
+		mte_enable_tco();
+}
+
 /*
  * These functions are meant to be only used from KASAN runtime through
  * the arch_*() interface defined in asm/memory.h.
@@ -138,6 +203,22 @@ void mte_enable_kernel_asymm(void);
 
 #else /* CONFIG_ARM64_MTE */
 
+static inline void mte_disable_tco(void)
+{
+}
+
+static inline void mte_enable_tco(void)
+{
+}
+
+static inline void __mte_disable_tco_async(void)
+{
+}
+
+static inline void __mte_enable_tco_async(void)
+{
+}
+
 static inline u8 mte_get_ptr_tag(void *ptr)
 {
 	return 0xFF;
diff --git a/arch/arm64/include/asm/mte.h b/arch/arm64/include/asm/mte.h
index 684fb1f85498..9341cc2452a3 100644
--- a/arch/arm64/include/asm/mte.h
+++ b/arch/arm64/include/asm/mte.h
@@ -145,14 +145,6 @@ static inline void mte_disable_tco_entry(struct task_struct *task)
 }
 
 #ifdef CONFIG_KASAN_HW_TAGS
-/* Whether the MTE asynchronous mode is enabled. */
-DECLARE_STATIC_KEY_FALSE(mte_async_or_asymm_mode);
-
-static inline bool system_uses_mte_async_or_asymm_mode(void)
-{
-	return static_branch_unlikely(&mte_async_or_asymm_mode);
-}
-
 void mte_check_tfsr_el1(void);
 
 static inline void mte_check_tfsr_entry(void)
@@ -179,10 +171,6 @@ static inline void mte_check_tfsr_exit(void)
 	mte_check_tfsr_el1();
 }
 #else
-static inline bool system_uses_mte_async_or_asymm_mode(void)
-{
-	return false;
-}
 static inline void mte_check_tfsr_el1(void)
 {
 }
diff --git a/arch/arm64/include/asm/uaccess.h b/arch/arm64/include/asm/uaccess.h
index 5c7b2f9d5913..30ea7b5c3ccb 100644
--- a/arch/arm64/include/asm/uaccess.h
+++ b/arch/arm64/include/asm/uaccess.h
@@ -136,55 +136,9 @@ static inline void __uaccess_enable_hw_pan(void)
 			CONFIG_ARM64_PAN));
 }
 
-/*
- * The Tag Check Flag (TCF) mode for MTE is per EL, hence TCF0
- * affects EL0 and TCF affects EL1 irrespective of which TTBR is
- * used.
- * The kernel accesses TTBR0 usually with LDTR/STTR instructions
- * when UAO is available, so these would act as EL0 accesses using
- * TCF0.
- * However futex.h code uses exclusives which would be executed as
- * EL1, this can potentially cause a tag check fault even if the
- * user disables TCF0.
- *
- * To address the problem we set the PSTATE.TCO bit in uaccess_enable()
- * and reset it in uaccess_disable().
- *
- * The Tag check override (TCO) bit disables temporarily the tag checking
- * preventing the issue.
- */
-static inline void __uaccess_disable_tco(void)
-{
-	asm volatile(ALTERNATIVE("nop", SET_PSTATE_TCO(0),
-				 ARM64_MTE, CONFIG_KASAN_HW_TAGS));
-}
-
-static inline void __uaccess_enable_tco(void)
-{
-	asm volatile(ALTERNATIVE("nop", SET_PSTATE_TCO(1),
-				 ARM64_MTE, CONFIG_KASAN_HW_TAGS));
-}
-
-/*
- * These functions disable tag checking only if in MTE async mode
- * since the sync mode generates exceptions synchronously and the
- * nofault or load_unaligned_zeropad can handle them.
- */
-static inline void __uaccess_disable_tco_async(void)
-{
-	if (system_uses_mte_async_or_asymm_mode())
-		 __uaccess_disable_tco();
-}
-
-static inline void __uaccess_enable_tco_async(void)
-{
-	if (system_uses_mte_async_or_asymm_mode())
-		__uaccess_enable_tco();
-}
-
 static inline void uaccess_disable_privileged(void)
 {
-	__uaccess_disable_tco();
+	mte_disable_tco();
 
 	if (uaccess_ttbr0_disable())
 		return;
@@ -194,7 +148,7 @@ static inline void uaccess_disable_privileged(void)
 
 static inline void uaccess_enable_privileged(void)
 {
-	__uaccess_enable_tco();
+	mte_enable_tco();
 
 	if (uaccess_ttbr0_enable())
 		return;
@@ -302,8 +256,8 @@ do {									\
 #define get_user	__get_user
 
 /*
- * We must not call into the scheduler between __uaccess_enable_tco_async() and
- * __uaccess_disable_tco_async(). As `dst` and `src` may contain blocking
+ * We must not call into the scheduler between __mte_enable_tco_async() and
+ * __mte_disable_tco_async(). As `dst` and `src` may contain blocking
  * functions, we must evaluate these outside of the critical section.
  */
 #define __get_kernel_nofault(dst, src, type, err_label)			\
@@ -312,10 +266,10 @@ do {									\
 	__typeof__(src) __gkn_src = (src);				\
 	int __gkn_err = 0;						\
 									\
-	__uaccess_enable_tco_async();					\
+	__mte_enable_tco_async();					\
 	__raw_get_mem("ldr", *((type *)(__gkn_dst)),			\
 		      (__force type *)(__gkn_src), __gkn_err, K);	\
-	__uaccess_disable_tco_async();					\
+	__mte_disable_tco_async();					\
 									\
 	if (unlikely(__gkn_err))					\
 		goto err_label;						\
@@ -388,8 +342,8 @@ do {									\
 #define put_user	__put_user
 
 /*
- * We must not call into the scheduler between __uaccess_enable_tco_async() and
- * __uaccess_disable_tco_async(). As `dst` and `src` may contain blocking
+ * We must not call into the scheduler between __mte_enable_tco_async() and
+ * __mte_disable_tco_async(). As `dst` and `src` may contain blocking
  * functions, we must evaluate these outside of the critical section.
  */
 #define __put_kernel_nofault(dst, src, type, err_label)			\
@@ -398,10 +352,10 @@ do {									\
 	__typeof__(src) __pkn_src = (src);				\
 	int __pkn_err = 0;						\
 									\
-	__uaccess_enable_tco_async();					\
+	__mte_enable_tco_async();					\
 	__raw_put_mem("str", *((type *)(__pkn_src)),			\
 		      (__force type *)(__pkn_dst), __pkn_err, K);	\
-	__uaccess_disable_tco_async();					\
+	__mte_disable_tco_async();					\
 									\
 	if (unlikely(__pkn_err))					\
 		goto err_label;						\
diff --git a/arch/arm64/include/asm/word-at-a-time.h b/arch/arm64/include/asm/word-at-a-time.h
index 1c8e4f2490bf..f3b151ed0d7a 100644
--- a/arch/arm64/include/asm/word-at-a-time.h
+++ b/arch/arm64/include/asm/word-at-a-time.h
@@ -55,7 +55,7 @@ static inline unsigned long load_unaligned_zeropad(const void *addr)
 {
 	unsigned long ret;
 
-	__uaccess_enable_tco_async();
+	__mte_enable_tco_async();
 
 	/* Load word from unaligned pointer addr */
 	asm(
@@ -65,7 +65,7 @@ static inline unsigned long load_unaligned_zeropad(const void *addr)
 	: "=&r" (ret)
 	: "r" (addr), "Q" (*(unsigned long *)addr));
 
-	__uaccess_disable_tco_async();
+	__mte_disable_tco_async();
 
 	return ret;
 }
diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c
index a219e6ddf4f5..c1d58bf4f76e 100644
--- a/arch/arm64/kvm/arm.c
+++ b/arch/arm64/kvm/arm.c
@@ -155,6 +155,16 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type)
 	if (type & ~KVM_VM_TYPE_MASK)
 		return -EINVAL;
 
+	mutex_init(&kvm->arch.config_lock);
+
+#ifdef CONFIG_LOCKDEP
+	/* Clue in lockdep that the config_lock must be taken inside kvm->lock */
+	mutex_lock(&kvm->lock);
+	mutex_lock(&kvm->arch.config_lock);
+	mutex_unlock(&kvm->arch.config_lock);
+	mutex_unlock(&kvm->lock);
+#endif
+
 	ret = kvm_share_hyp(kvm, kvm + 1);
 	if (ret)
 		return ret;
@@ -423,6 +433,16 @@ int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu)
 {
 	int err;
 
+	spin_lock_init(&vcpu->arch.mp_state_lock);
+
+#ifdef CONFIG_LOCKDEP
+	/* Inform lockdep that the config_lock is acquired after vcpu->mutex */
+	mutex_lock(&vcpu->mutex);
+	mutex_lock(&vcpu->kvm->arch.config_lock);
+	mutex_unlock(&vcpu->kvm->arch.config_lock);
+	mutex_unlock(&vcpu->mutex);
+#endif
+
 	/* Force users to call KVM_ARM_VCPU_INIT */
 	vcpu->arch.target = -1;
 	bitmap_zero(vcpu->arch.features, KVM_VCPU_MAX_FEATURES);
@@ -566,34 +586,41 @@ void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu)
 	vcpu->cpu = -1;
 }
 
-void kvm_arm_vcpu_power_off(struct kvm_vcpu *vcpu)
+static void __kvm_arm_vcpu_power_off(struct kvm_vcpu *vcpu)
 {
-	vcpu->arch.mp_state.mp_state = KVM_MP_STATE_STOPPED;
+	WRITE_ONCE(vcpu->arch.mp_state.mp_state, KVM_MP_STATE_STOPPED);
 	kvm_make_request(KVM_REQ_SLEEP, vcpu);
 	kvm_vcpu_kick(vcpu);
 }
 
+void kvm_arm_vcpu_power_off(struct kvm_vcpu *vcpu)
+{
+	spin_lock(&vcpu->arch.mp_state_lock);
+	__kvm_arm_vcpu_power_off(vcpu);
+	spin_unlock(&vcpu->arch.mp_state_lock);
+}
+
 bool kvm_arm_vcpu_stopped(struct kvm_vcpu *vcpu)
 {
-	return vcpu->arch.mp_state.mp_state == KVM_MP_STATE_STOPPED;
+	return READ_ONCE(vcpu->arch.mp_state.mp_state) == KVM_MP_STATE_STOPPED;
 }
 
 static void kvm_arm_vcpu_suspend(struct kvm_vcpu *vcpu)
 {
-	vcpu->arch.mp_state.mp_state = KVM_MP_STATE_SUSPENDED;
+	WRITE_ONCE(vcpu->arch.mp_state.mp_state, KVM_MP_STATE_SUSPENDED);
 	kvm_make_request(KVM_REQ_SUSPEND, vcpu);
 	kvm_vcpu_kick(vcpu);
 }
 
 static bool kvm_arm_vcpu_suspended(struct kvm_vcpu *vcpu)
 {
-	return vcpu->arch.mp_state.mp_state == KVM_MP_STATE_SUSPENDED;
+	return READ_ONCE(vcpu->arch.mp_state.mp_state) == KVM_MP_STATE_SUSPENDED;
 }
 
 int kvm_arch_vcpu_ioctl_get_mpstate(struct kvm_vcpu *vcpu,
 				    struct kvm_mp_state *mp_state)
 {
-	*mp_state = vcpu->arch.mp_state;
+	*mp_state = READ_ONCE(vcpu->arch.mp_state);
 
 	return 0;
 }
@@ -603,12 +630,14 @@ int kvm_arch_vcpu_ioctl_set_mpstate(struct kvm_vcpu *vcpu,
 {
 	int ret = 0;
 
+	spin_lock(&vcpu->arch.mp_state_lock);
+
 	switch (mp_state->mp_state) {
 	case KVM_MP_STATE_RUNNABLE:
-		vcpu->arch.mp_state = *mp_state;
+		WRITE_ONCE(vcpu->arch.mp_state, *mp_state);
 		break;
 	case KVM_MP_STATE_STOPPED:
-		kvm_arm_vcpu_power_off(vcpu);
+		__kvm_arm_vcpu_power_off(vcpu);
 		break;
 	case KVM_MP_STATE_SUSPENDED:
 		kvm_arm_vcpu_suspend(vcpu);
@@ -617,6 +646,8 @@ int kvm_arch_vcpu_ioctl_set_mpstate(struct kvm_vcpu *vcpu,
 		ret = -EINVAL;
 	}
 
+	spin_unlock(&vcpu->arch.mp_state_lock);
+
 	return ret;
 }
 
@@ -711,9 +742,9 @@ int kvm_arch_vcpu_run_pid_change(struct kvm_vcpu *vcpu)
 		static_branch_inc(&userspace_irqchip_in_use);
 	}
 
-	mutex_lock(&kvm->lock);
+	mutex_lock(&kvm->arch.config_lock);
 	set_bit(KVM_ARCH_FLAG_HAS_RAN_ONCE, &kvm->arch.flags);
-	mutex_unlock(&kvm->lock);
+	mutex_unlock(&kvm->arch.config_lock);
 
 	return ret;
 }
@@ -1327,7 +1358,7 @@ static int kvm_arch_vcpu_ioctl_vcpu_init(struct kvm_vcpu *vcpu,
 	if (test_bit(KVM_ARM_VCPU_POWER_OFF, vcpu->arch.features))
 		kvm_arm_vcpu_power_off(vcpu);
 	else
-		vcpu->arch.mp_state.mp_state = KVM_MP_STATE_RUNNABLE;
+		WRITE_ONCE(vcpu->arch.mp_state.mp_state, KVM_MP_STATE_RUNNABLE);
 
 	return 0;
 }
diff --git a/arch/arm64/kvm/guest.c b/arch/arm64/kvm/guest.c
index a3b31f2c7a6a..8ae9aafdd8d3 100644
--- a/arch/arm64/kvm/guest.c
+++ b/arch/arm64/kvm/guest.c
@@ -953,7 +953,9 @@ int kvm_arm_vcpu_arch_set_attr(struct kvm_vcpu *vcpu,
 
 	switch (attr->group) {
 	case KVM_ARM_VCPU_PMU_V3_CTRL:
+		mutex_lock(&vcpu->kvm->arch.config_lock);
 		ret = kvm_arm_pmu_v3_set_attr(vcpu, attr);
+		mutex_unlock(&vcpu->kvm->arch.config_lock);
 		break;
 	case KVM_ARM_VCPU_TIMER_CTRL:
 		ret = kvm_arm_timer_set_attr(vcpu, attr);
diff --git a/arch/arm64/kvm/hyp/nvhe/tlb.c b/arch/arm64/kvm/hyp/nvhe/tlb.c
index 35092e154614..692bd7f881f1 100644
--- a/arch/arm64/kvm/hyp/nvhe/tlb.c
+++ b/arch/arm64/kvm/hyp/nvhe/tlb.c
@@ -32,13 +32,19 @@ static void enter_vmid_context(struct kvm_s2_mmu *mmu,
 	 * to do.
 	 */
 	if (vcpu) {
+		/* We're in guest context */
 		if (mmu == vcpu->arch.hw_mmu || WARN_ON(mmu != host_s2_mmu))
 			return;
-	} else if (mmu == host_s2_mmu) {
-		return;
+
+		cxt->mmu = vcpu->arch.hw_mmu;
+	} else {
+		/* We're in host context */
+		if (mmu == host_s2_mmu)
+			return;
+
+		cxt->mmu = host_s2_mmu;
 	}
 
-	cxt->mmu = mmu;
 	if (cpus_have_final_cap(ARM64_WORKAROUND_SPECULATIVE_AT)) {
 		u64 val;
 
diff --git a/arch/arm64/kvm/hypercalls.c b/arch/arm64/kvm/hypercalls.c
index 6c052411123c..3e069361ecfc 100644
--- a/arch/arm64/kvm/hypercalls.c
+++ b/arch/arm64/kvm/hypercalls.c
@@ -409,7 +409,7 @@ static int kvm_arm_set_fw_reg_bmap(struct kvm_vcpu *vcpu, u64 reg_id, u64 val)
 	if (val & ~fw_reg_features)
 		return -EINVAL;
 
-	mutex_lock(&kvm->lock);
+	mutex_lock(&kvm->arch.config_lock);
 
 	if (test_bit(KVM_ARCH_FLAG_HAS_RAN_ONCE, &kvm->arch.flags) &&
 	    val != *fw_reg_bmap) {
@@ -419,7 +419,7 @@ static int kvm_arm_set_fw_reg_bmap(struct kvm_vcpu *vcpu, u64 reg_id, u64 val)
 
 	WRITE_ONCE(*fw_reg_bmap, val);
 out:
-	mutex_unlock(&kvm->lock);
+	mutex_unlock(&kvm->arch.config_lock);
 	return ret;
 }
 
diff --git a/arch/arm64/kvm/pmu-emul.c b/arch/arm64/kvm/pmu-emul.c
index ed12c5355afb..c7e5f6a28c28 100644
--- a/arch/arm64/kvm/pmu-emul.c
+++ b/arch/arm64/kvm/pmu-emul.c
@@ -850,7 +850,7 @@ static int kvm_arm_pmu_v3_set_pmu(struct kvm_vcpu *vcpu, int pmu_id)
 	struct arm_pmu *arm_pmu;
 	int ret = -ENXIO;
 
-	mutex_lock(&kvm->lock);
+	lockdep_assert_held(&kvm->arch.config_lock);
 	mutex_lock(&arm_pmus_lock);
 
 	list_for_each_entry(entry, &arm_pmus, entry) {
@@ -870,7 +870,6 @@ static int kvm_arm_pmu_v3_set_pmu(struct kvm_vcpu *vcpu, int pmu_id)
 	}
 
 	mutex_unlock(&arm_pmus_lock);
-	mutex_unlock(&kvm->lock);
 	return ret;
 }
 
@@ -878,22 +877,20 @@ int kvm_arm_pmu_v3_set_attr(struct kvm_vcpu *vcpu, struct kvm_device_attr *attr)
 {
 	struct kvm *kvm = vcpu->kvm;
 
+	lockdep_assert_held(&kvm->arch.config_lock);
+
 	if (!kvm_vcpu_has_pmu(vcpu))
 		return -ENODEV;
 
 	if (vcpu->arch.pmu.created)
 		return -EBUSY;
 
-	mutex_lock(&kvm->lock);
 	if (!kvm->arch.arm_pmu) {
 		/* No PMU set, get the default one */
 		kvm->arch.arm_pmu = kvm_pmu_probe_armpmu();
-		if (!kvm->arch.arm_pmu) {
-			mutex_unlock(&kvm->lock);
+		if (!kvm->arch.arm_pmu)
 			return -ENODEV;
-		}
 	}
-	mutex_unlock(&kvm->lock);
 
 	switch (attr->attr) {
 	case KVM_ARM_VCPU_PMU_V3_IRQ: {
@@ -937,19 +934,13 @@ int kvm_arm_pmu_v3_set_attr(struct kvm_vcpu *vcpu, struct kvm_device_attr *attr)
 		     filter.action != KVM_PMU_EVENT_DENY))
 			return -EINVAL;
 
-		mutex_lock(&kvm->lock);
-
-		if (test_bit(KVM_ARCH_FLAG_HAS_RAN_ONCE, &kvm->arch.flags)) {
-			mutex_unlock(&kvm->lock);
+		if (test_bit(KVM_ARCH_FLAG_HAS_RAN_ONCE, &kvm->arch.flags))
 			return -EBUSY;
-		}
 
 		if (!kvm->arch.pmu_filter) {
 			kvm->arch.pmu_filter = bitmap_alloc(nr_events, GFP_KERNEL_ACCOUNT);
-			if (!kvm->arch.pmu_filter) {
-				mutex_unlock(&kvm->lock);
+			if (!kvm->arch.pmu_filter)
 				return -ENOMEM;
-			}
 
 			/*
 			 * The default depends on the first applied filter.
@@ -968,8 +959,6 @@ int kvm_arm_pmu_v3_set_attr(struct kvm_vcpu *vcpu, struct kvm_device_attr *attr)
 		else
 			bitmap_clear(kvm->arch.pmu_filter, filter.base_event, filter.nevents);
 
-		mutex_unlock(&kvm->lock);
-
 		return 0;
 	}
 	case KVM_ARM_VCPU_PMU_V3_SET_PMU: {
diff --git a/arch/arm64/kvm/psci.c b/arch/arm64/kvm/psci.c
index 0f7001d726a2..70cabcea8a4f 100644
--- a/arch/arm64/kvm/psci.c
+++ b/arch/arm64/kvm/psci.c
@@ -46,6 +46,7 @@ static unsigned long kvm_psci_vcpu_on(struct kvm_vcpu *source_vcpu)
 	struct vcpu_reset_state *reset_state;
 	struct kvm *kvm = source_vcpu->kvm;
 	struct kvm_vcpu *vcpu = NULL;
+	int ret = PSCI_RET_SUCCESS;
 	unsigned long cpu_id;
 
 	cpu_id = smccc_get_arg1(source_vcpu);
@@ -60,11 +61,15 @@ static unsigned long kvm_psci_vcpu_on(struct kvm_vcpu *source_vcpu)
 	 */
 	if (!vcpu)
 		return PSCI_RET_INVALID_PARAMS;
+
+	spin_lock(&vcpu->arch.mp_state_lock);
 	if (!kvm_arm_vcpu_stopped(vcpu)) {
 		if (kvm_psci_version(source_vcpu) != KVM_ARM_PSCI_0_1)
-			return PSCI_RET_ALREADY_ON;
+			ret = PSCI_RET_ALREADY_ON;
 		else
-			return PSCI_RET_INVALID_PARAMS;
+			ret = PSCI_RET_INVALID_PARAMS;
+
+		goto out_unlock;
 	}
 
 	reset_state = &vcpu->arch.reset_state;
@@ -80,7 +85,7 @@ static unsigned long kvm_psci_vcpu_on(struct kvm_vcpu *source_vcpu)
 	 */
 	reset_state->r0 = smccc_get_arg3(source_vcpu);
 
-	WRITE_ONCE(reset_state->reset, true);
+	reset_state->reset = true;
 	kvm_make_request(KVM_REQ_VCPU_RESET, vcpu);
 
 	/*
@@ -92,7 +97,9 @@ static unsigned long kvm_psci_vcpu_on(struct kvm_vcpu *source_vcpu)
 	vcpu->arch.mp_state.mp_state = KVM_MP_STATE_RUNNABLE;
 	kvm_vcpu_wake_up(vcpu);
 
-	return PSCI_RET_SUCCESS;
+out_unlock:
+	spin_unlock(&vcpu->arch.mp_state_lock);
+	return ret;
 }
 
 static unsigned long kvm_psci_vcpu_affinity_info(struct kvm_vcpu *vcpu)
@@ -152,8 +159,11 @@ static void kvm_prepare_system_event(struct kvm_vcpu *vcpu, u32 type, u64 flags)
 	 * after this call is handled and before the VCPUs have been
 	 * re-initialized.
 	 */
-	kvm_for_each_vcpu(i, tmp, vcpu->kvm)
-		tmp->arch.mp_state.mp_state = KVM_MP_STATE_STOPPED;
+	kvm_for_each_vcpu(i, tmp, vcpu->kvm) {
+		spin_lock(&tmp->arch.mp_state_lock);
+		WRITE_ONCE(tmp->arch.mp_state.mp_state, KVM_MP_STATE_STOPPED);
+		spin_unlock(&tmp->arch.mp_state_lock);
+	}
 	kvm_make_all_cpus_request(vcpu->kvm, KVM_REQ_SLEEP);
 
 	memset(&vcpu->run->system_event, 0, sizeof(vcpu->run->system_event));
@@ -201,7 +211,6 @@ static unsigned long kvm_psci_check_allowed_function(struct kvm_vcpu *vcpu, u32
 
 static int kvm_psci_0_2_call(struct kvm_vcpu *vcpu)
 {
-	struct kvm *kvm = vcpu->kvm;
 	u32 psci_fn = smccc_get_function(vcpu);
 	unsigned long val;
 	int ret = 1;
@@ -226,9 +235,7 @@ static int kvm_psci_0_2_call(struct kvm_vcpu *vcpu)
 		kvm_psci_narrow_to_32bit(vcpu);
 		fallthrough;
 	case PSCI_0_2_FN64_CPU_ON:
-		mutex_lock(&kvm->lock);
 		val = kvm_psci_vcpu_on(vcpu);
-		mutex_unlock(&kvm->lock);
 		break;
 	case PSCI_0_2_FN_AFFINITY_INFO:
 		kvm_psci_narrow_to_32bit(vcpu);
@@ -367,7 +374,6 @@ static int kvm_psci_1_x_call(struct kvm_vcpu *vcpu, u32 minor)
 
 static int kvm_psci_0_1_call(struct kvm_vcpu *vcpu)
 {
-	struct kvm *kvm = vcpu->kvm;
 	u32 psci_fn = smccc_get_function(vcpu);
 	unsigned long val;
 
@@ -377,9 +383,7 @@ static int kvm_psci_0_1_call(struct kvm_vcpu *vcpu)
 		val = PSCI_RET_SUCCESS;
 		break;
 	case KVM_PSCI_FN_CPU_ON:
-		mutex_lock(&kvm->lock);
 		val = kvm_psci_vcpu_on(vcpu);
-		mutex_unlock(&kvm->lock);
 		break;
 	default:
 		val = PSCI_RET_NOT_SUPPORTED;
diff --git a/arch/arm64/kvm/reset.c b/arch/arm64/kvm/reset.c
index 2ede29175bf0..4b80f4e2b438 100644
--- a/arch/arm64/kvm/reset.c
+++ b/arch/arm64/kvm/reset.c
@@ -176,7 +176,7 @@ static int kvm_set_vm_width(struct kvm_vcpu *vcpu)
 
 	is32bit = vcpu_has_feature(vcpu, KVM_ARM_VCPU_EL1_32BIT);
 
-	lockdep_assert_held(&kvm->lock);
+	lockdep_assert_held(&kvm->arch.config_lock);
 
 	if (test_bit(KVM_ARCH_FLAG_REG_WIDTH_CONFIGURED, &kvm->arch.flags)) {
 		/*
@@ -228,17 +228,18 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu)
 	int ret;
 	bool loaded;
 
-	mutex_lock(&vcpu->kvm->lock);
+	mutex_lock(&vcpu->kvm->arch.config_lock);
 	ret = kvm_set_vm_width(vcpu);
-	if (!ret) {
-		reset_state = vcpu->arch.reset_state;
-		WRITE_ONCE(vcpu->arch.reset_state.reset, false);
-	}
-	mutex_unlock(&vcpu->kvm->lock);
+	mutex_unlock(&vcpu->kvm->arch.config_lock);
 
 	if (ret)
 		return ret;
 
+	spin_lock(&vcpu->arch.mp_state_lock);
+	reset_state = vcpu->arch.reset_state;
+	vcpu->arch.reset_state.reset = false;
+	spin_unlock(&vcpu->arch.mp_state_lock);
+
 	/* Reset PMU outside of the non-preemptible section */
 	kvm_pmu_vcpu_reset(vcpu);
 
diff --git a/arch/arm64/kvm/vgic/vgic-debug.c b/arch/arm64/kvm/vgic/vgic-debug.c
index 78cde687383c..07aa0437125a 100644
--- a/arch/arm64/kvm/vgic/vgic-debug.c
+++ b/arch/arm64/kvm/vgic/vgic-debug.c
@@ -85,7 +85,7 @@ static void *vgic_debug_start(struct seq_file *s, loff_t *pos)
 	struct kvm *kvm = s->private;
 	struct vgic_state_iter *iter;
 
-	mutex_lock(&kvm->lock);
+	mutex_lock(&kvm->arch.config_lock);
 	iter = kvm->arch.vgic.iter;
 	if (iter) {
 		iter = ERR_PTR(-EBUSY);
@@ -104,7 +104,7 @@ static void *vgic_debug_start(struct seq_file *s, loff_t *pos)
 	if (end_of_vgic(iter))
 		iter = NULL;
 out:
-	mutex_unlock(&kvm->lock);
+	mutex_unlock(&kvm->arch.config_lock);
 	return iter;
 }
 
@@ -132,12 +132,12 @@ static void vgic_debug_stop(struct seq_file *s, void *v)
 	if (IS_ERR(v))
 		return;
 
-	mutex_lock(&kvm->lock);
+	mutex_lock(&kvm->arch.config_lock);
 	iter = kvm->arch.vgic.iter;
 	kfree(iter->lpi_array);
 	kfree(iter);
 	kvm->arch.vgic.iter = NULL;
-	mutex_unlock(&kvm->lock);
+	mutex_unlock(&kvm->arch.config_lock);
 }
 
 static void print_dist_state(struct seq_file *s, struct vgic_dist *dist)
diff --git a/arch/arm64/kvm/vgic/vgic-init.c b/arch/arm64/kvm/vgic/vgic-init.c
index f6d4f4052555..f2f3bf4a04b0 100644
--- a/arch/arm64/kvm/vgic/vgic-init.c
+++ b/arch/arm64/kvm/vgic/vgic-init.c
@@ -74,9 +74,6 @@ int kvm_vgic_create(struct kvm *kvm, u32 type)
 	unsigned long i;
 	int ret;
 
-	if (irqchip_in_kernel(kvm))
-		return -EEXIST;
-
 	/*
 	 * This function is also called by the KVM_CREATE_IRQCHIP handler,
 	 * which had no chance yet to check the availability of the GICv2
@@ -87,10 +84,20 @@ int kvm_vgic_create(struct kvm *kvm, u32 type)
 		!kvm_vgic_global_state.can_emulate_gicv2)
 		return -ENODEV;
 
+	/* Must be held to avoid race with vCPU creation */
+	lockdep_assert_held(&kvm->lock);
+
 	ret = -EBUSY;
 	if (!lock_all_vcpus(kvm))
 		return ret;
 
+	mutex_lock(&kvm->arch.config_lock);
+
+	if (irqchip_in_kernel(kvm)) {
+		ret = -EEXIST;
+		goto out_unlock;
+	}
+
 	kvm_for_each_vcpu(i, vcpu, kvm) {
 		if (vcpu_has_run_once(vcpu))
 			goto out_unlock;
@@ -118,6 +125,7 @@ int kvm_vgic_create(struct kvm *kvm, u32 type)
 		INIT_LIST_HEAD(&kvm->arch.vgic.rd_regions);
 
 out_unlock:
+	mutex_unlock(&kvm->arch.config_lock);
 	unlock_all_vcpus(kvm);
 	return ret;
 }
@@ -227,9 +235,9 @@ int kvm_vgic_vcpu_init(struct kvm_vcpu *vcpu)
 	 * KVM io device for the redistributor that belongs to this VCPU.
 	 */
 	if (dist->vgic_model == KVM_DEV_TYPE_ARM_VGIC_V3) {
-		mutex_lock(&vcpu->kvm->lock);
+		mutex_lock(&vcpu->kvm->slots_lock);
 		ret = vgic_register_redist_iodev(vcpu);
-		mutex_unlock(&vcpu->kvm->lock);
+		mutex_unlock(&vcpu->kvm->slots_lock);
 	}
 	return ret;
 }
@@ -250,7 +258,6 @@ static void kvm_vgic_vcpu_enable(struct kvm_vcpu *vcpu)
  * The function is generally called when nr_spis has been explicitly set
  * by the guest through the KVM DEVICE API. If not nr_spis is set to 256.
  * vgic_initialized() returns true when this function has succeeded.
- * Must be called with kvm->lock held!
  */
 int vgic_init(struct kvm *kvm)
 {
@@ -259,6 +266,8 @@ int vgic_init(struct kvm *kvm)
 	int ret = 0, i;
 	unsigned long idx;
 
+	lockdep_assert_held(&kvm->arch.config_lock);
+
 	if (vgic_initialized(kvm))
 		return 0;
 
@@ -373,12 +382,13 @@ void kvm_vgic_vcpu_destroy(struct kvm_vcpu *vcpu)
 	vgic_cpu->rd_iodev.base_addr = VGIC_ADDR_UNDEF;
 }
 
-/* To be called with kvm->lock held */
 static void __kvm_vgic_destroy(struct kvm *kvm)
 {
 	struct kvm_vcpu *vcpu;
 	unsigned long i;
 
+	lockdep_assert_held(&kvm->arch.config_lock);
+
 	vgic_debug_destroy(kvm);
 
 	kvm_for_each_vcpu(i, vcpu, kvm)
@@ -389,9 +399,9 @@ static void __kvm_vgic_destroy(struct kvm *kvm)
 
 void kvm_vgic_destroy(struct kvm *kvm)
 {
-	mutex_lock(&kvm->lock);
+	mutex_lock(&kvm->arch.config_lock);
 	__kvm_vgic_destroy(kvm);
-	mutex_unlock(&kvm->lock);
+	mutex_unlock(&kvm->arch.config_lock);
 }
 
 /**
@@ -414,9 +424,9 @@ int vgic_lazy_init(struct kvm *kvm)
 		if (kvm->arch.vgic.vgic_model != KVM_DEV_TYPE_ARM_VGIC_V2)
 			return -EBUSY;
 
-		mutex_lock(&kvm->lock);
+		mutex_lock(&kvm->arch.config_lock);
 		ret = vgic_init(kvm);
-		mutex_unlock(&kvm->lock);
+		mutex_unlock(&kvm->arch.config_lock);
 	}
 
 	return ret;
@@ -436,30 +446,48 @@ int vgic_lazy_init(struct kvm *kvm)
 int kvm_vgic_map_resources(struct kvm *kvm)
 {
 	struct vgic_dist *dist = &kvm->arch.vgic;
+	enum vgic_type type;
+	gpa_t dist_base;
 	int ret = 0;
 
 	if (likely(vgic_ready(kvm)))
 		return 0;
 
-	mutex_lock(&kvm->lock);
+	mutex_lock(&kvm->slots_lock);
+	mutex_lock(&kvm->arch.config_lock);
 	if (vgic_ready(kvm))
 		goto out;
 
 	if (!irqchip_in_kernel(kvm))
 		goto out;
 
-	if (dist->vgic_model == KVM_DEV_TYPE_ARM_VGIC_V2)
+	if (dist->vgic_model == KVM_DEV_TYPE_ARM_VGIC_V2) {
 		ret = vgic_v2_map_resources(kvm);
-	else
+		type = VGIC_V2;
+	} else {
 		ret = vgic_v3_map_resources(kvm);
+		type = VGIC_V3;
+	}
 
-	if (ret)
+	if (ret) {
 		__kvm_vgic_destroy(kvm);
-	else
-		dist->ready = true;
+		goto out;
+	}
+	dist->ready = true;
+	dist_base = dist->vgic_dist_base;
+	mutex_unlock(&kvm->arch.config_lock);
+
+	ret = vgic_register_dist_iodev(kvm, dist_base, type);
+	if (ret) {
+		kvm_err("Unable to register VGIC dist MMIO regions\n");
+		kvm_vgic_destroy(kvm);
+	}
+	mutex_unlock(&kvm->slots_lock);
+	return ret;
 
 out:
-	mutex_unlock(&kvm->lock);
+	mutex_unlock(&kvm->arch.config_lock);
+	mutex_unlock(&kvm->slots_lock);
 	return ret;
 }
 
diff --git a/arch/arm64/kvm/vgic/vgic-its.c b/arch/arm64/kvm/vgic/vgic-its.c
index 733b53055f97..46ac071f71e1 100644
--- a/arch/arm64/kvm/vgic/vgic-its.c
+++ b/arch/arm64/kvm/vgic/vgic-its.c
@@ -1936,6 +1936,7 @@ void vgic_lpi_translation_cache_destroy(struct kvm *kvm)
 
 static int vgic_its_create(struct kvm_device *dev, u32 type)
 {
+	int ret;
 	struct vgic_its *its;
 
 	if (type != KVM_DEV_TYPE_ARM_VGIC_ITS)
@@ -1945,9 +1946,12 @@ static int vgic_its_create(struct kvm_device *dev, u32 type)
 	if (!its)
 		return -ENOMEM;
 
+	mutex_lock(&dev->kvm->arch.config_lock);
+
 	if (vgic_initialized(dev->kvm)) {
-		int ret = vgic_v4_init(dev->kvm);
+		ret = vgic_v4_init(dev->kvm);
 		if (ret < 0) {
+			mutex_unlock(&dev->kvm->arch.config_lock);
 			kfree(its);
 			return ret;
 		}
@@ -1958,6 +1962,14 @@ static int vgic_its_create(struct kvm_device *dev, u32 type)
 	mutex_init(&its->its_lock);
 	mutex_init(&its->cmd_lock);
 
+	/* Yep, even more trickery for lock ordering... */
+#ifdef CONFIG_LOCKDEP
+	mutex_lock(&its->cmd_lock);
+	mutex_lock(&its->its_lock);
+	mutex_unlock(&its->its_lock);
+	mutex_unlock(&its->cmd_lock);
+#endif
+
 	its->vgic_its_base = VGIC_ADDR_UNDEF;
 
 	INIT_LIST_HEAD(&its->device_list);
@@ -1976,7 +1988,11 @@ static int vgic_its_create(struct kvm_device *dev, u32 type)
 
 	dev->private = its;
 
-	return vgic_its_set_abi(its, NR_ITS_ABIS - 1);
+	ret = vgic_its_set_abi(its, NR_ITS_ABIS - 1);
+
+	mutex_unlock(&dev->kvm->arch.config_lock);
+
+	return ret;
 }
 
 static void vgic_its_destroy(struct kvm_device *kvm_dev)
@@ -2045,6 +2061,13 @@ static int vgic_its_attr_regs_access(struct kvm_device *dev,
 
 	mutex_lock(&dev->kvm->lock);
 
+	if (!lock_all_vcpus(dev->kvm)) {
+		mutex_unlock(&dev->kvm->lock);
+		return -EBUSY;
+	}
+
+	mutex_lock(&dev->kvm->arch.config_lock);
+
 	if (IS_VGIC_ADDR_UNDEF(its->vgic_its_base)) {
 		ret = -ENXIO;
 		goto out;
@@ -2058,11 +2081,6 @@ static int vgic_its_attr_regs_access(struct kvm_device *dev,
 		goto out;
 	}
 
-	if (!lock_all_vcpus(dev->kvm)) {
-		ret = -EBUSY;
-		goto out;
-	}
-
 	addr = its->vgic_its_base + offset;
 
 	len = region->access_flags & VGIC_ACCESS_64bit ? 8 : 4;
@@ -2076,8 +2094,9 @@ static int vgic_its_attr_regs_access(struct kvm_device *dev,
 	} else {
 		*reg = region->its_read(dev->kvm, its, addr, len);
 	}
-	unlock_all_vcpus(dev->kvm);
 out:
+	mutex_unlock(&dev->kvm->arch.config_lock);
+	unlock_all_vcpus(dev->kvm);
 	mutex_unlock(&dev->kvm->lock);
 	return ret;
 }
@@ -2187,7 +2206,7 @@ static int vgic_its_save_ite(struct vgic_its *its, struct its_device *dev,
 	       ((u64)ite->irq->intid << KVM_ITS_ITE_PINTID_SHIFT) |
 		ite->collection->collection_id;
 	val = cpu_to_le64(val);
-	return kvm_write_guest_lock(kvm, gpa, &val, ite_esz);
+	return vgic_write_guest_lock(kvm, gpa, &val, ite_esz);
 }
 
 /**
@@ -2339,7 +2358,7 @@ static int vgic_its_save_dte(struct vgic_its *its, struct its_device *dev,
 	       (itt_addr_field << KVM_ITS_DTE_ITTADDR_SHIFT) |
 		(dev->num_eventid_bits - 1));
 	val = cpu_to_le64(val);
-	return kvm_write_guest_lock(kvm, ptr, &val, dte_esz);
+	return vgic_write_guest_lock(kvm, ptr, &val, dte_esz);
 }
 
 /**
@@ -2526,7 +2545,7 @@ static int vgic_its_save_cte(struct vgic_its *its,
 	       ((u64)collection->target_addr << KVM_ITS_CTE_RDBASE_SHIFT) |
 	       collection->collection_id);
 	val = cpu_to_le64(val);
-	return kvm_write_guest_lock(its->dev->kvm, gpa, &val, esz);
+	return vgic_write_guest_lock(its->dev->kvm, gpa, &val, esz);
 }
 
 /*
@@ -2607,7 +2626,7 @@ static int vgic_its_save_collection_table(struct vgic_its *its)
 	 */
 	val = 0;
 	BUG_ON(cte_esz > sizeof(val));
-	ret = kvm_write_guest_lock(its->dev->kvm, gpa, &val, cte_esz);
+	ret = vgic_write_guest_lock(its->dev->kvm, gpa, &val, cte_esz);
 	return ret;
 }
 
@@ -2749,14 +2768,15 @@ static int vgic_its_ctrl(struct kvm *kvm, struct vgic_its *its, u64 attr)
 		return 0;
 
 	mutex_lock(&kvm->lock);
-	mutex_lock(&its->its_lock);
 
 	if (!lock_all_vcpus(kvm)) {
-		mutex_unlock(&its->its_lock);
 		mutex_unlock(&kvm->lock);
 		return -EBUSY;
 	}
 
+	mutex_lock(&kvm->arch.config_lock);
+	mutex_lock(&its->its_lock);
+
 	switch (attr) {
 	case KVM_DEV_ARM_ITS_CTRL_RESET:
 		vgic_its_reset(kvm, its);
@@ -2769,8 +2789,9 @@ static int vgic_its_ctrl(struct kvm *kvm, struct vgic_its *its, u64 attr)
 		break;
 	}
 
-	unlock_all_vcpus(kvm);
 	mutex_unlock(&its->its_lock);
+	mutex_unlock(&kvm->arch.config_lock);
+	unlock_all_vcpus(kvm);
 	mutex_unlock(&kvm->lock);
 	return ret;
 }
diff --git a/arch/arm64/kvm/vgic/vgic-kvm-device.c b/arch/arm64/kvm/vgic/vgic-kvm-device.c
index edeac2380591..bf4b3d9631ce 100644
--- a/arch/arm64/kvm/vgic/vgic-kvm-device.c
+++ b/arch/arm64/kvm/vgic/vgic-kvm-device.c
@@ -46,7 +46,7 @@ int kvm_set_legacy_vgic_v2_addr(struct kvm *kvm, struct kvm_arm_device_addr *dev
 	struct vgic_dist *vgic = &kvm->arch.vgic;
 	int r;
 
-	mutex_lock(&kvm->lock);
+	mutex_lock(&kvm->arch.config_lock);
 	switch (FIELD_GET(KVM_ARM_DEVICE_TYPE_MASK, dev_addr->id)) {
 	case KVM_VGIC_V2_ADDR_TYPE_DIST:
 		r = vgic_check_type(kvm, KVM_DEV_TYPE_ARM_VGIC_V2);
@@ -68,7 +68,7 @@ int kvm_set_legacy_vgic_v2_addr(struct kvm *kvm, struct kvm_arm_device_addr *dev
 		r = -ENODEV;
 	}
 
-	mutex_unlock(&kvm->lock);
+	mutex_unlock(&kvm->arch.config_lock);
 
 	return r;
 }
@@ -102,7 +102,11 @@ static int kvm_vgic_addr(struct kvm *kvm, struct kvm_device_attr *attr, bool wri
 		if (get_user(addr, uaddr))
 			return -EFAULT;
 
-	mutex_lock(&kvm->lock);
+	/*
+	 * Since we can't hold config_lock while registering the redistributor
+	 * iodevs, take the slots_lock immediately.
+	 */
+	mutex_lock(&kvm->slots_lock);
 	switch (attr->attr) {
 	case KVM_VGIC_V2_ADDR_TYPE_DIST:
 		r = vgic_check_type(kvm, KVM_DEV_TYPE_ARM_VGIC_V2);
@@ -182,6 +186,7 @@ static int kvm_vgic_addr(struct kvm *kvm, struct kvm_device_attr *attr, bool wri
 	if (r)
 		goto out;
 
+	mutex_lock(&kvm->arch.config_lock);
 	if (write) {
 		r = vgic_check_iorange(kvm, *addr_ptr, addr, alignment, size);
 		if (!r)
@@ -189,9 +194,10 @@ static int kvm_vgic_addr(struct kvm *kvm, struct kvm_device_attr *attr, bool wri
 	} else {
 		addr = *addr_ptr;
 	}
+	mutex_unlock(&kvm->arch.config_lock);
 
 out:
-	mutex_unlock(&kvm->lock);
+	mutex_unlock(&kvm->slots_lock);
 
 	if (!r && !write)
 		r =  put_user(addr, uaddr);
@@ -227,7 +233,7 @@ static int vgic_set_common_attr(struct kvm_device *dev,
 		    (val & 31))
 			return -EINVAL;
 
-		mutex_lock(&dev->kvm->lock);
+		mutex_lock(&dev->kvm->arch.config_lock);
 
 		if (vgic_ready(dev->kvm) || dev->kvm->arch.vgic.nr_spis)
 			ret = -EBUSY;
@@ -235,16 +241,16 @@ static int vgic_set_common_attr(struct kvm_device *dev,
 			dev->kvm->arch.vgic.nr_spis =
 				val - VGIC_NR_PRIVATE_IRQS;
 
-		mutex_unlock(&dev->kvm->lock);
+		mutex_unlock(&dev->kvm->arch.config_lock);
 
 		return ret;
 	}
 	case KVM_DEV_ARM_VGIC_GRP_CTRL: {
 		switch (attr->attr) {
 		case KVM_DEV_ARM_VGIC_CTRL_INIT:
-			mutex_lock(&dev->kvm->lock);
+			mutex_lock(&dev->kvm->arch.config_lock);
 			r = vgic_init(dev->kvm);
-			mutex_unlock(&dev->kvm->lock);
+			mutex_unlock(&dev->kvm->arch.config_lock);
 			return r;
 		case KVM_DEV_ARM_VGIC_SAVE_PENDING_TABLES:
 			/*
@@ -260,7 +266,10 @@ static int vgic_set_common_attr(struct kvm_device *dev,
 				mutex_unlock(&dev->kvm->lock);
 				return -EBUSY;
 			}
+
+			mutex_lock(&dev->kvm->arch.config_lock);
 			r = vgic_v3_save_pending_tables(dev->kvm);
+			mutex_unlock(&dev->kvm->arch.config_lock);
 			unlock_all_vcpus(dev->kvm);
 			mutex_unlock(&dev->kvm->lock);
 			return r;
@@ -411,15 +420,17 @@ static int vgic_v2_attr_regs_access(struct kvm_device *dev,
 
 	mutex_lock(&dev->kvm->lock);
 
+	if (!lock_all_vcpus(dev->kvm)) {
+		mutex_unlock(&dev->kvm->lock);
+		return -EBUSY;
+	}
+
+	mutex_lock(&dev->kvm->arch.config_lock);
+
 	ret = vgic_init(dev->kvm);
 	if (ret)
 		goto out;
 
-	if (!lock_all_vcpus(dev->kvm)) {
-		ret = -EBUSY;
-		goto out;
-	}
-
 	switch (attr->group) {
 	case KVM_DEV_ARM_VGIC_GRP_CPU_REGS:
 		ret = vgic_v2_cpuif_uaccess(vcpu, is_write, addr, &val);
@@ -432,8 +443,9 @@ static int vgic_v2_attr_regs_access(struct kvm_device *dev,
 		break;
 	}
 
-	unlock_all_vcpus(dev->kvm);
 out:
+	mutex_unlock(&dev->kvm->arch.config_lock);
+	unlock_all_vcpus(dev->kvm);
 	mutex_unlock(&dev->kvm->lock);
 
 	if (!ret && !is_write)
@@ -569,12 +581,14 @@ static int vgic_v3_attr_regs_access(struct kvm_device *dev,
 
 	mutex_lock(&dev->kvm->lock);
 
-	if (unlikely(!vgic_initialized(dev->kvm))) {
-		ret = -EBUSY;
-		goto out;
+	if (!lock_all_vcpus(dev->kvm)) {
+		mutex_unlock(&dev->kvm->lock);
+		return -EBUSY;
 	}
 
-	if (!lock_all_vcpus(dev->kvm)) {
+	mutex_lock(&dev->kvm->arch.config_lock);
+
+	if (unlikely(!vgic_initialized(dev->kvm))) {
 		ret = -EBUSY;
 		goto out;
 	}
@@ -609,8 +623,9 @@ static int vgic_v3_attr_regs_access(struct kvm_device *dev,
 		break;
 	}
 
-	unlock_all_vcpus(dev->kvm);
 out:
+	mutex_unlock(&dev->kvm->arch.config_lock);
+	unlock_all_vcpus(dev->kvm);
 	mutex_unlock(&dev->kvm->lock);
 
 	if (!ret && uaccess && !is_write) {
diff --git a/arch/arm64/kvm/vgic/vgic-mmio-v3.c b/arch/arm64/kvm/vgic/vgic-mmio-v3.c
index 91201f743033..188d2187eede 100644
--- a/arch/arm64/kvm/vgic/vgic-mmio-v3.c
+++ b/arch/arm64/kvm/vgic/vgic-mmio-v3.c
@@ -111,7 +111,7 @@ static void vgic_mmio_write_v3_misc(struct kvm_vcpu *vcpu,
 	case GICD_CTLR: {
 		bool was_enabled, is_hwsgi;
 
-		mutex_lock(&vcpu->kvm->lock);
+		mutex_lock(&vcpu->kvm->arch.config_lock);
 
 		was_enabled = dist->enabled;
 		is_hwsgi = dist->nassgireq;
@@ -139,7 +139,7 @@ static void vgic_mmio_write_v3_misc(struct kvm_vcpu *vcpu,
 		else if (!was_enabled && dist->enabled)
 			vgic_kick_vcpus(vcpu->kvm);
 
-		mutex_unlock(&vcpu->kvm->lock);
+		mutex_unlock(&vcpu->kvm->arch.config_lock);
 		break;
 	}
 	case GICD_TYPER:
@@ -769,10 +769,13 @@ int vgic_register_redist_iodev(struct kvm_vcpu *vcpu)
 	struct vgic_io_device *rd_dev = &vcpu->arch.vgic_cpu.rd_iodev;
 	struct vgic_redist_region *rdreg;
 	gpa_t rd_base;
-	int ret;
+	int ret = 0;
+
+	lockdep_assert_held(&kvm->slots_lock);
+	mutex_lock(&kvm->arch.config_lock);
 
 	if (!IS_VGIC_ADDR_UNDEF(vgic_cpu->rd_iodev.base_addr))
-		return 0;
+		goto out_unlock;
 
 	/*
 	 * We may be creating VCPUs before having set the base address for the
@@ -782,10 +785,12 @@ int vgic_register_redist_iodev(struct kvm_vcpu *vcpu)
 	 */
 	rdreg = vgic_v3_rdist_free_slot(&vgic->rd_regions);
 	if (!rdreg)
-		return 0;
+		goto out_unlock;
 
-	if (!vgic_v3_check_base(kvm))
-		return -EINVAL;
+	if (!vgic_v3_check_base(kvm)) {
+		ret = -EINVAL;
+		goto out_unlock;
+	}
 
 	vgic_cpu->rdreg = rdreg;
 	vgic_cpu->rdreg_index = rdreg->free_index;
@@ -799,16 +804,20 @@ int vgic_register_redist_iodev(struct kvm_vcpu *vcpu)
 	rd_dev->nr_regions = ARRAY_SIZE(vgic_v3_rd_registers);
 	rd_dev->redist_vcpu = vcpu;
 
-	mutex_lock(&kvm->slots_lock);
+	mutex_unlock(&kvm->arch.config_lock);
+
 	ret = kvm_io_bus_register_dev(kvm, KVM_MMIO_BUS, rd_base,
 				      2 * SZ_64K, &rd_dev->dev);
-	mutex_unlock(&kvm->slots_lock);
-
 	if (ret)
 		return ret;
 
+	/* Protected by slots_lock */
 	rdreg->free_index++;
 	return 0;
+
+out_unlock:
+	mutex_unlock(&kvm->arch.config_lock);
+	return ret;
 }
 
 static void vgic_unregister_redist_iodev(struct kvm_vcpu *vcpu)
@@ -834,12 +843,10 @@ static int vgic_register_all_redist_iodevs(struct kvm *kvm)
 		/* The current c failed, so iterate over the previous ones. */
 		int i;
 
-		mutex_lock(&kvm->slots_lock);
 		for (i = 0; i < c; i++) {
 			vcpu = kvm_get_vcpu(kvm, i);
 			vgic_unregister_redist_iodev(vcpu);
 		}
-		mutex_unlock(&kvm->slots_lock);
 	}
 
 	return ret;
@@ -938,7 +945,9 @@ int vgic_v3_set_redist_base(struct kvm *kvm, u32 index, u64 addr, u32 count)
 {
 	int ret;
 
+	mutex_lock(&kvm->arch.config_lock);
 	ret = vgic_v3_alloc_redist_region(kvm, index, addr, count);
+	mutex_unlock(&kvm->arch.config_lock);
 	if (ret)
 		return ret;
 
@@ -950,8 +959,10 @@ int vgic_v3_set_redist_base(struct kvm *kvm, u32 index, u64 addr, u32 count)
 	if (ret) {
 		struct vgic_redist_region *rdreg;
 
+		mutex_lock(&kvm->arch.config_lock);
 		rdreg = vgic_v3_rdist_region_from_index(kvm, index);
 		vgic_v3_free_redist_region(rdreg);
+		mutex_unlock(&kvm->arch.config_lock);
 		return ret;
 	}
 
diff --git a/arch/arm64/kvm/vgic/vgic-mmio.c b/arch/arm64/kvm/vgic/vgic-mmio.c
index b32d434c1d4a..eb5c58d785b9 100644
--- a/arch/arm64/kvm/vgic/vgic-mmio.c
+++ b/arch/arm64/kvm/vgic/vgic-mmio.c
@@ -527,13 +527,13 @@ unsigned long vgic_mmio_read_active(struct kvm_vcpu *vcpu,
 	u32 intid = VGIC_ADDR_TO_INTID(addr, 1);
 	u32 val;
 
-	mutex_lock(&vcpu->kvm->lock);
+	mutex_lock(&vcpu->kvm->arch.config_lock);
 	vgic_access_active_prepare(vcpu, intid);
 
 	val = __vgic_mmio_read_active(vcpu, addr, len);
 
 	vgic_access_active_finish(vcpu, intid);
-	mutex_unlock(&vcpu->kvm->lock);
+	mutex_unlock(&vcpu->kvm->arch.config_lock);
 
 	return val;
 }
@@ -622,13 +622,13 @@ void vgic_mmio_write_cactive(struct kvm_vcpu *vcpu,
 {
 	u32 intid = VGIC_ADDR_TO_INTID(addr, 1);
 
-	mutex_lock(&vcpu->kvm->lock);
+	mutex_lock(&vcpu->kvm->arch.config_lock);
 	vgic_access_active_prepare(vcpu, intid);
 
 	__vgic_mmio_write_cactive(vcpu, addr, len, val);
 
 	vgic_access_active_finish(vcpu, intid);
-	mutex_unlock(&vcpu->kvm->lock);
+	mutex_unlock(&vcpu->kvm->arch.config_lock);
 }
 
 int vgic_mmio_uaccess_write_cactive(struct kvm_vcpu *vcpu,
@@ -659,13 +659,13 @@ void vgic_mmio_write_sactive(struct kvm_vcpu *vcpu,
 {
 	u32 intid = VGIC_ADDR_TO_INTID(addr, 1);
 
-	mutex_lock(&vcpu->kvm->lock);
+	mutex_lock(&vcpu->kvm->arch.config_lock);
 	vgic_access_active_prepare(vcpu, intid);
 
 	__vgic_mmio_write_sactive(vcpu, addr, len, val);
 
 	vgic_access_active_finish(vcpu, intid);
-	mutex_unlock(&vcpu->kvm->lock);
+	mutex_unlock(&vcpu->kvm->arch.config_lock);
 }
 
 int vgic_mmio_uaccess_write_sactive(struct kvm_vcpu *vcpu,
@@ -1093,7 +1093,6 @@ int vgic_register_dist_iodev(struct kvm *kvm, gpa_t dist_base_address,
 			     enum vgic_type type)
 {
 	struct vgic_io_device *io_device = &kvm->arch.vgic.dist_iodev;
-	int ret = 0;
 	unsigned int len;
 
 	switch (type) {
@@ -1111,10 +1110,6 @@ int vgic_register_dist_iodev(struct kvm *kvm, gpa_t dist_base_address,
 	io_device->iodev_type = IODEV_DIST;
 	io_device->redist_vcpu = NULL;
 
-	mutex_lock(&kvm->slots_lock);
-	ret = kvm_io_bus_register_dev(kvm, KVM_MMIO_BUS, dist_base_address,
-				      len, &io_device->dev);
-	mutex_unlock(&kvm->slots_lock);
-
-	return ret;
+	return kvm_io_bus_register_dev(kvm, KVM_MMIO_BUS, dist_base_address,
+				       len, &io_device->dev);
 }
diff --git a/arch/arm64/kvm/vgic/vgic-v2.c b/arch/arm64/kvm/vgic/vgic-v2.c
index 4e8bb90bd96f..846d6679c510 100644
--- a/arch/arm64/kvm/vgic/vgic-v2.c
+++ b/arch/arm64/kvm/vgic/vgic-v2.c
@@ -312,12 +312,6 @@ int vgic_v2_map_resources(struct kvm *kvm)
 		return ret;
 	}
 
-	ret = vgic_register_dist_iodev(kvm, dist->vgic_dist_base, VGIC_V2);
-	if (ret) {
-		kvm_err("Unable to register VGIC MMIO regions\n");
-		return ret;
-	}
-
 	if (!static_branch_unlikely(&vgic_v2_cpuif_trap)) {
 		ret = kvm_phys_addr_ioremap(kvm, dist->vgic_cpu_base,
 					    kvm_vgic_global_state.vcpu_base,
diff --git a/arch/arm64/kvm/vgic/vgic-v3.c b/arch/arm64/kvm/vgic/vgic-v3.c
index 8469155e08ff..5576c22c7e50 100644
--- a/arch/arm64/kvm/vgic/vgic-v3.c
+++ b/arch/arm64/kvm/vgic/vgic-v3.c
@@ -538,7 +538,6 @@ int vgic_v3_map_resources(struct kvm *kvm)
 {
 	struct vgic_dist *dist = &kvm->arch.vgic;
 	struct kvm_vcpu *vcpu;
-	int ret = 0;
 	unsigned long c;
 
 	kvm_for_each_vcpu(c, vcpu, kvm) {
@@ -568,12 +567,6 @@ int vgic_v3_map_resources(struct kvm *kvm)
 		return -EBUSY;
 	}
 
-	ret = vgic_register_dist_iodev(kvm, dist->vgic_dist_base, VGIC_V3);
-	if (ret) {
-		kvm_err("Unable to register VGICv3 dist MMIO regions\n");
-		return ret;
-	}
-
 	if (kvm_vgic_global_state.has_gicv4_1)
 		vgic_v4_configure_vsgis(kvm);
 
diff --git a/arch/arm64/kvm/vgic/vgic-v4.c b/arch/arm64/kvm/vgic/vgic-v4.c
index a413718be92b..3bb003478060 100644
--- a/arch/arm64/kvm/vgic/vgic-v4.c
+++ b/arch/arm64/kvm/vgic/vgic-v4.c
@@ -232,9 +232,8 @@ int vgic_v4_request_vpe_irq(struct kvm_vcpu *vcpu, int irq)
  * @kvm:	Pointer to the VM being initialized
  *
  * We may be called each time a vITS is created, or when the
- * vgic is initialized. This relies on kvm->lock to be
- * held. In both cases, the number of vcpus should now be
- * fixed.
+ * vgic is initialized. In both cases, the number of vcpus
+ * should now be fixed.
  */
 int vgic_v4_init(struct kvm *kvm)
 {
@@ -243,6 +242,8 @@ int vgic_v4_init(struct kvm *kvm)
 	int nr_vcpus, ret;
 	unsigned long i;
 
+	lockdep_assert_held(&kvm->arch.config_lock);
+
 	if (!kvm_vgic_global_state.has_gicv4)
 		return 0; /* Nothing to see here... move along. */
 
@@ -309,14 +310,14 @@ int vgic_v4_init(struct kvm *kvm)
 /**
  * vgic_v4_teardown - Free the GICv4 data structures
  * @kvm:	Pointer to the VM being destroyed
- *
- * Relies on kvm->lock to be held.
  */
 void vgic_v4_teardown(struct kvm *kvm)
 {
 	struct its_vm *its_vm = &kvm->arch.vgic.its_vm;
 	int i;
 
+	lockdep_assert_held(&kvm->arch.config_lock);
+
 	if (!its_vm->vpes)
 		return;
 
diff --git a/arch/arm64/kvm/vgic/vgic.c b/arch/arm64/kvm/vgic/vgic.c
index 6189ad969675..c613b6aecccb 100644
--- a/arch/arm64/kvm/vgic/vgic.c
+++ b/arch/arm64/kvm/vgic/vgic.c
@@ -24,11 +24,13 @@ struct vgic_global kvm_vgic_global_state __ro_after_init = {
 /*
  * Locking order is always:
  * kvm->lock (mutex)
- *   its->cmd_lock (mutex)
- *     its->its_lock (mutex)
- *       vgic_cpu->ap_list_lock		must be taken with IRQs disabled
- *         kvm->lpi_list_lock		must be taken with IRQs disabled
- *           vgic_irq->irq_lock		must be taken with IRQs disabled
+ *   vcpu->mutex (mutex)
+ *     kvm->arch.config_lock (mutex)
+ *       its->cmd_lock (mutex)
+ *         its->its_lock (mutex)
+ *           vgic_cpu->ap_list_lock		must be taken with IRQs disabled
+ *             kvm->lpi_list_lock		must be taken with IRQs disabled
+ *               vgic_irq->irq_lock		must be taken with IRQs disabled
  *
  * As the ap_list_lock might be taken from the timer interrupt handler,
  * we have to disable IRQs before taking this lock and everything lower
diff --git a/arch/arm64/kvm/vgic/vgic.h b/arch/arm64/kvm/vgic/vgic.h
index d9f54ac08042..4973c8803cab 100644
--- a/arch/arm64/kvm/vgic/vgic.h
+++ b/arch/arm64/kvm/vgic/vgic.h
@@ -6,6 +6,7 @@
 #define __KVM_ARM_VGIC_NEW_H__
 
 #include <linux/irqchip/arm-gic-common.h>
+#include <asm/kvm_mmu.h>
 
 #define PRODUCT_ID_KVM		0x4b	/* ASCII code K */
 #define IMPLEMENTER_ARM		0x43b
@@ -131,6 +132,16 @@ static inline bool vgic_irq_is_multi_sgi(struct vgic_irq *irq)
 	return vgic_irq_get_lr_count(irq) > 1;
 }
 
+static inline int vgic_write_guest_lock(struct kvm *kvm, gpa_t gpa,
+					const void *data, unsigned long len)
+{
+	int ret;
+
+	ret = kvm_write_guest_lock(kvm, gpa, data, len);
+
+	return ret;
+}
+
 /*
  * This struct provides an intermediate representation of the fields contained
  * in the GICH_VMCR and ICH_VMCR registers, such that code exporting the GIC
diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c
index aa55a2a7117e..5003d1309937 100644
--- a/arch/arm64/mm/fault.c
+++ b/arch/arm64/mm/fault.c
@@ -626,8 +626,7 @@ static int __kprobes do_page_fault(unsigned long far, unsigned long esr,
 		vma_end_read(vma);
 		goto lock_mmap;
 	}
-	fault = handle_mm_fault(vma, addr & PAGE_MASK,
-				mm_flags | FAULT_FLAG_VMA_LOCK, regs);
+	fault = handle_mm_fault(vma, addr, mm_flags | FAULT_FLAG_VMA_LOCK, regs);
 	vma_end_read(vma);
 
 	if (!(fault & VM_FAULT_RETRY)) {
diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig
index 15f83e56b501..6307a0128691 100644
--- a/arch/x86/configs/gki_defconfig
+++ b/arch/x86/configs/gki_defconfig
@@ -351,6 +351,8 @@ CONFIG_USB_NET_AQC111=m
 # CONFIG_WLAN_VENDOR_TI is not set
 # CONFIG_WLAN_VENDOR_ZYDAS is not set
 # CONFIG_WLAN_VENDOR_QUANTENNA is not set
+CONFIG_WWAN=m
+# CONFIG_WWAN_DEBUGFS is not set
 CONFIG_INPUT_EVDEV=y
 CONFIG_KEYBOARD_GPIO=y
 # CONFIG_MOUSE_PS2 is not set
@@ -519,6 +521,7 @@ CONFIG_IIO_TRIGGER=y
 CONFIG_POWERCAP=y
 CONFIG_ANDROID_BINDER_IPC=y
 CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_DEBUG_SYMBOLS=y
 CONFIG_ANDROID_VENDOR_HOOKS=y
 CONFIG_ANDROID_DEBUG_KINFO=y
 CONFIG_LIBNVDIMM=y
diff --git a/block/blk-mq.c b/block/blk-mq.c
index e6f6099eb699..fb3377b9b77a 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -1188,8 +1188,9 @@ bool blk_mq_complete_request_remote(struct request *rq)
 	 * or a polled request, always complete locally,
 	 * it's pointless to redirect the completion.
 	 */
-	if (rq->mq_hctx->nr_ctx == 1 ||
-		rq->cmd_flags & REQ_POLLED)
+	if ((rq->mq_hctx->nr_ctx == 1 &&
+	     rq->mq_ctx->cpu == raw_smp_processor_id()) ||
+	     rq->cmd_flags & REQ_POLLED)
 		return false;
 
 	if (blk_mq_complete_need_ipi(rq)) {
diff --git a/build.config.gki.aarch64 b/build.config.gki.aarch64
index 45c5199d471a..d3980621c116 100644
--- a/build.config.gki.aarch64
+++ b/build.config.gki.aarch64
@@ -8,7 +8,6 @@ arch/arm64/boot/Image.gz
 "
 
 BUILD_SYSTEM_DLKM=1
-MODULES_LIST=${ROOT_DIR}/${KERNEL_DIR}/android/gki_system_dlkm_modules
 
 BUILD_GKI_CERTIFICATION_TOOLS=1
 
diff --git a/build.config.gki.riscv64 b/build.config.gki.riscv64
index c216a0472794..91070684eb7a 100644
--- a/build.config.gki.riscv64
+++ b/build.config.gki.riscv64
@@ -8,7 +8,6 @@ arch/riscv/boot/Image.gz
 "
 
 BUILD_SYSTEM_DLKM=1
-MODULES_LIST=${ROOT_DIR}/${KERNEL_DIR}/android/gki_system_dlkm_modules
 
 BUILD_GKI_CERTIFICATION_TOOLS=1
 
diff --git a/build.config.gki.x86_64 b/build.config.gki.x86_64
index 93f492cabec8..20092cc5e122 100644
--- a/build.config.gki.x86_64
+++ b/build.config.gki.x86_64
@@ -3,7 +3,6 @@
 . ${ROOT_DIR}/${KERNEL_DIR}/build.config.gki
 
 BUILD_SYSTEM_DLKM=1
-MODULES_LIST=${ROOT_DIR}/${KERNEL_DIR}/android/gki_system_dlkm_modules
 
 BUILD_GKI_CERTIFICATION_TOOLS=1
 
diff --git a/drivers/android/Kconfig b/drivers/android/Kconfig
index c5e063b723dd..c3a49e538988 100644
--- a/drivers/android/Kconfig
+++ b/drivers/android/Kconfig
@@ -47,6 +47,17 @@ config ANDROID_BINDER_IPC_SELFTEST
 	  exhaustively with combinations of various buffer sizes and
 	  alignments.
 
+config ANDROID_DEBUG_SYMBOLS
+	bool "Android Debug Symbols"
+	help
+	  Enables export of debug symbols that are useful for offline debugging
+	  of a kernel. These symbols would be used in vendor modules to find
+	  addresses of the core kernel symbols for vendor extensions.
+
+	  This driver is statically compiled into kernel and maintains all the
+	  required symbol addresses for vendor modules and provides necessary
+	  interface vendor modules.
+
 config ANDROID_VENDOR_HOOKS
 	bool "Android Vendor Hooks"
 	depends on TRACEPOINTS
diff --git a/drivers/android/Makefile b/drivers/android/Makefile
index 9b89e4ba00a1..97cddb531ee0 100644
--- a/drivers/android/Makefile
+++ b/drivers/android/Makefile
@@ -4,5 +4,6 @@ ccflags-y += -I$(src)			# needed for trace events
 obj-$(CONFIG_ANDROID_BINDERFS)		+= binderfs.o
 obj-$(CONFIG_ANDROID_BINDER_IPC)	+= binder.o binder_alloc.o
 obj-$(CONFIG_ANDROID_BINDER_IPC_SELFTEST) += binder_alloc_selftest.o
+obj-$(CONFIG_ANDROID_DEBUG_SYMBOLS)	+= android_debug_symbols.o
 obj-$(CONFIG_ANDROID_VENDOR_HOOKS) += vendor_hooks.o
 obj-$(CONFIG_ANDROID_DEBUG_KINFO)	+= debug_kinfo.o
diff --git a/drivers/android/android_debug_symbols.c b/drivers/android/android_debug_symbols.c
new file mode 100644
index 000000000000..4c0388575d57
--- /dev/null
+++ b/drivers/android/android_debug_symbols.c
@@ -0,0 +1,96 @@
+// SPDX-License-Identifier: GPL-2.0-only
+
+/*
+ * Copyright (c) 2021, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2023, Unisoc (Shanghai) Technologies Co., Ltd
+ */
+
+#include <linux/types.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/android_debug_symbols.h>
+#include <asm/sections.h>
+#include <asm/stacktrace.h>
+
+#include <linux/cma.h>
+#include <linux/mm.h>
+#include "../../mm/slab.h"
+#include <linux/security.h>
+
+struct ads_entry {
+	char *name;
+	void *addr;
+};
+
+#define _ADS_ENTRY(index, symbol)			\
+	[index] = { .name = #symbol, .addr = (void *)symbol }
+#define ADS_ENTRY(index, symbol) _ADS_ENTRY(index, symbol)
+
+#define _ADS_PER_CPU_ENTRY(index, symbol)			\
+	[index] = { .name = #symbol, .addr = (void *)&symbol }
+#define ADS_PER_CPU_ENTRY(index, symbol) _ADS_PER_CPU_ENTRY(index, symbol)
+
+/*
+ * This module maintains static array of symbol and address information.
+ * Add all required core kernel symbols and their addresses into ads_entries[] array,
+ * so that vendor modules can query and to find address of non-exported symbol.
+ */
+static const struct ads_entry ads_entries[ADS_END] = {
+	ADS_ENTRY(ADS_SDATA, _sdata),
+	ADS_ENTRY(ADS_BSS_END, __bss_stop),
+	ADS_ENTRY(ADS_PER_CPU_START, __per_cpu_start),
+	ADS_ENTRY(ADS_PER_CPU_END, __per_cpu_end),
+	ADS_ENTRY(ADS_TEXT, _text),
+	ADS_ENTRY(ADS_SEND, _end),
+	ADS_ENTRY(ADS_LINUX_BANNER, linux_banner),
+	ADS_ENTRY(ADS_TOTAL_CMA, &totalcma_pages),
+	ADS_ENTRY(ADS_SLAB_CACHES, &slab_caches),
+	ADS_ENTRY(ADS_SLAB_MUTEX, &slab_mutex),
+};
+
+/*
+ * ads_per_cpu_entries array contains all the per_cpu variable address information.
+ */
+static const struct ads_entry ads_per_cpu_entries[ADS_DEBUG_PER_CPU_END] = {
+#ifdef CONFIG_ARM64
+	ADS_PER_CPU_ENTRY(ADS_IRQ_STACK_PTR, irq_stack_ptr),
+#endif
+#ifdef CONFIG_X86
+	ADS_PER_CPU_ENTRY(ADS_IRQ_STACK_PTR, hardirq_stack_ptr),
+#endif
+};
+
+/*
+ * android_debug_symbol - Provide address inforamtion of debug symbol.
+ * @symbol: Index of debug symbol array.
+ *
+ * Return address of core kernel symbol on success and a negative errno will be
+ * returned in error cases.
+ *
+ */
+void *android_debug_symbol(enum android_debug_symbol symbol)
+{
+	if (symbol >= ADS_END)
+		return ERR_PTR(-EINVAL);
+
+	return ads_entries[symbol].addr;
+}
+EXPORT_SYMBOL_NS_GPL(android_debug_symbol, MINIDUMP);
+
+/*
+ * android_debug_per_cpu_symbol - Provide address inforamtion of per cpu debug symbol.
+ * @symbol: Index of per cpu debug symbol array.
+ *
+ * Return address of core kernel symbol on success and a negative errno will be
+ * returned in error cases.
+ *
+ */
+void *android_debug_per_cpu_symbol(enum android_debug_per_cpu_symbol symbol)
+{
+	if (symbol >= ADS_DEBUG_PER_CPU_END)
+		return ERR_PTR(-EINVAL);
+
+	return ads_per_cpu_entries[symbol].addr;
+}
+EXPORT_SYMBOL_NS_GPL(android_debug_per_cpu_symbol, MINIDUMP);
+
diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c
index c2af4cefe2f6..482830505f1b 100644
--- a/drivers/android/vendor_hooks.c
+++ b/drivers/android/vendor_hooks.c
@@ -66,6 +66,7 @@
 #include <trace/hooks/psci.h>
 #include <trace/hooks/psi.h>
 #include <trace/hooks/bl_hib.h>
+#include <trace/hooks/regmap.h>
 
 /*
  * Export tracepoints that act as a bare tracehook (ie: have no trace event
@@ -291,6 +292,7 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_thermal_register);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_thermal_unregister);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_get_thermal_zone_device);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_thermal_power_cap);
+EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_enable_thermal_power_throttle);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_alloc_pages_reclaim_bypass);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_alloc_pages_failure_bypass);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_madvise_pageout_swap_entry);
@@ -307,3 +309,6 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_init_aes_encrypt);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_skip_swap_map_write);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_post_image_save);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_madvise_cold_pageout_skip);
+EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_rmqueue_smallest_bypass);
+EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_free_one_page_bypass);
+EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_regmap_update);
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index e012a4382ea3..f017b457f222 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -293,7 +293,7 @@ static int hid_add_field(struct hid_parser *parser, unsigned report_type, unsign
 	offset = report->size;
 	report->size += parser->global.report_size * parser->global.report_count;
 
-	if (parser->device->ll_driver == &uhid_hid_driver)
+	if (IS_ENABLED(CONFIG_UHID) && parser->device->ll_driver == &uhid_hid_driver)
 		max_buffer_size = UHID_DATA_MAX;
 
 	/* Total size check: Allow for possible report index byte */
@@ -1987,7 +1987,7 @@ int hid_report_raw_event(struct hid_device *hid, enum hid_report_type type, u8 *
 
 	rsize = hid_compute_report_size(report);
 
-	if (hid->ll_driver == &uhid_hid_driver)
+	if (IS_ENABLED(CONFIG_UHID) && hid->ll_driver == &uhid_hid_driver)
 		max_buffer_size = UHID_DATA_MAX;
 
 	if (report_enum->numbered && rsize >= max_buffer_size)
@@ -2398,7 +2398,7 @@ int hid_hw_raw_request(struct hid_device *hdev,
 {
 	unsigned int max_buffer_size = HID_MAX_BUFFER_SIZE;
 
-	if (hdev->ll_driver == &uhid_hid_driver)
+	if (IS_ENABLED(CONFIG_UHID) && hdev->ll_driver == &uhid_hid_driver)
 		max_buffer_size = UHID_DATA_MAX;
 
 	if (len < 1 || len > max_buffer_size || !buf)
@@ -2422,7 +2422,7 @@ int hid_hw_output_report(struct hid_device *hdev, __u8 *buf, size_t len)
 {
 	unsigned int max_buffer_size = HID_MAX_BUFFER_SIZE;
 
-	if (hdev->ll_driver == &uhid_hid_driver)
+	if (IS_ENABLED(CONFIG_UHID) && hdev->ll_driver == &uhid_hid_driver)
 		max_buffer_size = UHID_DATA_MAX;
 
 	if (len < 1 || len > max_buffer_size || !buf)
diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c
index 5d34416b3468..54aeeeb04318 100644
--- a/drivers/iommu/amd/iommu.c
+++ b/drivers/iommu/amd/iommu.c
@@ -2056,7 +2056,7 @@ static struct protection_domain *protection_domain_alloc(unsigned int type)
 {
 	struct io_pgtable_ops *pgtbl_ops;
 	struct protection_domain *domain;
-	int pgtable = amd_iommu_pgtable;
+	int pgtable;
 	int mode = DEFAULT_PGTABLE_LEVEL;
 	int ret;
 
@@ -2073,6 +2073,10 @@ static struct protection_domain *protection_domain_alloc(unsigned int type)
 		mode = PAGE_MODE_NONE;
 	} else if (type == IOMMU_DOMAIN_UNMANAGED) {
 		pgtable = AMD_IOMMU_V1;
+	} else if (type == IOMMU_DOMAIN_DMA || type == IOMMU_DOMAIN_DMA_FQ) {
+		pgtable = amd_iommu_pgtable;
+	} else {
+		return NULL;
 	}
 
 	switch (pgtable) {
diff --git a/drivers/mfd/syscon.c b/drivers/mfd/syscon.c
index bdb2ce7ff03b..0871c97ae51a 100644
--- a/drivers/mfd/syscon.c
+++ b/drivers/mfd/syscon.c
@@ -22,6 +22,7 @@
 #include <linux/regmap.h>
 #include <linux/mfd/syscon.h>
 #include <linux/slab.h>
+#include <trace/hooks/regmap.h>
 
 static struct platform_driver syscon_driver;
 
@@ -128,6 +129,7 @@ static struct syscon *of_syscon_register(struct device_node *np, bool check_clk)
 		}
 	}
 
+	trace_android_vh_regmap_update(&syscon_config, regmap);
 	syscon->regmap = regmap;
 	syscon->np = np;
 
diff --git a/drivers/thermal/gov_power_allocator.c b/drivers/thermal/gov_power_allocator.c
index 5471c9091f5f..b851d7cf0968 100644
--- a/drivers/thermal/gov_power_allocator.c
+++ b/drivers/thermal/gov_power_allocator.c
@@ -704,6 +704,7 @@ static int power_allocator_throttle(struct thermal_zone_device *tz, int trip)
 	int switch_on_temp, control_temp;
 	struct power_allocator_params *params = tz->governor_data;
 	bool update;
+	bool enable = true;
 
 	lockdep_assert_held(&tz->lock);
 
@@ -714,9 +715,11 @@ static int power_allocator_throttle(struct thermal_zone_device *tz, int trip)
 	if (trip != params->trip_max_desired_temperature)
 		return 0;
 
+	trace_android_vh_enable_thermal_power_throttle(&enable);
+
 	ret = tz->ops->get_trip_temp(tz, params->trip_switch_on,
 				     &switch_on_temp);
-	if (!ret && (tz->temperature < switch_on_temp)) {
+	if ((!ret && (tz->temperature < switch_on_temp)) || !enable) {
 		update = (tz->last_temperature >= switch_on_temp);
 		tz->passive = 0;
 		reset_pid_controller(params);
diff --git a/drivers/tty/serial/qcom_geni_serial.c b/drivers/tty/serial/qcom_geni_serial.c
index 591e6b662483..919a61c8538d 100644
--- a/drivers/tty/serial/qcom_geni_serial.c
+++ b/drivers/tty/serial/qcom_geni_serial.c
@@ -1529,7 +1529,7 @@ static int qcom_geni_serial_remove(struct platform_device *pdev)
 	return 0;
 }
 
-static int __maybe_unused qcom_geni_serial_sys_suspend(struct device *dev)
+static int qcom_geni_serial_sys_suspend(struct device *dev)
 {
 	struct qcom_geni_serial_port *port = dev_get_drvdata(dev);
 	struct uart_port *uport = &port->uport;
@@ -1546,7 +1546,7 @@ static int __maybe_unused qcom_geni_serial_sys_suspend(struct device *dev)
 	return uart_suspend_port(private_data->drv, uport);
 }
 
-static int __maybe_unused qcom_geni_serial_sys_resume(struct device *dev)
+static int qcom_geni_serial_sys_resume(struct device *dev)
 {
 	int ret;
 	struct qcom_geni_serial_port *port = dev_get_drvdata(dev);
@@ -1594,10 +1594,12 @@ static int qcom_geni_serial_sys_hib_resume(struct device *dev)
 }
 
 static const struct dev_pm_ops qcom_geni_serial_pm_ops = {
-	SET_SYSTEM_SLEEP_PM_OPS(qcom_geni_serial_sys_suspend,
-					qcom_geni_serial_sys_resume)
-	.restore = qcom_geni_serial_sys_hib_resume,
-	.thaw = qcom_geni_serial_sys_hib_resume,
+	.suspend = pm_sleep_ptr(qcom_geni_serial_sys_suspend),
+	.resume = pm_sleep_ptr(qcom_geni_serial_sys_resume),
+	.freeze = pm_sleep_ptr(qcom_geni_serial_sys_suspend),
+	.poweroff = pm_sleep_ptr(qcom_geni_serial_sys_suspend),
+	.restore = pm_sleep_ptr(qcom_geni_serial_sys_hib_resume),
+	.thaw = pm_sleep_ptr(qcom_geni_serial_sys_hib_resume),
 };
 
 static const struct of_device_id qcom_geni_serial_match_table[] = {
diff --git a/drivers/ufs/core/ufs-mcq.c b/drivers/ufs/core/ufs-mcq.c
index d5445084dfa7..64bad535f79f 100644
--- a/drivers/ufs/core/ufs-mcq.c
+++ b/drivers/ufs/core/ufs-mcq.c
@@ -20,12 +20,10 @@
 #define MAX_QUEUE_SUP GENMASK(7, 0)
 #define UFS_MCQ_MIN_RW_QUEUES 2
 #define UFS_MCQ_MIN_READ_QUEUES 0
-#define UFS_MCQ_NUM_DEV_CMD_QUEUES 1
 #define UFS_MCQ_MIN_POLL_QUEUES 0
 #define QUEUE_EN_OFFSET 31
 #define QUEUE_ID_OFFSET 16
 
-#define MAX_DEV_CMD_ENTRIES	2
 #define MCQ_CFG_MAC_MASK	GENMASK(16, 8)
 #define MCQ_QCFG_SIZE		0x40
 #define MCQ_ENTRY_SIZE_IN_DWORD	8
@@ -99,6 +97,7 @@ void ufshcd_mcq_config_mac(struct ufs_hba *hba, u32 max_active_cmds)
 	val |= FIELD_PREP(MCQ_CFG_MAC_MASK, max_active_cmds);
 	ufshcd_writel(hba, val, REG_UFS_MCQ_CFG);
 }
+EXPORT_SYMBOL_GPL(ufshcd_mcq_config_mac);
 
 /**
  * ufshcd_mcq_req_to_hwq - find the hardware queue on which the
@@ -115,8 +114,7 @@ struct ufs_hw_queue *ufshcd_mcq_req_to_hwq(struct ufs_hba *hba,
 	u32 utag = blk_mq_unique_tag(req);
 	u32 hwq = blk_mq_unique_tag_to_hwq(utag);
 
-	/* uhq[0] is used to serve device commands */
-	return &hba->uhq[hwq + UFSHCD_MCQ_IO_QUEUE_OFFSET];
+	return &hba->uhq[hwq];
 }
 
 /**
@@ -160,8 +158,7 @@ static int ufshcd_mcq_config_nr_queues(struct ufs_hba *hba)
 	/* maxq is 0 based value */
 	hba_maxq = FIELD_GET(MAX_QUEUE_SUP, hba->mcq_capabilities) + 1;
 
-	tot_queues = UFS_MCQ_NUM_DEV_CMD_QUEUES + read_queues + poll_queues +
-			rw_queues;
+	tot_queues = read_queues + poll_queues + rw_queues;
 
 	if (hba_maxq < tot_queues) {
 		dev_err(hba->dev, "Total queues (%d) exceeds HC capacity (%d)\n",
@@ -169,7 +166,7 @@ static int ufshcd_mcq_config_nr_queues(struct ufs_hba *hba)
 		return -EOPNOTSUPP;
 	}
 
-	rem = hba_maxq - UFS_MCQ_NUM_DEV_CMD_QUEUES;
+	rem = hba_maxq;
 
 	if (rw_queues) {
 		hba->nr_queues[HCTX_TYPE_DEFAULT] = rw_queues;
@@ -195,7 +192,7 @@ static int ufshcd_mcq_config_nr_queues(struct ufs_hba *hba)
 	for (i = 0; i < HCTX_MAX_TYPES; i++)
 		host->nr_hw_queues += hba->nr_queues[i];
 
-	hba->nr_hw_queues = host->nr_hw_queues + UFS_MCQ_NUM_DEV_CMD_QUEUES;
+	hba->nr_hw_queues = host->nr_hw_queues;
 	return 0;
 }
 
@@ -249,6 +246,7 @@ u32 ufshcd_mcq_read_cqis(struct ufs_hba *hba, int i)
 {
 	return readl(mcq_opr_base(hba, OPR_CQIS, i) + REG_CQIS);
 }
+EXPORT_SYMBOL_GPL(ufshcd_mcq_read_cqis);
 
 void ufshcd_mcq_write_cqis(struct ufs_hba *hba, u32 val, int i)
 {
@@ -402,6 +400,7 @@ void ufshcd_mcq_make_queues_operational(struct ufs_hba *hba)
 			      MCQ_CFG_n(REG_SQATTR, i));
 	}
 }
+EXPORT_SYMBOL_GPL(ufshcd_mcq_make_queues_operational);
 
 void ufshcd_mcq_enable_esi(struct ufs_hba *hba)
 {
@@ -455,8 +454,6 @@ int ufshcd_mcq_init(struct ufs_hba *hba)
 
 	/* The very first HW queue serves device commands */
 	hba->dev_cmd_queue = &hba->uhq[0];
-	/* Give dev_cmd_queue the minimal number of entries */
-	hba->dev_cmd_queue->max_entries = MAX_DEV_CMD_ENTRIES;
 
 	host->host_tagset = 1;
 	return 0;
diff --git a/drivers/ufs/core/ufshcd-priv.h b/drivers/ufs/core/ufshcd-priv.h
index 2541a52ecb8b..83cf0a47ec14 100644
--- a/drivers/ufs/core/ufshcd-priv.h
+++ b/drivers/ufs/core/ufshcd-priv.h
@@ -84,7 +84,6 @@ int ufshcd_try_to_abort_task(struct ufs_hba *hba, int tag);
 void ufshcd_release_scsi_cmd(struct ufs_hba *hba,
 			     struct ufshcd_lrb *lrbp);
 
-#define UFSHCD_MCQ_IO_QUEUE_OFFSET	1
 #define SD_ASCII_STD true
 #define SD_RAW false
 int ufshcd_read_string_desc(struct ufs_hba *hba, u8 desc_index,
diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
index 646a1e9ca0a8..51d8220051a1 100644
--- a/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@ -3166,7 +3166,7 @@ static int ufshcd_wait_for_dev_cmd(struct ufs_hba *hba,
 		 * not trigger any race conditions.
 		 */
 		hba->dev_cmd.complete = NULL;
-		err = ufshcd_get_tr_ocs(lrbp, hba->dev_cmd.cqe);
+		err = ufshcd_get_tr_ocs(lrbp, NULL);
 		if (!err)
 			err = ufshcd_dev_cmd_completion(hba, lrbp);
 	} else {
@@ -3262,7 +3262,6 @@ static int ufshcd_exec_dev_cmd(struct ufs_hba *hba,
 		goto out;
 
 	hba->dev_cmd.complete = &wait;
-	hba->dev_cmd.cqe = NULL;
 
 	ufshcd_add_query_upiu_trace(hba, UFS_QUERY_SEND, lrbp->ucd_req_ptr);
 
@@ -5520,6 +5519,7 @@ void ufshcd_compl_one_cqe(struct ufs_hba *hba, int task_tag,
 {
 	struct ufshcd_lrb *lrbp;
 	struct scsi_cmnd *cmd;
+	enum utp_ocs ocs;
 
 	lrbp = &hba->lrb[task_tag];
 	lrbp->compl_time_stamp = ktime_get();
@@ -5538,7 +5538,11 @@ void ufshcd_compl_one_cqe(struct ufs_hba *hba, int task_tag,
 		   lrbp->command_type == UTP_CMD_TYPE_UFS_STORAGE) {
 		if (hba->dev_cmd.complete) {
 			trace_android_vh_ufs_compl_command(hba, lrbp);
-			hba->dev_cmd.cqe = cqe;
+			if (cqe) {
+				ocs = le32_to_cpu(cqe->status) & MASK_OCS;
+				lrbp->utr_descriptor_ptr->header.dword_2 =
+					cpu_to_le32(ocs);
+			}
 			ufshcd_add_command_trace(hba, task_tag, UFS_DEV_COMP);
 			complete(hba->dev_cmd.complete);
 			ufshcd_clk_scaling_update_busy(hba);
@@ -5592,7 +5596,7 @@ static int ufshcd_poll(struct Scsi_Host *shost, unsigned int queue_num)
 	struct ufs_hw_queue *hwq;
 
 	if (is_mcq_enabled(hba)) {
-		hwq = &hba->uhq[queue_num + UFSHCD_MCQ_IO_QUEUE_OFFSET];
+		hwq = &hba->uhq[queue_num];
 
 		return ufshcd_mcq_poll_cqe_lock(hba, hwq);
 	}
@@ -5646,7 +5650,7 @@ static void ufshcd_mcq_compl_pending_transfer(struct ufs_hba *hba,
 
 		utag = blk_mq_unique_tag(scsi_cmd_to_rq(cmd));
 		hwq_num = blk_mq_unique_tag_to_hwq(utag);
-		hwq = &hba->uhq[hwq_num + UFSHCD_MCQ_IO_QUEUE_OFFSET];
+		hwq = &hba->uhq[hwq_num];
 
 		if (force_compl) {
 			ufshcd_mcq_compl_all_cqes_lock(hba, hwq);
diff --git a/drivers/ufs/host/ufs-mediatek.c b/drivers/ufs/host/ufs-mediatek.c
index 1541917939ff..603183082a56 100644
--- a/drivers/ufs/host/ufs-mediatek.c
+++ b/drivers/ufs/host/ufs-mediatek.c
@@ -27,8 +27,14 @@
 #include <ufs/unipro.h>
 #include "ufs-mediatek.h"
 
+static int  ufs_mtk_config_mcq(struct ufs_hba *hba, bool irq);
+
 #define CREATE_TRACE_POINTS
 #include "ufs-mediatek-trace.h"
+#undef CREATE_TRACE_POINTS
+
+#define MAX_SUPP_MAC 64
+#define MCQ_QUEUE_OFFSET(c) ((((c) >> 16) & 0xFF) * 0x200)
 
 static const struct ufs_dev_quirk ufs_mtk_dev_fixups[] = {
 	{ .wmanufacturerid = UFS_ANY_VENDOR,
@@ -843,6 +849,38 @@ static void ufs_mtk_vreg_fix_vccqx(struct ufs_hba *hba)
 	}
 }
 
+static void ufs_mtk_init_mcq_irq(struct ufs_hba *hba)
+{
+	struct ufs_mtk_host *host = ufshcd_get_variant(hba);
+	struct platform_device *pdev;
+	int i;
+	int irq;
+
+	host->mcq_nr_intr = UFSHCD_MAX_Q_NR;
+	pdev = container_of(hba->dev, struct platform_device, dev);
+
+	for (i = 0; i < host->mcq_nr_intr; i++) {
+		/* irq index 0 is legacy irq, sq/cq irq start from index 1 */
+		irq = platform_get_irq(pdev, i + 1);
+		if (irq < 0) {
+			host->mcq_intr_info[i].irq = MTK_MCQ_INVALID_IRQ;
+			dev_err(hba->dev, "get platform mcq irq fail: %d\n", i);
+			goto failed;
+		}
+		host->mcq_intr_info[i].hba = hba;
+		host->mcq_intr_info[i].irq = irq;
+		dev_info(hba->dev, "get platform mcq irq: %d, %d\n", i, irq);
+	}
+
+	return;
+failed:
+       /* invalidate irq info */
+	for (i = 0; i < host->mcq_nr_intr; i++)
+		host->mcq_intr_info[i].irq = MTK_MCQ_INVALID_IRQ;
+
+	host->mcq_nr_intr = 0;
+}
+
 /**
  * ufs_mtk_init - find other essential mmio bases
  * @hba: host controller instance
@@ -879,6 +917,8 @@ static int ufs_mtk_init(struct ufs_hba *hba)
 	/* Initialize host capability */
 	ufs_mtk_init_host_caps(hba);
 
+	ufs_mtk_init_mcq_irq(hba);
+
 	err = ufs_mtk_bind_mphy(hba);
 	if (err)
 		goto out_variant_clear;
@@ -1176,7 +1216,17 @@ static int ufs_mtk_link_set_hpm(struct ufs_hba *hba)
 	else
 		return err;
 
-	err = ufshcd_make_hba_operational(hba);
+	if (!hba->mcq_enabled) {
+		err = ufshcd_make_hba_operational(hba);
+	} else {
+		ufs_mtk_config_mcq(hba, false);
+		ufshcd_mcq_make_queues_operational(hba);
+		ufshcd_mcq_config_mac(hba, hba->nutrs);
+		/* Enable MCQ mode */
+		ufshcd_writel(hba, ufshcd_readl(hba, REG_UFS_MEM_CFG) | 0x1,
+			      REG_UFS_MEM_CFG);
+	}
+
 	if (err)
 		return err;
 
@@ -1500,6 +1550,121 @@ static int ufs_mtk_clk_scale_notify(struct ufs_hba *hba, bool scale_up,
 	return 0;
 }
 
+static int ufs_mtk_get_hba_mac(struct ufs_hba *hba)
+{
+	return MAX_SUPP_MAC;
+}
+
+static int ufs_mtk_op_runtime_config(struct ufs_hba *hba)
+{
+	struct ufshcd_mcq_opr_info_t *opr;
+	int i;
+
+	hba->mcq_opr[OPR_SQD].offset = REG_UFS_MTK_SQD;
+	hba->mcq_opr[OPR_SQIS].offset = REG_UFS_MTK_SQIS;
+	hba->mcq_opr[OPR_CQD].offset = REG_UFS_MTK_CQD;
+	hba->mcq_opr[OPR_CQIS].offset = REG_UFS_MTK_CQIS;
+
+	for (i = 0; i < OPR_MAX; i++) {
+		opr = &hba->mcq_opr[i];
+		opr->stride = REG_UFS_MCQ_STRIDE;
+		opr->base = hba->mmio_base + opr->offset;
+	}
+
+	return 0;
+}
+
+static int ufs_mtk_mcq_config_resource(struct ufs_hba *hba)
+{
+	struct ufs_mtk_host *host = ufshcd_get_variant(hba);
+
+	/* fail mcq initialization if interrupt is not filled properly */
+	if (!host->mcq_nr_intr) {
+		dev_info(hba->dev, "IRQs not ready. MCQ disabled.");
+		return -EINVAL;
+	}
+
+	hba->mcq_base = hba->mmio_base + MCQ_QUEUE_OFFSET(hba->mcq_capabilities);
+	return 0;
+}
+
+static irqreturn_t ufs_mtk_mcq_intr(int irq, void *__intr_info)
+{
+	struct ufs_mtk_mcq_intr_info *mcq_intr_info = __intr_info;
+	struct ufs_hba *hba = mcq_intr_info->hba;
+	struct ufs_hw_queue *hwq;
+	u32 events;
+	int qid = mcq_intr_info->qid;
+
+	hwq = &hba->uhq[qid];
+
+	events = ufshcd_mcq_read_cqis(hba, qid);
+	if (events)
+		ufshcd_mcq_write_cqis(hba, events, qid);
+
+	if (events & UFSHCD_MCQ_CQIS_TAIL_ENT_PUSH_STS)
+		ufshcd_mcq_poll_cqe_lock(hba, hwq);
+
+	return IRQ_HANDLED;
+}
+
+static int ufs_mtk_config_mcq_irq(struct ufs_hba *hba)
+{
+	struct ufs_mtk_host *host = ufshcd_get_variant(hba);
+	u32 irq, i;
+	int ret;
+
+	for (i = 0; i < host->mcq_nr_intr; i++) {
+		irq = host->mcq_intr_info[i].irq;
+		if (irq == MTK_MCQ_INVALID_IRQ) {
+			dev_err(hba->dev, "invalid irq. %d\n", i);
+			return -ENOPARAM;
+		}
+
+		host->mcq_intr_info[i].qid = i;
+		ret = devm_request_irq(hba->dev, irq, ufs_mtk_mcq_intr, 0, UFSHCD,
+				       &host->mcq_intr_info[i]);
+
+		dev_dbg(hba->dev, "request irq %d intr %s\n", irq, ret ? "failed" : "");
+
+		if (ret) {
+			dev_err(hba->dev, "Cannot request irq %d\n", ret);
+			return ret;
+		}
+	}
+
+	return 0;
+}
+
+static int ufs_mtk_config_mcq(struct ufs_hba *hba, bool irq)
+{
+	struct ufs_mtk_host *host = ufshcd_get_variant(hba);
+	int ret = 0;
+
+	if (!host->mcq_set_intr) {
+		/* Disable irq option register */
+		ufshcd_rmwl(hba, MCQ_INTR_EN_MSK, 0, REG_UFS_MMIO_OPT_CTRL_0);
+
+		if (irq) {
+			ret = ufs_mtk_config_mcq_irq(hba);
+			if (ret)
+				return ret;
+		}
+
+		host->mcq_set_intr = true;
+	}
+
+	ufshcd_rmwl(hba, MCQ_AH8, MCQ_AH8, REG_UFS_MMIO_OPT_CTRL_0);
+	ufshcd_rmwl(hba, MCQ_INTR_EN_MSK, MCQ_MULTI_INTR_EN, REG_UFS_MMIO_OPT_CTRL_0);
+
+	return 0;
+}
+
+static int ufs_mtk_config_esi(struct ufs_hba *hba)
+{
+	return ufs_mtk_config_mcq(hba, true);
+}
+
 /*
  * struct ufs_hba_mtk_vops - UFS MTK specific variant operations
  *
@@ -1523,6 +1688,11 @@ static const struct ufs_hba_variant_ops ufs_hba_mtk_vops = {
 	.event_notify        = ufs_mtk_event_notify,
 	.config_scaling_param = ufs_mtk_config_scaling_param,
 	.clk_scale_notify    = ufs_mtk_clk_scale_notify,
+	/* mcq vops */
+	.get_hba_mac         = ufs_mtk_get_hba_mac,
+	.op_runtime_config   = ufs_mtk_op_runtime_config,
+	.mcq_config_resource = ufs_mtk_mcq_config_resource,
+	.config_esi          = ufs_mtk_config_esi,
 };
 
 /**
@@ -1569,7 +1739,7 @@ static int ufs_mtk_probe(struct platform_device *pdev)
 
 out:
 	if (err)
-		dev_info(dev, "probe failed %d\n", err);
+		dev_err(dev, "probe failed %d\n", err);
 
 	of_node_put(reset_node);
 	return err;
diff --git a/drivers/ufs/host/ufs-mediatek.h b/drivers/ufs/host/ufs-mediatek.h
index 2fc6d7b87694..f76e80d91729 100644
--- a/drivers/ufs/host/ufs-mediatek.h
+++ b/drivers/ufs/host/ufs-mediatek.h
@@ -10,11 +10,27 @@
 #include <linux/pm_qos.h>
 #include <linux/soc/mediatek/mtk_sip_svc.h>
 
+/*
+ * MCQ define and struct
+ */
+#define UFSHCD_MAX_Q_NR 8
+#define MTK_MCQ_INVALID_IRQ	0xFFFF
+
+/* REG_UFS_MMIO_OPT_CTRL_0 160h */
+#define EHS_EN                  BIT(0)
+#define PFM_IMPV                BIT(1)
+#define MCQ_MULTI_INTR_EN       BIT(2)
+#define MCQ_CMB_INTR_EN         BIT(3)
+#define MCQ_AH8                 BIT(4)
+
+#define MCQ_INTR_EN_MSK         (MCQ_MULTI_INTR_EN | MCQ_CMB_INTR_EN)
+
 /*
  * Vendor specific UFSHCI Registers
  */
 #define REG_UFS_XOUFS_CTRL          0x140
 #define REG_UFS_REFCLK_CTRL         0x144
+#define REG_UFS_MMIO_OPT_CTRL_0     0x160
 #define REG_UFS_EXTREG              0x2100
 #define REG_UFS_MPHYCTRL            0x2200
 #define REG_UFS_MTK_IP_VER          0x2240
@@ -26,6 +42,13 @@
 #define REG_UFS_DEBUG_SEL_B2        0x22D8
 #define REG_UFS_DEBUG_SEL_B3        0x22DC
 
+#define REG_UFS_MTK_SQD             0x2800
+#define REG_UFS_MTK_SQIS            0x2814
+#define REG_UFS_MTK_CQD             0x281C
+#define REG_UFS_MTK_CQIS            0x2824
+
+#define REG_UFS_MCQ_STRIDE          0x30
+
 /*
  * Ref-clk control
  *
@@ -136,6 +159,12 @@ struct ufs_mtk_hw_ver {
 	u8 major;
 };
 
+struct ufs_mtk_mcq_intr_info {
+	struct ufs_hba *hba;
+	u32 irq;
+	u8 qid;
+};
+
 struct ufs_mtk_host {
 	struct phy *mphy;
 	struct pm_qos_request pm_qos_req;
@@ -155,6 +184,10 @@ struct ufs_mtk_host {
 	u16 ref_clk_ungating_wait_us;
 	u16 ref_clk_gating_wait_us;
 	u32 ip_ver;
+
+	bool mcq_set_intr;
+	int mcq_nr_intr;
+	struct ufs_mtk_mcq_intr_info mcq_intr_info[UFSHCD_MAX_Q_NR];
 };
 
 /*
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index 6c63777f9426..d7cf2bb944cf 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -2652,11 +2652,25 @@ static int dwc3_gadget_pullup(struct usb_gadget *g, int is_on)
 
 	synchronize_irq(dwc->irq_gadget);
 
-	if (!is_on)
+	if (!is_on) {
 		ret = dwc3_gadget_soft_disconnect(dwc);
-	else
-		ret = dwc3_gadget_soft_connect(dwc);
+	} else {
+		/*
+		 * In the Synopsys DWC_usb31 1.90a programming guide section
+		 * 4.1.9, it specifies that for a reconnect after a
+		 * device-initiated disconnect requires a core soft reset
+		 * (DCTL.CSftRst) before enabling the run/stop bit.
+		 */
+		ret = dwc3_core_soft_reset(dwc);
+		if (ret)
+			goto done;
 
+		dwc3_event_buffers_setup(dwc);
+		__dwc3_gadget_start(dwc);
+		ret = dwc3_gadget_run_stop(dwc, true);
+	}
+
+done:
 	pm_runtime_put(dwc->dev);
 
 	return ret;
diff --git a/drivers/usb/gadget/udc/core.c b/drivers/usb/gadget/udc/core.c
index 99f40611f459..9568b13c05f4 100644
--- a/drivers/usb/gadget/udc/core.c
+++ b/drivers/usb/gadget/udc/core.c
@@ -1094,12 +1094,16 @@ EXPORT_SYMBOL_GPL(usb_gadget_set_state);
 /* ------------------------------------------------------------------------- */
 
 /* Acquire connect_lock before calling this function. */
-static void usb_udc_connect_control_locked(struct usb_udc *udc) __must_hold(&udc->connect_lock)
+static int usb_udc_connect_control_locked(struct usb_udc *udc) __must_hold(&udc->connect_lock)
 {
+	int ret;
+
 	if (udc->vbus)
-		usb_gadget_connect_locked(udc->gadget);
+		ret = usb_gadget_connect_locked(udc->gadget);
 	else
-		usb_gadget_disconnect_locked(udc->gadget);
+		ret = usb_gadget_disconnect_locked(udc->gadget);
+
+	return ret;
 }
 
 static void vbus_event_work(struct work_struct *work)
@@ -1573,12 +1577,21 @@ static int gadget_bind_driver(struct device *dev)
 	}
 	usb_gadget_enable_async_callbacks(udc);
 	udc->allow_connect = true;
-	usb_udc_connect_control_locked(udc);
+	ret = usb_udc_connect_control_locked(udc);
+	if (ret)
+		goto err_connect_control;
+
 	mutex_unlock(&udc->connect_lock);
 
 	kobject_uevent(&udc->dev.kobj, KOBJ_CHANGE);
 	return 0;
 
+ err_connect_control:
+	usb_gadget_disable_async_callbacks(udc);
+	if (gadget->irq)
+		synchronize_irq(gadget->irq);
+	usb_gadget_udc_stop_locked(udc);
+
  err_start:
 	driver->unbind(udc->gadget);
 
diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
index 2ef716fc3212..42909318609c 100644
--- a/drivers/usb/host/xhci-plat.c
+++ b/drivers/usb/host/xhci-plat.c
@@ -436,8 +436,8 @@ static int xhci_plat_remove(struct platform_device *dev)
 	struct clk *reg_clk = xhci->reg_clk;
 	struct usb_hcd *shared_hcd = xhci->shared_hcd;
 
-	pm_runtime_get_sync(&dev->dev);
 	xhci->xhc_state |= XHCI_STATE_REMOVING;
+	pm_runtime_get_sync(&dev->dev);
 
 	if (shared_hcd) {
 		usb_remove_hcd(shared_hcd);
@@ -453,7 +453,6 @@ static int xhci_plat_remove(struct platform_device *dev)
 
 	xhci_vendor_cleanup(xhci);
 
-	usb_put_hcd(shared_hcd);
 	clk_disable_unprepare(clk);
 	clk_disable_unprepare(reg_clk);
 	usb_put_hcd(hcd);
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 37150680cc41..9304e0d42982 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -1194,7 +1194,8 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated)
 	temp = readl(&xhci->op_regs->status);
 
 	/* re-initialize the HC on Restore Error, or Host Controller Error */
-	if (temp & (STS_SRE | STS_HCE)) {
+	if ((temp & (STS_SRE | STS_HCE)) &&
+	    !(xhci->xhc_state & XHCI_STATE_REMOVING)) {
 		reinit_xhc = true;
 		if (!xhci->broken_suspend)
 			xhci_warn(xhci, "xHC error in resume, USBSTS 0x%x, Reinit\n", temp);
diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
index dbeba641e8e1..7e5cf6ad99b6 100644
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@ -2296,6 +2296,11 @@ struct xhci_vendor_ops {
 	void (*alloc_container_ctx)(struct xhci_hcd *xhci, struct xhci_container_ctx *ctx,
 				    int type, gfp_t flags);
 	void (*free_container_ctx)(struct xhci_hcd *xhci, struct xhci_container_ctx *ctx);
+
+	ANDROID_KABI_RESERVE(1);
+	ANDROID_KABI_RESERVE(2);
+	ANDROID_KABI_RESERVE(3);
+	ANDROID_KABI_RESERVE(4);
 };
 
 struct xhci_vendor_ops *xhci_vendor_get_ops(struct xhci_hcd *xhci);
diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c
index 887e55988450..d635c58cf5a3 100644
--- a/fs/f2fs/dir.c
+++ b/fs/f2fs/dir.c
@@ -775,8 +775,15 @@ int f2fs_add_dentry(struct inode *dir, const struct f2fs_filename *fname,
 {
 	int err = -EAGAIN;
 
-	if (f2fs_has_inline_dentry(dir))
+	if (f2fs_has_inline_dentry(dir)) {
+		/*
+		 * Should get i_xattr_sem to keep the lock order:
+		 * i_xattr_sem -> inode_page lock used by f2fs_setxattr.
+		 */
+		f2fs_down_read(&F2FS_I(dir)->i_xattr_sem);
 		err = f2fs_add_inline_entry(dir, fname, inode, ino, mode);
+		f2fs_up_read(&F2FS_I(dir)->i_xattr_sem);
+	}
 	if (err == -EAGAIN)
 		err = f2fs_add_regular_entry(dir, fname, inode, ino, mode);
 
diff --git a/fs/f2fs/xattr.c b/fs/f2fs/xattr.c
index dc2e8637189e..db3b641f2158 100644
--- a/fs/f2fs/xattr.c
+++ b/fs/f2fs/xattr.c
@@ -527,10 +527,12 @@ int f2fs_getxattr(struct inode *inode, int index, const char *name,
 	if (len > F2FS_NAME_LEN)
 		return -ERANGE;
 
-	f2fs_down_read(&F2FS_I(inode)->i_xattr_sem);
+	if (!ipage)
+		f2fs_down_read(&F2FS_I(inode)->i_xattr_sem);
 	error = lookup_all_xattrs(inode, ipage, index, len, name,
 				&entry, &base_addr, &base_size, &is_inline);
-	f2fs_up_read(&F2FS_I(inode)->i_xattr_sem);
+	if (!ipage)
+		f2fs_up_read(&F2FS_I(inode)->i_xattr_sem);
 	if (error)
 		return error;
 
diff --git a/fs/fuse/backing.c b/fs/fuse/backing.c
index 269a4dfd76d8..931c3397133c 100644
--- a/fs/fuse/backing.c
+++ b/fs/fuse/backing.c
@@ -295,44 +295,19 @@ void *fuse_create_open_finalize(
 }
 
 int fuse_release_initialize(struct fuse_bpf_args *fa, struct fuse_release_in *fri,
-			    struct inode *inode, struct file *file)
+			    struct inode *inode, struct fuse_file *ff)
 {
-	struct fuse_file *fuse_file = file->private_data;
-
 	/* Always put backing file whatever bpf/userspace says */
-	fput(fuse_file->backing_file);
+	fput(ff->backing_file);
 
 	*fri = (struct fuse_release_in) {
-		.fh = ((struct fuse_file *)(file->private_data))->fh,
+		.fh = ff->fh,
 	};
 
 	*fa = (struct fuse_bpf_args) {
 		.nodeid = get_fuse_inode(inode)->nodeid,
-		.opcode = FUSE_RELEASE,
-		.in_numargs = 1,
-		.in_args[0].size = sizeof(*fri),
-		.in_args[0].value = fri,
-	};
-
-	return 0;
-}
-
-int fuse_releasedir_initialize(struct fuse_bpf_args *fa,
-			struct fuse_release_in *fri,
-			struct inode *inode, struct file *file)
-{
-	struct fuse_file *fuse_file = file->private_data;
-
-	/* Always put backing file whatever bpf/userspace says */
-	fput(fuse_file->backing_file);
-
-	*fri = (struct fuse_release_in) {
-		.fh = ((struct fuse_file *)(file->private_data))->fh,
-	};
-
-	*fa = (struct fuse_bpf_args) {
-		.nodeid = get_fuse_inode(inode)->nodeid,
-		.opcode = FUSE_RELEASEDIR,
+		.opcode = S_ISDIR(inode->i_mode) ? FUSE_RELEASEDIR
+						 : FUSE_RELEASE,
 		.in_numargs = 1,
 		.in_args[0].size = sizeof(*fri),
 		.in_args[0].value = fri,
@@ -342,15 +317,14 @@ int fuse_releasedir_initialize(struct fuse_bpf_args *fa,
 }
 
 int fuse_release_backing(struct fuse_bpf_args *fa,
-			 struct inode *inode, struct file *file)
+			 struct inode *inode, struct fuse_file *ff)
 {
 	return 0;
 }
 
 void *fuse_release_finalize(struct fuse_bpf_args *fa,
-			    struct inode *inode, struct file *file)
+			    struct inode *inode, struct fuse_file *ff)
 {
-	fuse_file_free(file->private_data);
 	return NULL;
 }
 
@@ -992,6 +966,20 @@ void *fuse_file_write_iter_finalize(struct fuse_bpf_args *fa,
 	return ERR_PTR(fwio->ret);
 }
 
+int fuse_file_flock_backing(struct file *file, int cmd, struct file_lock *fl)
+{
+	struct fuse_file *ff = file->private_data;
+	struct file *backing_file = ff->backing_file;
+	int error;
+
+	fl->fl_file = backing_file;
+	if (backing_file->f_op->flock)
+		error = backing_file->f_op->flock(backing_file, cmd, fl);
+	else
+		error = locks_lock_file_wait(backing_file, fl);
+	return error;
+}
+
 ssize_t fuse_backing_mmap(struct file *file, struct vm_area_struct *vma)
 {
 	int ret;
@@ -1224,14 +1212,12 @@ int fuse_handle_bpf_prog(struct fuse_entry_bpf *feb, struct inode *parent,
 	}
 
 	/* Cannot change existing program */
-	if (*bpf && new_bpf) {
-		bpf_prog_put(new_bpf);
+	if (*bpf) {
+		if (new_bpf)
+			bpf_prog_put(new_bpf);
 		return new_bpf == *bpf ? 0 : -EINVAL;
 	}
 
-	if (*bpf)
-		bpf_prog_put(*bpf);
-
 	*bpf = new_bpf;
 	return 0;
 }
diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index dd184a36dc55..933e4a727505 100644
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -1790,17 +1790,6 @@ static int fuse_dir_open(struct inode *inode, struct file *file)
 
 static int fuse_dir_release(struct inode *inode, struct file *file)
 {
-#ifdef CONFIG_FUSE_BPF
-	struct fuse_err_ret fer;
-
-	fer = fuse_bpf_backing(inode, struct fuse_release_in,
-		       fuse_releasedir_initialize, fuse_release_backing,
-		       fuse_release_finalize,
-		       inode, file);
-	if (fer.ret)
-		return PTR_ERR(fer.result);
-#endif
-
 	fuse_release_common(file, true);
 	return 0;
 }
diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index d37f90b3c59f..6608de8bea12 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -104,25 +104,39 @@ static void fuse_release_end(struct fuse_mount *fm, struct fuse_args *args,
 	kfree(ra);
 }
 
-static void fuse_file_put(struct fuse_file *ff, bool sync, bool isdir)
+static void fuse_file_put(struct inode *inode, struct fuse_file *ff,
+			  bool sync, bool isdir)
 {
-	if (refcount_dec_and_test(&ff->count)) {
-		struct fuse_args *args = &ff->release_args->args;
+	struct fuse_args *args = &ff->release_args->args;
+#ifdef CONFIG_FUSE_BPF
+	struct fuse_err_ret fer;
+#endif
 
-		if (isdir ? ff->fm->fc->no_opendir : ff->fm->fc->no_open) {
-			/* Do nothing when client does not implement 'open' */
-			fuse_release_end(ff->fm, args, 0);
-		} else if (sync) {
-			fuse_simple_request(ff->fm, args);
-			fuse_release_end(ff->fm, args, 0);
-		} else {
-			args->end = fuse_release_end;
-			if (fuse_simple_background(ff->fm, args,
-						   GFP_KERNEL | __GFP_NOFAIL))
-				fuse_release_end(ff->fm, args, -ENOTCONN);
-		}
-		kfree(ff);
+	if (!refcount_dec_and_test(&ff->count))
+		return;
+
+#ifdef CONFIG_FUSE_BPF
+	fer = fuse_bpf_backing(inode, struct fuse_release_in,
+		       fuse_release_initialize, fuse_release_backing,
+		       fuse_release_finalize,
+		       inode, ff);
+	if (fer.ret) {
+		fuse_release_end(ff->fm, args, 0);
+	} else
+#endif
+	if (isdir ? ff->fm->fc->no_opendir : ff->fm->fc->no_open) {
+		/* Do nothing when client does not implement 'open' */
+		fuse_release_end(ff->fm, args, 0);
+	} else if (sync) {
+		fuse_simple_request(ff->fm, args);
+		fuse_release_end(ff->fm, args, 0);
+	} else {
+		args->end = fuse_release_end;
+		if (fuse_simple_background(ff->fm, args,
+				GFP_KERNEL | __GFP_NOFAIL))
+			fuse_release_end(ff->fm, args, -ENOTCONN);
 	}
+	kfree(ff);
 }
 
 struct fuse_file *fuse_file_open(struct fuse_mount *fm, u64 nodeid,
@@ -343,7 +357,7 @@ void fuse_file_release(struct inode *inode, struct fuse_file *ff,
 	 * synchronous RELEASE is allowed (and desirable) in this case
 	 * because the server can be trusted not to screw up.
 	 */
-	fuse_file_put(ff, ff->fm->fc->destroy, isdir);
+	fuse_file_put(ra->inode, ff, ff->fm->fc->destroy, isdir);
 }
 
 void fuse_release_common(struct file *file, bool isdir)
@@ -361,17 +375,6 @@ static int fuse_release(struct inode *inode, struct file *file)
 {
 	struct fuse_conn *fc = get_fuse_conn(inode);
 
-#ifdef CONFIG_FUSE_BPF
-	struct fuse_err_ret fer;
-
-	fer = fuse_bpf_backing(inode, struct fuse_release_in,
-		       fuse_release_initialize, fuse_release_backing,
-		       fuse_release_finalize,
-		       inode, file);
-	if (fer.ret)
-		return PTR_ERR(fer.result);
-#endif
-
 	/*
 	 * Dirty pages might remain despite write_inode_now() call from
 	 * fuse_flush() due to writes racing with the close.
@@ -394,7 +397,7 @@ void fuse_sync_release(struct fuse_inode *fi, struct fuse_file *ff,
 	 * iput(NULL) is a no-op and since the refcount is 1 and everything's
 	 * synchronous, we are fine with not doing igrab() here"
 	 */
-	fuse_file_put(ff, true, false);
+	fuse_file_put(&fi->inode, ff, true, false);
 }
 EXPORT_SYMBOL_GPL(fuse_sync_release);
 
@@ -972,8 +975,11 @@ static void fuse_readpages_end(struct fuse_mount *fm, struct fuse_args *args,
 		unlock_page(page);
 		put_page(page);
 	}
-	if (ia->ff)
-		fuse_file_put(ia->ff, false, false);
+	if (ia->ff) {
+		WARN_ON(!mapping);
+		fuse_file_put(mapping ? mapping->host : NULL, ia->ff,
+			      false, false);
+	}
 
 	fuse_io_free(ia);
 }
@@ -1716,7 +1722,7 @@ static void fuse_writepage_free(struct fuse_writepage_args *wpa)
 		__free_page(ap->pages[i]);
 
 	if (wpa->ia.ff)
-		fuse_file_put(wpa->ia.ff, false, false);
+		fuse_file_put(wpa->inode, wpa->ia.ff, false, false);
 
 	kfree(ap->pages);
 	kfree(wpa);
@@ -1971,7 +1977,7 @@ int fuse_write_inode(struct inode *inode, struct writeback_control *wbc)
 	ff = __fuse_write_file_get(fi);
 	err = fuse_flush_times(inode, ff);
 	if (ff)
-		fuse_file_put(ff, false, false);
+		fuse_file_put(inode, ff, false, false);
 
 	return err;
 }
@@ -2369,7 +2375,7 @@ static int fuse_writepages(struct address_space *mapping,
 		fuse_writepages_send(&data);
 	}
 	if (data.ff)
-		fuse_file_put(data.ff, false, false);
+		fuse_file_put(inode, data.ff, false, false);
 
 	kfree(data.orig_pages);
 out:
@@ -2689,12 +2695,18 @@ static int fuse_file_flock(struct file *file, int cmd, struct file_lock *fl)
 {
 	struct inode *inode = file_inode(file);
 	struct fuse_conn *fc = get_fuse_conn(inode);
+	struct fuse_file *ff = file->private_data;
 	int err;
 
+#ifdef CONFIG_FUSE_BPF
+	/* TODO - this is simply passthrough, not a proper BPF filter */
+	if (ff->backing_file)
+		return fuse_file_flock_backing(file, cmd, fl);
+#endif
+
 	if (fc->no_flock) {
 		err = locks_lock_file_wait(file, fl);
 	} else {
-		struct fuse_file *ff = file->private_data;
 
 		/* emulate flock with POSIX locks */
 		ff->flock = true;
diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h
index a659c89cc685..475442c9ad7e 100644
--- a/fs/fuse/fuse_i.h
+++ b/fs/fuse/fuse_i.h
@@ -1536,14 +1536,11 @@ void *fuse_link_finalize(struct fuse_bpf_args *fa, struct dentry *entry,
 			 struct inode *dir, struct dentry *newent);
 
 int fuse_release_initialize(struct fuse_bpf_args *fa, struct fuse_release_in *fri,
-			    struct inode *inode, struct file *file);
-int fuse_releasedir_initialize(struct fuse_bpf_args *fa,
-			struct fuse_release_in *fri,
-			struct inode *inode, struct file *file);
+			    struct inode *inode, struct fuse_file *ff);
 int fuse_release_backing(struct fuse_bpf_args *fa,
-			 struct inode *inode, struct file *file);
+			 struct inode *inode, struct fuse_file *ff);
 void *fuse_release_finalize(struct fuse_bpf_args *fa,
-			    struct inode *inode, struct file *file);
+			    struct inode *inode, struct fuse_file *ff);
 
 int fuse_flush_initialize(struct fuse_bpf_args *fa, struct fuse_flush_in *ffi,
 			  struct file *file, fl_owner_t id);
@@ -1667,6 +1664,7 @@ int fuse_file_write_iter_backing(struct fuse_bpf_args *fa,
 void *fuse_file_write_iter_finalize(struct fuse_bpf_args *fa,
 		struct kiocb *iocb, struct iov_iter *from);
 
+int fuse_file_flock_backing(struct file *file, int cmd, struct file_lock *fl);
 ssize_t fuse_backing_mmap(struct file *file, struct vm_area_struct *vma);
 
 int fuse_file_fallocate_initialize(struct fuse_bpf_args *fa,
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
index 1f593230bd4a..697e7b5b8319 100644
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
@@ -113,6 +113,10 @@ static void fuse_free_inode(struct inode *inode)
 	kfree(fi->forget);
 #ifdef CONFIG_FUSE_DAX
 	kfree(fi->dax);
+#endif
+#ifdef CONFIG_FUSE_BPF
+	if (fi->bpf)
+		bpf_prog_put(fi->bpf);
 #endif
 	kmem_cache_free(fuse_inode_cachep, fi);
 }
@@ -123,13 +127,6 @@ static void fuse_evict_inode(struct inode *inode)
 
 	/* Will write inode on close/munmap and in all other dirtiers */
 	WARN_ON(inode->i_state & I_DIRTY_INODE);
-
-#ifdef CONFIG_FUSE_BPF
-	iput(fi->backing_inode);
-	if (fi->bpf)
-		bpf_prog_put(fi->bpf);
-	fi->bpf = NULL;
-#endif
 	truncate_inode_pages_final(&inode->i_data);
 	clear_inode(inode);
 	if (inode->i_sb->s_flags & SB_ACTIVE) {
@@ -149,6 +146,15 @@ static void fuse_evict_inode(struct inode *inode)
 	}
 }
 
+#ifdef CONFIG_FUSE_BPF
+static void fuse_destroy_inode(struct inode *inode)
+{
+	struct fuse_inode *fi = get_fuse_inode(inode);
+
+	iput(fi->backing_inode);
+}
+#endif
+
 static int fuse_reconfigure(struct fs_context *fsc)
 {
 	struct super_block *sb = fsc->root->d_sb;
@@ -1209,6 +1215,9 @@ static const struct export_operations fuse_export_operations = {
 
 static const struct super_operations fuse_super_operations = {
 	.alloc_inode    = fuse_alloc_inode,
+#ifdef CONFIG_FUSE_BPF
+	.destroy_inode  = fuse_destroy_inode,
+#endif
 	.free_inode     = fuse_free_inode,
 	.evict_inode	= fuse_evict_inode,
 	.write_inode	= fuse_write_inode,
diff --git a/fs/incfs/pseudo_files.c b/fs/incfs/pseudo_files.c
index 57c3353666ee..814d7063581a 100644
--- a/fs/incfs/pseudo_files.c
+++ b/fs/incfs/pseudo_files.c
@@ -918,10 +918,10 @@ static long ioctl_get_read_timeouts(struct mount_info *mi, void __user *arg)
 	if (copy_from_user(&args, args_usr_ptr, sizeof(args)))
 		return -EINVAL;
 
-	if (args.timeouts_array_size_out > INCFS_DATA_FILE_BLOCK_SIZE)
+	if (args.timeouts_array_size > INCFS_DATA_FILE_BLOCK_SIZE)
 		return -EINVAL;
 
-	buffer = kzalloc(args.timeouts_array_size_out, GFP_NOFS);
+	buffer = kzalloc(args.timeouts_array_size, GFP_NOFS);
 	if (!buffer)
 		return -ENOMEM;
 
diff --git a/fs/verity/enable.c b/fs/verity/enable.c
index 3018f6d8403a..6e31d512d76a 100644
--- a/fs/verity/enable.c
+++ b/fs/verity/enable.c
@@ -14,6 +14,7 @@
 
 struct block_buffer {
 	u32 filled;
+	bool is_root_hash;
 	u8 *data;
 };
 
@@ -25,6 +26,14 @@ static int hash_one_block(struct inode *inode,
 	struct block_buffer *next = cur + 1;
 	int err;
 
+	/*
+	 * Safety check to prevent a buffer overflow in case of a filesystem bug
+	 * that allows the file size to change despite deny_write_access(), or a
+	 * bug in the Merkle tree logic itself
+	 */
+	if (WARN_ON_ONCE(next->is_root_hash && next->filled != 0))
+		return -EINVAL;
+
 	/* Zero-pad the block if it's shorter than the block size. */
 	memset(&cur->data[cur->filled], 0, params->block_size - cur->filled);
 
@@ -98,6 +107,7 @@ static int build_merkle_tree(struct file *filp,
 		}
 	}
 	buffers[num_levels].data = root_hash;
+	buffers[num_levels].is_root_hash = true;
 
 	BUILD_BUG_ON(sizeof(level_offset) != sizeof(params->level_start));
 	memcpy(level_offset, params->level_start, sizeof(level_offset));
@@ -348,6 +358,13 @@ int fsverity_ioctl_enable(struct file *filp, const void __user *uarg)
 	err = file_permission(filp, MAY_WRITE);
 	if (err)
 		return err;
+	/*
+	 * __kernel_read() is used while building the Merkle tree.  So, we can't
+	 * allow file descriptors that were opened for ioctl access only, using
+	 * the special nonstandard access mode 3.  O_RDONLY only, please!
+	 */
+	if (!(filp->f_mode & FMODE_READ))
+		return -EBADF;
 
 	if (IS_APPEND(inode))
 		return -EPERM;
diff --git a/include/linux/android_debug_symbols.h b/include/linux/android_debug_symbols.h
new file mode 100644
index 000000000000..92c0259e6f89
--- /dev/null
+++ b/include/linux/android_debug_symbols.h
@@ -0,0 +1,47 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Copyright (c) 2021, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2023, Unisoc (Shanghai) Technologies Co., Ltd
+ */
+
+#ifndef _ANDROID_DEBUG_SYMBOLS_H
+#define _ANDROID_DEBUG_SYMBOLS_H
+
+enum android_debug_symbol {
+	ADS_SDATA = 0,
+	ADS_BSS_END,
+	ADS_PER_CPU_START,
+	ADS_PER_CPU_END,
+	ADS_TEXT,
+	ADS_SEND,
+	ADS_LINUX_BANNER,
+	ADS_TOTAL_CMA,
+	ADS_SLAB_CACHES,
+	ADS_SLAB_MUTEX,
+	ADS_END
+};
+
+enum android_debug_per_cpu_symbol {
+	ADS_IRQ_STACK_PTR = 0,
+	ADS_DEBUG_PER_CPU_END
+};
+
+#ifdef CONFIG_ANDROID_DEBUG_SYMBOLS
+
+void *android_debug_symbol(enum android_debug_symbol symbol);
+void *android_debug_per_cpu_symbol(enum android_debug_per_cpu_symbol symbol);
+
+#else /* !CONFIG_ANDROID_DEBUG_SYMBOLS */
+
+static inline void *android_debug_symbol(enum android_debug_symbol symbol)
+{
+	return NULL;
+}
+static inline void *android_debug_per_cpu_symbol(enum android_debug_per_cpu_symbol symbol)
+{
+	return NULL;
+}
+
+#endif /* CONFIG_ANDROID_DEBUG_SYMBOLS */
+
+#endif /* _ANDROID_DEBUG_SYMBOLS_H */
diff --git a/include/trace/hooks/cgroup.h b/include/trace/hooks/cgroup.h
index 15582cc572bd..dc6b47dcb21d 100644
--- a/include/trace/hooks/cgroup.h
+++ b/include/trace/hooks/cgroup.h
@@ -8,6 +8,9 @@
 #include <trace/hooks/vendor_hooks.h>
 
 struct task_struct;
+struct cgroup_taskset;
+struct cgroup_subsys;
+struct cgroup_subsys_state;
 DECLARE_HOOK(android_vh_cgroup_set_task,
 	TP_PROTO(int ret, struct task_struct *task),
 	TP_ARGS(ret, task));
@@ -16,8 +19,6 @@ DECLARE_RESTRICTED_HOOK(android_rvh_refrigerator,
 	TP_PROTO(bool f),
 	TP_ARGS(f), 1);
 
-struct cgroup_subsys;
-struct cgroup_taskset;
 DECLARE_HOOK(android_vh_cgroup_attach,
 	TP_PROTO(struct cgroup_subsys *ss, struct cgroup_taskset *tset),
 	TP_ARGS(ss, tset))
@@ -25,8 +26,6 @@ DECLARE_RESTRICTED_HOOK(android_rvh_cgroup_force_kthread_migration,
 	TP_PROTO(struct task_struct *tsk, struct cgroup *dst_cgrp, bool *force_migration),
 	TP_ARGS(tsk, dst_cgrp, force_migration), 1);
 
-struct cgroup_taskset;
-struct cgroup_subsys;
 
 DECLARE_RESTRICTED_HOOK(android_rvh_cpuset_fork,
 	TP_PROTO(struct task_struct *p, bool *inherit_cpus),
diff --git a/include/trace/hooks/mm.h b/include/trace/hooks/mm.h
index fb0bc38380fa..cf27ab461c4e 100644
--- a/include/trace/hooks/mm.h
+++ b/include/trace/hooks/mm.h
@@ -122,6 +122,13 @@ DECLARE_HOOK(android_vh_mem_cgroup_css_online,
 DECLARE_HOOK(android_vh_mem_cgroup_css_offline,
 	TP_PROTO(struct cgroup_subsys_state *css, struct mem_cgroup *memcg),
 	TP_ARGS(css, memcg));
+DECLARE_HOOK(android_vh_rmqueue_smallest_bypass,
+	TP_PROTO(struct page **page, struct zone *zone, int order, int migratetype),
+	TP_ARGS(page, zone, order, migratetype));
+DECLARE_HOOK(android_vh_free_one_page_bypass,
+	TP_PROTO(struct page *page, struct zone *zone, int order, int migratetype,
+		int fpi_flags, bool *bypass),
+	TP_ARGS(page, zone, order, migratetype, fpi_flags, bypass));
 
 #endif /* _TRACE_HOOK_MM_H */
 
diff --git a/include/trace/hooks/regmap.h b/include/trace/hooks/regmap.h
new file mode 100644
index 000000000000..cb6fc43d3472
--- /dev/null
+++ b/include/trace/hooks/regmap.h
@@ -0,0 +1,24 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM regmap
+#undef TRACE_INCLUDE_PATH
+#define TRACE_INCLUDE_PATH trace/hooks
+
+#if !defined(_TRACE_HOOK_REGMAP_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_HOOK_REGMAP_H
+#include <trace/hooks/vendor_hooks.h>
+
+struct regmap_config;
+struct regmap;
+
+/*
+ * Following tracepoints are not exported in tracefs and provide a
+ * mechanism for vendor modules to hook and extend functionality
+ */
+DECLARE_HOOK(android_vh_regmap_update,
+	TP_PROTO(const struct regmap_config *config, struct regmap *map),
+	TP_ARGS(config, map));
+
+#endif /* _TRACE_HOOK_REGMAP_H */
+/* This part must be outside protection */
+#include <trace/define_trace.h>
diff --git a/include/trace/hooks/thermal.h b/include/trace/hooks/thermal.h
index dd42f1d6766a..3e928aa1920d 100644
--- a/include/trace/hooks/thermal.h
+++ b/include/trace/hooks/thermal.h
@@ -48,6 +48,10 @@ DECLARE_HOOK(android_vh_thermal_power_cap,
 	TP_PROTO(u32 *power_range),
 	TP_ARGS(power_range));
 
+DECLARE_HOOK(android_vh_enable_thermal_power_throttle,
+	TP_PROTO(bool *enable),
+	TP_ARGS(enable));
+
 #endif /* _TRACE_HOOK_THERMAL_H */
 /* This part must be outside protection */
 #include <trace/define_trace.h>
diff --git a/include/uapi/scsi/scsi_bsg_ufs.h b/include/uapi/scsi/scsi_bsg_ufs.h
index 5e4891fd99c2..ad6f5e1be2ab 100644
--- a/include/uapi/scsi/scsi_bsg_ufs.h
+++ b/include/uapi/scsi/scsi_bsg_ufs.h
@@ -97,18 +97,18 @@ struct utp_upiu_req {
 };
 
 struct ufs_arpmb_meta {
-	__u16	req_resp_type;
+	__be16	req_resp_type;
 	__u8	nonce[16];
-	__u32	write_counter;
-	__u16	addr_lun;
-	__u16	block_count;
-	__u16	result;
+	__be32	write_counter;
+	__be16	addr_lun;
+	__be16	block_count;
+	__be16	result;
 } __attribute__((__packed__));
 
 struct ufs_ehs {
 	__u8	length;
 	__u8	ehs_type;
-	__u16	ehssub_type;
+	__be16	ehssub_type;
 	struct ufs_arpmb_meta meta;
 	__u8	mac_key[32];
 } __attribute__((__packed__));
diff --git a/include/ufs/ufshcd.h b/include/ufs/ufshcd.h
index c6962ac122ba..12965946d194 100644
--- a/include/ufs/ufshcd.h
+++ b/include/ufs/ufshcd.h
@@ -1297,11 +1297,14 @@ void ufshcd_parse_dev_ref_clk_freq(struct ufs_hba *hba, struct clk *refclk);
 void ufshcd_update_evt_hist(struct ufs_hba *hba, u32 id, u32 val);
 void ufshcd_hba_stop(struct ufs_hba *hba);
 void ufshcd_schedule_eh_work(struct ufs_hba *hba);
+void ufshcd_mcq_config_mac(struct ufs_hba *hba, u32 max_active_cmds);
+u32 ufshcd_mcq_read_cqis(struct ufs_hba *hba, int i);
 void ufshcd_mcq_write_cqis(struct ufs_hba *hba, u32 val, int i);
 unsigned long ufshcd_mcq_poll_cqe_nolock(struct ufs_hba *hba,
 					 struct ufs_hw_queue *hwq);
 unsigned long ufshcd_mcq_poll_cqe_lock(struct ufs_hba *hba,
 					 struct ufs_hw_queue *hwq);
+void ufshcd_mcq_make_queues_operational(struct ufs_hba *hba);
 void ufshcd_mcq_enable_esi(struct ufs_hba *hba);
 void ufshcd_mcq_config_esi(struct ufs_hba *hba, struct msi_msg *msg);
 
diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
index c5c317e4ed50..2198941444e1 100644
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
@@ -4457,6 +4457,7 @@ int cgroup_add_dfl_cftypes(struct cgroup_subsys *ss, struct cftype *cfts)
 		cft->flags |= __CFTYPE_ONLY_ON_DFL;
 	return cgroup_add_cftypes(ss, cfts);
 }
+EXPORT_SYMBOL_GPL(cgroup_add_dfl_cftypes);
 
 /**
  * cgroup_add_legacy_cftypes - add an array of cftypes for legacy hierarchies
diff --git a/kernel/dma/remap.c b/kernel/dma/remap.c
index b4526668072e..27596f3b4aef 100644
--- a/kernel/dma/remap.c
+++ b/kernel/dma/remap.c
@@ -43,13 +43,13 @@ void *dma_common_contiguous_remap(struct page *page, size_t size,
 	void *vaddr;
 	int i;
 
-	pages = kmalloc_array(count, sizeof(struct page *), GFP_KERNEL);
+	pages = kvmalloc_array(count, sizeof(struct page *), GFP_KERNEL);
 	if (!pages)
 		return NULL;
 	for (i = 0; i < count; i++)
 		pages[i] = nth_page(page, i);
 	vaddr = vmap(pages, count, VM_DMA_COHERENT, prot);
-	kfree(pages);
+	kvfree(pages);
 
 	return vaddr;
 }
diff --git a/kernel/gen_kheaders.sh b/kernel/gen_kheaders.sh
index 473036b43c83..bb8945ca53cd 100755
--- a/kernel/gen_kheaders.sh
+++ b/kernel/gen_kheaders.sh
@@ -66,7 +66,7 @@ if [ "$building_out_of_srctree" ]; then
 		cd $srctree
 		for f in $dir_list
 			do find "$f" -name "*.h";
-		done | cpio --quiet -pd $cpio_dir
+		done | cpio --quiet -L -pd $cpio_dir
 	)
 fi
 
@@ -74,7 +74,7 @@ fi
 # of tree builds having stale headers in srctree. Just silence CPIO for now.
 for f in $dir_list;
 	do find "$f" -name "*.h";
-done | cpio --quiet -pdu $cpio_dir >/dev/null 2>&1
+done | cpio --quiet -L -pdu $cpio_dir >/dev/null 2>&1
 
 # Remove comments except SDPX lines
 find $cpio_dir -type f -print0 |
diff --git a/kernel/locking/rwsem.c b/kernel/locking/rwsem.c
index 1988ac0dc3b3..aa85792d352e 100644
--- a/kernel/locking/rwsem.c
+++ b/kernel/locking/rwsem.c
@@ -1078,6 +1078,8 @@ rwsem_down_read_slowpath(struct rw_semaphore *sem, long count, unsigned int stat
 			raw_spin_unlock_irq(&sem->wait_lock);
 			rwsem_set_reader_owned(sem);
 			lockevent_inc(rwsem_rlock_fast);
+			trace_android_vh_record_rwsem_lock_starttime(
+							current, jiffies);
 			return sem;
 		}
 		adjustment += RWSEM_FLAG_WAITERS;
diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c
index c480058808bc..b60c3e178c31 100644
--- a/kernel/sched/topology.c
+++ b/kernel/sched/topology.c
@@ -6,6 +6,9 @@
 #include <trace/hooks/sched.h>
 
 DEFINE_MUTEX(sched_domains_mutex);
+#ifdef CONFIG_LOCKDEP
+EXPORT_SYMBOL_GPL(sched_domains_mutex);
+#endif
 
 /* Protected by sched_domains_mutex: */
 static cpumask_var_t sched_domains_tmpmask;
diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index ca65dbe98e51..24b31aee7880 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -3189,7 +3189,7 @@ static inline int mas_rebalance(struct ma_state *mas,
 	 * tries to combine the data in the same way.  If one node contains the
 	 * entire range of the tree, then that node is used as a new root node.
 	 */
-	mas_node_count(mas, 1 + empty_count * 3);
+	mas_node_count(mas, empty_count * 2 - 1);
 	if (mas_is_err(mas))
 		return 0;
 
@@ -5607,20 +5607,34 @@ static inline void mte_destroy_walk(struct maple_enode *enode,
 
 static void mas_wr_store_setup(struct ma_wr_state *wr_mas)
 {
+	if (mas_is_start(wr_mas->mas))
+		return;
+
 	if (unlikely(mas_is_paused(wr_mas->mas)))
-		mas_reset(wr_mas->mas);
+		goto reset;
 
-	if (!mas_is_start(wr_mas->mas)) {
-		if (mas_is_none(wr_mas->mas)) {
-			mas_reset(wr_mas->mas);
-		} else {
-			wr_mas->r_max = wr_mas->mas->max;
-			wr_mas->type = mte_node_type(wr_mas->mas->node);
-			if (mas_is_span_wr(wr_mas))
-				mas_reset(wr_mas->mas);
-		}
-	}
+	if (unlikely(mas_is_none(wr_mas->mas)))
+		goto reset;
 
+	/*
+	 * A less strict version of mas_is_span_wr() where we allow spanning
+	 * writes within this node.  This is to stop partial walks in
+	 * mas_prealloc() from being reset.
+	 */
+	if (wr_mas->mas->last > wr_mas->mas->max)
+		goto reset;
+
+	if (wr_mas->entry)
+		return;
+
+	if (mte_is_leaf(wr_mas->mas->node) &&
+	    wr_mas->mas->last == wr_mas->mas->max)
+		goto reset;
+
+	return;
+
+reset:
+	mas_reset(wr_mas->mas);
 }
 
 /* Interface */
@@ -5747,25 +5761,25 @@ int mas_preallocate(struct ma_state *mas, void *entry, gfp_t gfp)
 
 	mas_wr_end_piv(&wr_mas);
 	node_size = mas_wr_node_size(&wr_mas);
+	/* Slot store can avoid using any nodes */
+	if (node_size == wr_mas.node_end && wr_mas.offset_end - mas->offset == 1)
+		return 0;
+
 	if (node_size >= mt_slots[wr_mas.type]) {
-		/* Slot store is possible in some cases */
-		if ((node_size == mt_slots[wr_mas.type]) &&
-		    (wr_mas.r_min == mas->index || wr_mas.r_max == mas->last))
-			goto ask_now;
 		/* Split, worst case for now. */
 		request = 1 + mas_mt_height(mas) * 2;
 		goto ask_now;
 	}
 
-	/* New root needs a singe node */
-	if (unlikely(mte_is_root(mas->node)))
-		goto ask_now;
+	/* Appending does not need any nodes */
+	if (node_size == wr_mas.node_end + 1 && mas->offset == wr_mas.node_end)
+		return 0;
 
 	/* Potential spanning rebalance collapsing a node, use worst-case */
 	if (node_size  - 1 <= mt_min_slots[wr_mas.type])
 		request = mas_mt_height(mas) * 2 - 1;
 
-	/* node store, slot store needs one node */
+	/* node store needs one node */
 ask_now:
 	mas_node_count_gfp(mas, request, gfp);
 	mas->mas_flags |= MA_STATE_PREALLOC;
diff --git a/mm/kasan/hw_tags.c b/mm/kasan/hw_tags.c
index 2f7ec2e1718a..bc61de92cedd 100644
--- a/mm/kasan/hw_tags.c
+++ b/mm/kasan/hw_tags.c
@@ -205,7 +205,7 @@ void kasan_init_hw_tags_cpu(void)
 	 * Enable async or asymm modes only when explicitly requested
 	 * through the command line.
 	 */
-	kasan_enable_tagging();
+	kasan_enable_hw_tags();
 }
 
 /* kasan_init_hw_tags() is called once on boot CPU. */
@@ -373,19 +373,19 @@ void __kasan_poison_vmalloc(const void *start, unsigned long size)
 
 #endif
 
-void kasan_enable_tagging(void)
+void kasan_enable_hw_tags(void)
 {
 	if (kasan_arg_mode == KASAN_ARG_MODE_ASYNC)
-		hw_enable_tagging_async();
+		hw_enable_tag_checks_async();
 	else if (kasan_arg_mode == KASAN_ARG_MODE_ASYMM)
-		hw_enable_tagging_asymm();
+		hw_enable_tag_checks_asymm();
 	else
-		hw_enable_tagging_sync();
+		hw_enable_tag_checks_sync();
 }
 
 #if IS_ENABLED(CONFIG_KASAN_KUNIT_TEST)
 
-EXPORT_SYMBOL_GPL(kasan_enable_tagging);
+EXPORT_SYMBOL_GPL(kasan_enable_hw_tags);
 
 void kasan_force_async_fault(void)
 {
diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h
index 8b6e09839d8d..6db6638d7e3b 100644
--- a/mm/kasan/kasan.h
+++ b/mm/kasan/kasan.h
@@ -401,46 +401,22 @@ static inline const void *arch_kasan_set_tag(const void *addr, u8 tag)
 
 #ifdef CONFIG_KASAN_HW_TAGS
 
-#ifndef arch_enable_tagging_sync
-#define arch_enable_tagging_sync()
-#endif
-#ifndef arch_enable_tagging_async
-#define arch_enable_tagging_async()
-#endif
-#ifndef arch_enable_tagging_asymm
-#define arch_enable_tagging_asymm()
-#endif
-#ifndef arch_force_async_tag_fault
-#define arch_force_async_tag_fault()
-#endif
-#ifndef arch_get_random_tag
-#define arch_get_random_tag()	(0xFF)
-#endif
-#ifndef arch_get_mem_tag
-#define arch_get_mem_tag(addr)	(0xFF)
-#endif
-#ifndef arch_set_mem_tag_range
-#define arch_set_mem_tag_range(addr, size, tag, init) ((void *)(addr))
-#endif
-
-#define hw_enable_tagging_sync()		arch_enable_tagging_sync()
-#define hw_enable_tagging_async()		arch_enable_tagging_async()
-#define hw_enable_tagging_asymm()		arch_enable_tagging_asymm()
+#define hw_enable_tag_checks_sync()		arch_enable_tag_checks_sync()
+#define hw_enable_tag_checks_async()		arch_enable_tag_checks_async()
+#define hw_enable_tag_checks_asymm()		arch_enable_tag_checks_asymm()
+#define hw_suppress_tag_checks_start()		arch_suppress_tag_checks_start()
+#define hw_suppress_tag_checks_stop()		arch_suppress_tag_checks_stop()
 #define hw_force_async_tag_fault()		arch_force_async_tag_fault()
 #define hw_get_random_tag()			arch_get_random_tag()
 #define hw_get_mem_tag(addr)			arch_get_mem_tag(addr)
 #define hw_set_mem_tag_range(addr, size, tag, init) \
 			arch_set_mem_tag_range((addr), (size), (tag), (init))
 
-void kasan_enable_tagging(void);
+void kasan_enable_hw_tags(void);
 
 #else /* CONFIG_KASAN_HW_TAGS */
 
-#define hw_enable_tagging_sync()
-#define hw_enable_tagging_async()
-#define hw_enable_tagging_asymm()
-
-static inline void kasan_enable_tagging(void) { }
+static inline void kasan_enable_hw_tags(void) { }
 
 #endif /* CONFIG_KASAN_HW_TAGS */
 
diff --git a/mm/kasan/kasan_test.c b/mm/kasan/kasan_test.c
index 0d59098f0876..875553961eeb 100644
--- a/mm/kasan/kasan_test.c
+++ b/mm/kasan/kasan_test.c
@@ -107,7 +107,7 @@ static void kasan_test_exit(struct kunit *test)
 	    kasan_sync_fault_possible()) {				\
 		if (READ_ONCE(test_status.report_found) &&		\
 		    READ_ONCE(test_status.sync_fault))			\
-			kasan_enable_tagging();				\
+			kasan_enable_hw_tags();				\
 		migrate_enable();					\
 	}								\
 	WRITE_ONCE(test_status.report_found, false);			\
diff --git a/mm/kasan/report.c b/mm/kasan/report.c
index cc98dfdd3ed2..dfe686be59df 100644
--- a/mm/kasan/report.c
+++ b/mm/kasan/report.c
@@ -73,10 +73,18 @@ static int __init kasan_set_multi_shot(char *str)
 __setup("kasan_multi_shot", kasan_set_multi_shot);
 
 /*
- * Used to suppress reports within kasan_disable/enable_current() critical
- * sections, which are used for marking accesses to slab metadata.
+ * This function is used to check whether KASAN reports are suppressed for
+ * software KASAN modes via kasan_disable/enable_current() critical sections.
+ *
+ * This is done to avoid:
+ * 1. False-positive reports when accessing slab metadata,
+ * 2. Deadlocking when poisoned memory is accessed by the reporting code.
+ *
+ * Hardware Tag-Based KASAN instead relies on:
+ * For #1: Resetting tags via kasan_reset_tag().
+ * For #2: Suppression of tag checks via CPU, see report_suppress_start/end().
  */
-static bool report_suppressed(void)
+static bool report_suppressed_sw(void)
 {
 #if defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS)
 	if (current->kasan_depth)
@@ -85,6 +93,30 @@ static bool report_suppressed(void)
 	return false;
 }
 
+static void report_suppress_start(void)
+{
+#ifdef CONFIG_KASAN_HW_TAGS
+	/*
+	 * Disable preemption for the duration of printing a KASAN report, as
+	 * hw_suppress_tag_checks_start() disables checks on the current CPU.
+	 */
+	preempt_disable();
+	hw_suppress_tag_checks_start();
+#else
+	kasan_disable_current();
+#endif
+}
+
+static void report_suppress_stop(void)
+{
+#ifdef CONFIG_KASAN_HW_TAGS
+	hw_suppress_tag_checks_stop();
+	preempt_enable();
+#else
+	kasan_enable_current();
+#endif
+}
+
 /*
  * Used to avoid reporting more than one KASAN bug unless kasan_multi_shot
  * is enabled. Note that KASAN tests effectively enable kasan_multi_shot
@@ -152,7 +184,7 @@ static void start_report(unsigned long *flags, bool sync)
 	/* Do not allow LOCKDEP mangling KASAN reports. */
 	lockdep_off();
 	/* Make sure we don't end up in loop. */
-	kasan_disable_current();
+	report_suppress_start();
 	spin_lock_irqsave(&report_lock, *flags);
 	pr_err("==================================================================\n");
 }
@@ -170,7 +202,7 @@ static void end_report(unsigned long *flags, void *addr)
 		panic("kasan.fault=panic set ...\n");
 	add_taint(TAINT_BAD_PAGE, LOCKDEP_NOW_UNRELIABLE);
 	lockdep_on();
-	kasan_enable_current();
+	report_suppress_stop();
 }
 
 static void print_error_description(struct kasan_report_info *info)
@@ -439,9 +471,13 @@ void kasan_report_invalid_free(void *ptr, unsigned long ip, enum kasan_report_ty
 	struct kasan_report_info info;
 
 	/*
-	 * Do not check report_suppressed(), as an invalid-free cannot be
-	 * caused by accessing slab metadata and thus should not be
-	 * suppressed by kasan_disable/enable_current() critical sections.
+	 * Do not check report_suppressed_sw(), as an invalid-free cannot be
+	 * caused by accessing poisoned memory and thus should not be suppressed
+	 * by kasan_disable/enable_current() critical sections.
+	 *
+	 * Note that for Hardware Tag-Based KASAN, kasan_report_invalid_free()
+	 * is triggered by explicit tag checks and not by the ones performed by
+	 * the CPU. Thus, reporting invalid-free is not suppressed as well.
 	 */
 	if (unlikely(!report_enabled()))
 		return;
@@ -476,7 +512,7 @@ bool kasan_report(unsigned long addr, size_t size, bool is_write,
 	unsigned long irq_flags;
 	struct kasan_report_info info;
 
-	if (unlikely(report_suppressed()) || unlikely(!report_enabled())) {
+	if (unlikely(report_suppressed_sw()) || unlikely(!report_enabled())) {
 		ret = false;
 		goto out;
 	}
@@ -508,8 +544,9 @@ void kasan_report_async(void)
 	unsigned long flags;
 
 	/*
-	 * Do not check report_suppressed(), as kasan_disable/enable_current()
-	 * critical sections do not affect Hardware Tag-Based KASAN.
+	 * Do not check report_suppressed_sw(), as
+	 * kasan_disable/enable_current() critical sections do not affect
+	 * Hardware Tag-Based KASAN.
 	 */
 	if (unlikely(!report_enabled()))
 		return;
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 856b0009b21f..c6358579527e 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -1141,6 +1141,13 @@ static inline void __free_one_page(struct page *page,
 	unsigned long combined_pfn;
 	struct page *buddy;
 	bool to_tail;
+	bool bypass = false;
+
+	trace_android_vh_free_one_page_bypass(page, zone, order,
+		migratetype, (int)fpi_flags, &bypass);
+
+	if (bypass)
+		return;
 
 	VM_BUG_ON(!zone_is_initialized(zone));
 	VM_BUG_ON_PAGE(page->flags & PAGE_FLAGS_CHECK_AT_PREP, page);
@@ -3129,7 +3136,11 @@ static __always_inline struct page *
 __rmqueue(struct zone *zone, unsigned int order, int migratetype,
 						unsigned int alloc_flags)
 {
-	struct page *page;
+	struct page *page = NULL;
+
+	trace_android_vh_rmqueue_smallest_bypass(&page, zone, order, migratetype);
+	if (page)
+		return page;
 
 retry:
 	page = __rmqueue_smallest(zone, order, migratetype);
diff --git a/modules.bzl b/modules.bzl
index 5d3d31af91f7..868ef5ed2bd3 100644
--- a/modules.bzl
+++ b/modules.bzl
@@ -34,6 +34,7 @@ COMMON_GKI_MODULES_LIST = [
     "drivers/net/usb/r8153_ecm.ko",
     "drivers/net/usb/rtl8150.ko",
     "drivers/net/usb/usbnet.ko",
+    "drivers/net/wwan/wwan.ko",
     "drivers/usb/class/cdc-acm.ko",
     "drivers/usb/serial/ftdi_sio.ko",
     "drivers/usb/serial/usbserial.ko",
diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c
index 26c2cfc9cfba..c27ef56dcd7c 100644
--- a/sound/usb/pcm.c
+++ b/sound/usb/pcm.c
@@ -675,7 +675,7 @@ static int snd_usb_pcm_prepare(struct snd_pcm_substream *substream)
 	ret = snd_vendor_set_pcm_intf(iface, subs->data_endpoint->iface,
 				      subs->data_endpoint->altsetting,
 				      subs->direction, subs);
-	if (!ret)
+	if (ret)
 		goto unlock;
 
 	/* reset the pointer */
diff --git a/tools/testing/selftests/filesystems/fuse/fuse_test.c b/tools/testing/selftests/filesystems/fuse/fuse_test.c
index a52a9db1014c..bdb70e23b349 100644
--- a/tools/testing/selftests/filesystems/fuse/fuse_test.c
+++ b/tools/testing/selftests/filesystems/fuse/fuse_test.c
@@ -12,6 +12,7 @@
 #include <string.h>
 #include <unistd.h>
 
+#include <sys/file.h>
 #include <sys/inotify.h>
 #include <sys/mman.h>
 #include <sys/mount.h>
@@ -1336,6 +1337,50 @@ static int mmap_test(const char *mount_dir)
 	return result;
 }
 
+static int flock_test(const char *mount_dir)
+{
+	const char *file = "file";
+	int result = TEST_FAILURE;
+	int src_fd = -1;
+	int fuse_dev = -1;
+	int fd = -1, fd2 = -1;
+	int backing_fd = -1;
+	char *addr = NULL;
+
+	TEST(src_fd = open(ft_src, O_DIRECTORY | O_RDONLY | O_CLOEXEC),
+	     src_fd != -1);
+	TESTEQUAL(mount_fuse(mount_dir, -1, src_fd, &fuse_dev), 0);
+	TEST(fd = s_open(s_path(s(mount_dir), s(file)),
+			 O_CREAT | O_RDWR | O_CLOEXEC, 0777),
+	     fd != -1);
+	TEST(fd2 = s_open(s_path(s(mount_dir), s(file)),
+				 O_RDWR | O_CLOEXEC, 0777),
+		     fd2 != -1);
+	TESTSYSCALL(flock(fd, LOCK_EX | LOCK_NB));
+	TESTCONDERR((flock(fd2, LOCK_EX | LOCK_NB)) == -1);
+	TESTCOND(errno == EAGAIN);
+	TESTSYSCALL(flock(fd, LOCK_UN));
+	TESTSYSCALL(flock(fd2, LOCK_EX | LOCK_NB));
+	TEST(backing_fd = s_open(s_path(s(ft_src), s(file)),
+				 O_RDONLY | O_CLOEXEC),
+				 backing_fd != -1);
+	TESTCONDERR((flock(backing_fd, LOCK_EX | LOCK_NB)) == -1);
+	TESTCOND(errno == EAGAIN);
+	close(fd2);
+	fd2 = 0;
+	TESTSYSCALL(flock(backing_fd, LOCK_EX | LOCK_NB));
+
+	result = TEST_SUCCESS;
+out:
+	close(fd);
+	close(fd2);
+	close(backing_fd);
+	umount(mount_dir);
+	close(fuse_dev);
+	close(src_fd);
+	return result;
+}
+
 static int readdir_perms_test(const char *mount_dir)
 {
 	int result = TEST_FAILURE;
@@ -2091,6 +2136,7 @@ int main(int argc, char *argv[])
 		MAKE_TEST(bpf_test_no_readdirplus_without_nodeid),
 		MAKE_TEST(bpf_test_revalidate_handle_backing_fd),
 		MAKE_TEST(bpf_test_lookup_postfilter),
+		MAKE_TEST(flock_test),
 	};
 #undef MAKE_TEST