Merge android11-5.4.61+ (d240b69) into msm-5.4

* remotes/origin/tmp-d240b69:
  ANDROID: db845c_gki.fragment: Add missing qcom drivers required for cpufreq functionality
  ANDROID: ABI: update allowed list for QCOM
  ANDROID: GKI: add allowed list file for xiaomi
  ANDROID: Disable kthread delayed work fp check in CFI builds
  ANDROID: ABI: update allowed list for QCOM
  ANDROID: GKI: pid: Export for find_task_by_vpid
  ANDROID: GKI: core: Export for runqueues
  ANDROID: GKI: time: Export for nsec_to_clock_t
  ANDROID: GKI: signal: Export for __lock_task_sighand
  ANDROID: GKI: cputime: Export for thread_group_cputime_adjusted
  ANDROID: GKI: loadavg: Export for get_avenrun
  ANDROID: Refresh ABI.xmls with libabigail 1.8.0-98bbf30d
  ANDROID: sched: add cpumask parameter to cpu capacity vendor hook
  ANDROID: ABI: Added symbols for allwinner
  ANDROID: ABI: Update allowed list for EXYNOS
  ANDROID: ABI: Update allowed list for QCOM
  ANDROID: drop KERNEL_DIR setting in build.config.common

Change-Id: I790253af5262bdb92cc84a87f90628607944c69f
Signed-off-by: Jeevan Shriram <jshriram@codeaurora.org>

android/abi_gki_aarch64_exynos

@@ -7,6 +7,7 @@
   alarm_cancel
   alarm_init
   alarm_start
+  alarm_start_relative
   alloc_chrdev_region
   alloc_etherdev_mqs
   alloc_netdev_mqs
@@ -28,6 +29,7 @@
   atomic_notifier_call_chain
   atomic_notifier_chain_register
   atomic_notifier_chain_unregister
+  autoremove_wake_function
   backlight_device_unregister
   _bcd2bin
   bcmp
@@ -66,15 +68,43 @@
   cancel_delayed_work
   cancel_delayed_work_sync
   cancel_work_sync
+  capable
   cdev_add
   cdev_alloc
   cdev_del
   cdev_device_add
   cdev_device_del
   cdev_init
+  __cfg80211_alloc_event_skb
+  __cfg80211_alloc_reply_skb
+  cfg80211_chandef_create
+  cfg80211_ch_switch_notify
+  cfg80211_classify8021d
+  cfg80211_connect_done
+  cfg80211_del_sta_sinfo
+  cfg80211_disconnected
+  cfg80211_external_auth_request
+  cfg80211_find_elem_match
+  cfg80211_find_vendor_elem
+  cfg80211_get_bss
+  cfg80211_inform_bss_frame_data
+  cfg80211_mgmt_tx_status
+  cfg80211_michael_mic_failure
+  cfg80211_new_sta
+  cfg80211_put_bss
+  cfg80211_ready_on_channel
+  cfg80211_remain_on_channel_expired
+  cfg80211_roamed
+  cfg80211_rx_mgmt
+  cfg80211_scan_done
+  cfg80211_sched_scan_results
+  cfg80211_sched_scan_stopped
+  __cfg80211_send_event_skb
+  cfg80211_vendor_cmd_reply
   __cfi_slowpath
   __check_object_size
   __class_create
+  class_create_file_ns
   class_destroy
   class_find_device
   __class_register
@@ -130,6 +160,7 @@
   __const_udelay
   consume_skb
   contig_page_data
+  _copy_from_iter_full
   __cpu_active_mask
   cpu_all_bits
   cpu_bit_bitmap
@@ -166,20 +197,25 @@
   cpu_subsys
   cpu_topology
   cpu_up
+  crc32_le
   crypto_alloc_shash
   crypto_destroy_tfm
   crypto_shash_digest
   crypto_shash_final
   crypto_shash_update
+  csum_partial
+  csum_tcpudp_nofold
   _ctype
   dapm_pinctrl_event
   dapm_regulator_event
+  datagram_poll
   default_llseek
   default_wake_function
   delayed_work_timer_fn
   del_timer
   del_timer_sync
   destroy_workqueue
+  dev_alloc_name
   _dev_crit
   dev_driver_string
   _dev_emerg
@@ -201,6 +237,7 @@
   device_create
   device_create_bin_file
   device_create_file
+  device_del
   device_destroy
   device_find_child
   device_for_each_child
@@ -241,6 +278,7 @@
   devm_gpiochip_add_data
   devm_gpiod_get_optional
   devm_gpio_request_one
+  devm_iio_channel_get
   devm_iio_device_alloc
   devm_input_allocate_device
   devm_ioremap
@@ -253,6 +291,7 @@
   devm_kmalloc
   devm_kmemdup
   devm_kstrdup
+  devm_led_classdev_register_ext
   __devm_of_phy_provider_register
   devm_phy_create
   devm_phy_get
@@ -261,6 +300,7 @@
   devm_pinctrl_put
   devm_pinctrl_register
   devm_platform_ioremap_resource
+  __devm_regmap_init
   __devm_regmap_init_i2c
   __devm_regmap_init_mmio_clk
   devm_regulator_bulk_get
@@ -275,6 +315,7 @@
   devm_snd_dmaengine_pcm_register
   devm_snd_soc_register_card
   devm_snd_soc_register_component
+  devm_thermal_zone_of_sensor_register
   devm_usb_get_phy
   devm_usb_get_phy_by_phandle
   _dev_notice
@@ -297,6 +338,7 @@
   devres_add
   devres_alloc_node
   devres_free
+  devres_release
   dev_set_mac_address
   dev_set_name
   _dev_warn
@@ -364,6 +406,7 @@
   dma_set_coherent_mask
   dma_set_mask
   do_SAK
+  do_wait_intr
   down
   downgrade_write
   down_interruptible
@@ -384,6 +427,7 @@
   enable_irq
   enable_percpu_irq
   end_buffer_read_sync
+  ether_setup
   eth_mac_addr
   ethtool_op_get_link
   eth_type_trans
@@ -395,6 +439,8 @@
   fb_mode_option
   fd_install
   fget
+  filp_close
+  filp_open
   find_get_pid
   find_next_bit
   find_next_zero_bit
@@ -423,6 +469,9 @@
   fwnode_property_read_u16_array
   generic_file_llseek
   generic_handle_irq
+  genlmsg_put
+  genl_register_family
+  genl_unregister_family
   gen_pool_add_owner
   gen_pool_alloc_algo_owner
   gen_pool_avail
@@ -486,6 +535,7 @@
   hwrng_register
   hwrng_unregister
   i2c_adapter_type
+  i2c_add_adapter
   i2c_add_numbered_adapter
   i2c_bus_type
   i2c_del_adapter
@@ -511,12 +561,18 @@
   ida_free
   idr_alloc
   idr_remove
+  ieee80211_channel_to_freq_khz
+  ieee80211_freq_khz_to_channel
+  ieee80211_get_channel_khz
   ignore_console_lock_warning
   iio_channel_get
   iio_channel_release
+  iio_device_alloc
+  iio_device_free
   __iio_device_register
   iio_device_unregister
   iio_read_channel_processed
+  iio_read_channel_raw
   in4_pton
   in6_pton
   init_dummy_netdev
@@ -582,6 +638,7 @@
   __ioremap
   iounmap
   __iowrite32_copy
+  ip_send_check
   __irq_alloc_descs
   irq_create_mapping
   __irq_domain_add
@@ -591,6 +648,7 @@
   irq_domain_xlate_onetwocell
   irq_domain_xlate_twocell
   irq_find_mapping
+  irq_get_irqchip_state
   irq_get_irq_data
   irq_modify_status
   irq_of_parse_and_map
@@ -601,6 +659,7 @@
   irq_set_chip_data
   __irq_set_handler
   irq_set_handler_data
+  irq_set_irqchip_state
   irq_set_irq_wake
   irq_to_desc
   irq_work_queue
@@ -613,6 +672,7 @@
   jiffies_to_usecs
   kasprintf
   kernel_kobj
+  kernel_read
   kernel_write
   keyslot_manager_create_passthrough
   keyslot_manager_private
@@ -620,10 +680,12 @@
   __kfifo_free
   __kfifo_in
   __kfifo_out
+  __kfifo_to_user
   kfree
   kfree_call_rcu
   kfree_const
   kfree_skb
+  kfree_skb_list
   kimage_vaddr
   kimage_voffset
   __kmalloc
@@ -637,6 +699,7 @@
   kmemdup
   kobject_add
   kobject_create_and_add
+  kobject_get
   kobject_init
   kobject_init_and_add
   kobject_put
@@ -687,7 +750,9 @@
   __list_del_entry_valid
   list_sort
   llist_add_batch
+  __local_bh_enable_ip
   __lock_buffer
+  lock_sock_nested
   loops_per_jiffy
   map_vm_area
   match_string
@@ -701,6 +766,7 @@
   media_entity_remove_links
   media_remove_intf_links
   memchr
+  memcmp
   memcpy
   __memcpy_fromio
   __memcpy_toio
@@ -737,6 +803,7 @@
   module_put
   __msecs_to_jiffies
   msleep
+  msleep_interruptible
   __mutex_init
   mutex_is_locked
   mutex_lock
@@ -755,11 +822,24 @@
   netif_carrier_off
   netif_carrier_on
   netif_napi_add
+  netif_napi_del
   netif_receive_skb
   netif_receive_skb_list
   netif_rx
+  netif_rx_ni
+  netif_tx_stop_all_queues
   netif_tx_wake_queue
+  netlink_broadcast
+  netlink_register_notifier
+  netlink_unicast
+  netlink_unregister_notifier
+  nla_memcpy
+  __nla_parse
+  nla_put
+  nla_put_nohdr
+  nla_strlcpy
   no_llseek
+  nonseekable_open
   noop_llseek
   nr_cpu_ids
   nr_irqs
@@ -811,6 +891,7 @@
   of_match_node
   of_node_name_eq
   of_parse_phandle
+  of_parse_phandle_with_args
   of_parse_phandle_with_fixed_args
   of_phandle_iterator_init
   of_phandle_iterator_next
@@ -843,6 +924,7 @@
   param_ops_charp
   param_ops_int
   param_ops_long
+  param_ops_string
   param_ops_uint
   param_ops_ullong
   param_ops_ulong
@@ -951,19 +1033,26 @@
   power_supply_get_property
   power_supply_put
   power_supply_register
+  power_supply_set_property
   power_supply_unregister
   preempt_schedule
   preempt_schedule_notrace
   prepare_to_wait_event
   print_hex_dump
   printk
+  __printk_ratelimit
+  printk_timed_ratelimit
   proc_create
   proc_create_data
   proc_create_seq_private
   proc_mkdir
   proc_remove
   proc_set_size
+  proc_set_user
   proc_symlink
+  proto_register
+  proto_unregister
+  __pskb_copy_fclone
   __put_cred
   put_device
   __put_page
@@ -987,8 +1076,10 @@
   raw_notifier_chain_register
   raw_notifier_chain_unregister
   _raw_read_lock
+  _raw_read_lock_bh
   _raw_read_lock_irqsave
   _raw_read_unlock
+  _raw_read_unlock_bh
   _raw_read_unlock_irqrestore
   _raw_spin_lock
   _raw_spin_lock_bh
@@ -999,7 +1090,11 @@
   _raw_spin_unlock_bh
   _raw_spin_unlock_irq
   _raw_spin_unlock_irqrestore
+  _raw_write_lock
+  _raw_write_lock_bh
   _raw_write_lock_irqsave
+  _raw_write_unlock
+  _raw_write_unlock_bh
   _raw_write_unlock_irqrestore
   rb_erase
   rb_first
@@ -1013,6 +1108,7 @@
   rdev_get_id
   reboot_mode
   refcount_dec_and_test_checked
+  refcount_dec_checked
   refcount_inc_checked
   refcount_inc_not_zero_checked
   __refrigerator
@@ -1025,7 +1121,10 @@
   register_chrdev_region
   register_console
   register_die_notifier
+  register_inet6addr_notifier
+  register_inetaddr_notifier
   register_netdev
+  register_netdevice
   register_oom_notifier
   register_pm_notifier
   register_reboot_notifier
@@ -1034,6 +1133,7 @@
   register_syscore_ops
   regmap_async_complete
   regmap_bulk_read
+  regmap_bulk_write
   regmap_multi_reg_write
   regmap_multi_reg_write_bypassed
   regmap_raw_read
@@ -1059,6 +1159,7 @@
   release_firmware
   release_pages
   __release_region
+  release_sock
   remap_pfn_range
   remap_vmalloc_range
   remove_proc_entry
@@ -1075,6 +1176,10 @@
   reset_control_put
   reset_control_reset
   return_address
+  rfkill_alloc
+  rfkill_destroy
+  rfkill_register
+  rfkill_unregister
   rps_needed
   rtc_class_close
   rtc_class_open
@@ -1083,6 +1188,7 @@
   rtc_tm_to_time64
   rtc_update_irq
   rtc_valid_tm
+  rtnl_is_locked
   rtnl_lock
   rtnl_unlock
   sched_clock
@@ -1100,6 +1206,7 @@
   scsi_print_sense_hdr
   sdev_prefix_printk
   sdio_signal_irq
+  security_sock_graft
   seq_lseek
   seq_printf
   seq_puts
@@ -1130,8 +1237,14 @@
   simple_write_to_buffer
   single_open
   single_release
+  sk_alloc
+  skb_clone
+  skb_copy
+  skb_copy_bits
+  skb_copy_datagram_iter
   skb_copy_expand
   skb_dequeue
+  skb_free_datagram
   skb_pull
   skb_push
   skb_put
@@ -1139,7 +1252,10 @@
   skb_queue_purge
   skb_queue_tail
   skb_realloc_headroom
+  skb_recv_datagram
   skb_trim
+  skb_unlink
+  sk_free
   smpboot_register_percpu_thread
   smp_call_function
   smp_call_function_many
@@ -1182,6 +1298,7 @@
   snd_soc_component_write
   snd_soc_dai_set_bclk_ratio
   snd_soc_dai_set_channel_map
+  snd_soc_dai_set_fmt
   snd_soc_dai_set_sysclk
   snd_soc_dai_set_tdm_slot
   snd_soc_dapm_add_routes
@@ -1194,6 +1311,8 @@
   snd_soc_dapm_ignore_suspend
   snd_soc_dapm_info_pin_switch
   snd_soc_dapm_kcontrol_dapm
+  snd_soc_dapm_mixer_update_power
+  snd_soc_dapm_mux_update_power
   snd_soc_dapm_new_control
   snd_soc_dapm_new_controls
   snd_soc_dapm_put_enum_double
@@ -1235,6 +1354,23 @@
   snd_vendor_set_ops
   snprintf
   soc_device_register
+  sock_alloc_send_skb
+  sock_init_data
+  sock_no_accept
+  sock_no_bind
+  sock_no_connect
+  sock_no_getname
+  sock_no_getsockopt
+  sock_no_ioctl
+  sock_no_listen
+  sock_no_mmap
+  sock_no_sendmsg
+  sock_no_setsockopt
+  sock_no_shutdown
+  sock_no_socketpair
+  sock_queue_rcv_skb
+  sock_register
+  sock_unregister
   softnet_data
   sort
   __spi_alloc_controller
@@ -1277,6 +1413,7 @@
   strncmp
   strncpy
   strnlen
+  strnstr
   strpbrk
   strrchr
   strsep
@@ -1312,6 +1449,7 @@
   system_unbound_wq
   system_wq
   sys_tz
+  __tasklet_hi_schedule
   tasklet_init
   tasklet_kill
   __tasklet_schedule
@@ -1399,7 +1537,10 @@
   unmap_mapping_range
   __unregister_chrdev
   unregister_chrdev_region
+  unregister_inet6addr_notifier
+  unregister_inetaddr_notifier
   unregister_netdev
+  unregister_netdevice_queue
   unregister_pm_notifier
   unregister_reboot_notifier
   unregister_restart_handler
@@ -1553,6 +1694,7 @@
   vfree
   vfs_fsync
   vfs_llseek
+  vfs_statx
   video_devdata
   video_device_alloc
   video_device_release
@@ -1593,4 +1735,9 @@
   watchdog_register_device
   watchdog_set_restart_priority
   watchdog_unregister_device
+  wiphy_apply_custom_regulatory
+  wiphy_free
+  wiphy_new_nm
+  wiphy_register
+  wiphy_unregister
   work_busy

android/abi_gki_aarch64_qcom

@@ -1011,6 +1011,7 @@
   hrtimer_init_sleeper
   hrtimer_start_range_ns
   hrtimer_try_to_cancel
+  hrtimer_init_sleeper
   hvc_alloc
   hvc_instantiate
   hvc_kick
@@ -1835,6 +1836,7 @@
   __refrigerator
   regcache_cache_bypass
   regcache_cache_only
+  regcache_cache_bypass
   regcache_mark_dirty
   regcache_sync
   regcache_sync_region

android/abi_gki_aarch64_sunxi

@@ -302,3 +302,9 @@
 
 # required by sun6i-dma.ko
   dma_get_any_slave_channel
+
+# required by sun50i-cpufreq-nvmem.ko
+  dev_pm_opp_of_get_opp_desc_node
+  dev_pm_opp_put_prop_name
+  dev_pm_opp_put_supported_hw
+  dev_pm_opp_set_prop_name

android/abi_gki_aarch64_xiaomi

@@ -0,0 +1,80 @@
+[abi_symbol_list]
+# required by cs35l41_dlkm.ko
+  regmap_async_complete
+  regmap_multi_reg_write
+  regmap_multi_reg_write_bypassed
+  regmap_raw_write
+  regmap_raw_write_async
+  regulator_bulk_enable
+  snd_pcm_format_physical_width
+  snd_soc_get_volsw_range
+  snd_soc_info_volsw_range
+  snd_soc_put_volsw_range
+
+# required by q6_dlkm.ko
+  down_interruptible
+  __kfifo_alloc
+  __kfifo_free
+  __kfifo_from_user
+  snd_soc_bytes_info_ext
+
+# required by aw8697.ko
+  devm_gpio_free
+
+# required by msm_drm.ko
+  kobject_set_name
+
+# required by exfat.ko
+  block_write_full_page
+  __blockdev_direct_IO
+  __bread_gfp
+  __brelse
+  cont_write_begin
+  d_find_alias
+  d_move
+  filemap_fdatawait_range
+  filemap_fdatawrite_range
+  full_name_hash
+  generic_block_bmap
+  generic_cont_expand_simple
+  generic_fh_to_dentry
+  generic_fh_to_parent
+  generic_file_fsync
+  generic_file_write_iter
+  generic_fillattr
+  generic_write_end
+  __getblk_gfp
+  ilookup
+  in_group_p
+  inc_nlink
+  invalidate_bdev
+  invalidate_inode_buffers
+  iunique
+  __insert_inode_hash
+  kill_block_super
+  load_nls
+  __lock_buffer
+  mark_buffer_dirty
+  match_octal
+  match_strdup
+  mount_bdev
+  mpage_readpage
+  mpage_readpages
+  mpage_writepages
+  __mark_inode_dirty
+  nf_register_net_hooks
+  nf_unregister_net_hooks
+  sb_min_blocksize
+  sb_set_blocksize
+  setattr_copy
+  sync_blockdev
+  sync_dirty_buffer
+  sync_mapping_buffers
+  __remove_inode_hash
+  touch_buffer
+  truncate_pagecache
+  unload_nls
+  unlock_buffer
+  utf16s_to_utf8s
+  utf8s_to_utf16s
+  write_inode_now

arch/arm64/configs/db845c_gki.fragment

@@ -65,3 +65,4 @@ CONFIG_ARM_SMMU=m
 CONFIG_INCREMENTAL_FS=m
 CONFIG_PINCTRL_MSM=m
 CONFIG_QCOM_COMMAND_DB=m
+CONFIG_ARM_QCOM_CPUFREQ_HW=m

build.config.allmodconfig.aarch64

@@ -1,4 +1,4 @@
-. ${ROOT_DIR}/common/build.config.common
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
-. ${ROOT_DIR}/common/build.config.aarch64
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.aarch64
-. ${ROOT_DIR}/common/build.config.allmodconfig
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.allmodconfig
 

build.config.allmodconfig.arm

@@ -1,4 +1,4 @@
-. ${ROOT_DIR}/common/build.config.common
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
-. ${ROOT_DIR}/common/build.config.arm
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.arm
-. ${ROOT_DIR}/common/build.config.allmodconfig
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.allmodconfig
 

build.config.allmodconfig.x86_64

@@ -1,4 +1,4 @@
-. ${ROOT_DIR}/common/build.config.common
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
-. ${ROOT_DIR}/common/build.config.x86_64
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.x86_64
-. ${ROOT_DIR}/common/build.config.allmodconfig
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.allmodconfig
 

build.config.common

@@ -1,6 +1,5 @@
 BRANCH=android11-5.4
 KMI_GENERATION=0
-KERNEL_DIR=common
 
 CC=clang
 LD=ld.lld

build.config.db845c

@@ -1,10 +1,10 @@
-. ${ROOT_DIR}/common/build.config.common
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
-. ${ROOT_DIR}/common/build.config.aarch64
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.aarch64
 
 BUILD_INITRAMFS=1
 DEFCONFIG=db845c_gki_defconfig
-PRE_DEFCONFIG_CMDS="KCONFIG_CONFIG=${ROOT_DIR}/common/arch/arm64/configs/${DEFCONFIG} ${ROOT_DIR}/common/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/common/arch/arm64/configs/gki_defconfig ${ROOT_DIR}/common/arch/arm64/configs/db845c_gki.fragment"
+PRE_DEFCONFIG_CMDS="KCONFIG_CONFIG=${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/gki_defconfig ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/db845c_gki.fragment"
-POST_DEFCONFIG_CMDS="rm ${ROOT_DIR}/common/arch/arm64/configs/${DEFCONFIG}"
+POST_DEFCONFIG_CMDS="rm ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG}"
 
 FILES="
 arch/arm64/boot/Image.gz

build.config.gki-debug.aarch64

@@ -1,3 +1,3 @@
-. ${ROOT_DIR}/common/build.config.gki.aarch64
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.gki.aarch64
 TRIM_NONLISTED_KMI=""
 KMI_SYMBOL_LIST_STRICT_MODE=""

build.config.gki-debug.x86_64

@@ -1,3 +1,3 @@
-. ${ROOT_DIR}/common/build.config.gki.x86_64
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.gki.x86_64
 TRIM_NONLISTED_KMI=""
 KMI_SYMBOL_LIST_STRICT_MODE=""

build.config.gki.aarch64

@@ -1,6 +1,6 @@
-. ${ROOT_DIR}/common/build.config.common
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
-. ${ROOT_DIR}/common/build.config.aarch64
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.aarch64
-. ${ROOT_DIR}/common/build.config.gki
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.gki
 
 ABI_DEFINITION=android/abi_gki_aarch64.xml
 KMI_SYMBOL_LIST=android/abi_gki_aarch64
@@ -18,6 +18,7 @@ android/abi_gki_aarch64_sunxi
 android/abi_gki_aarch64_unisoc
 android/abi_gki_aarch64_vivo
 android/abi_gki_aarch64_workarounds
+android/abi_gki_aarch64_xiaomi
 "
 TRIM_NONLISTED_KMI=1
 KMI_SYMBOL_LIST_ADD_ONLY=1

build.config.gki.x86_64

@@ -1,4 +1,4 @@
-. ${ROOT_DIR}/common/build.config.common
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
-. ${ROOT_DIR}/common/build.config.x86_64
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.x86_64
-. ${ROOT_DIR}/common/build.config.gki
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.gki
 

build.config.gki_kasan

@@ -1,6 +1,5 @@
 DEFCONFIG=gki_defconfig
 POST_DEFCONFIG_CMDS="check_defconfig && update_kasan_config"
-KERNEL_DIR=common
 function update_kasan_config() {
     ${KERNEL_DIR}/scripts/config --file ${OUT_DIR}/.config \
          -e CONFIG_KASAN \

build.config.gki_kasan.aarch64

@@ -1,4 +1,3 @@
-. ${ROOT_DIR}/common/build.config.common
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
-. ${ROOT_DIR}/common/build.config.aarch64
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.aarch64
-. ${ROOT_DIR}/common/build.config.gki_kasan
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.gki_kasan
-

build.config.gki_kasan.x86_64

@@ -1,4 +1,4 @@
-. ${ROOT_DIR}/common/build.config.common
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
-. ${ROOT_DIR}/common/build.config.x86_64
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.x86_64
-. ${ROOT_DIR}/common/build.config.gki_kasan
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.gki_kasan
 

build.config.hikey960

@@ -1,9 +1,9 @@
-. ${ROOT_DIR}/common/build.config.common
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
-. ${ROOT_DIR}/common/build.config.aarch64
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.aarch64
 
 DEFCONFIG=hikey960_gki_defconfig
-PRE_DEFCONFIG_CMDS="cat ./common/arch/arm64/configs/gki_defconfig ./common/arch/arm64/configs/hikey960_gki.fragment > ./common/arch/arm64/configs/${DEFCONFIG};"
+PRE_DEFCONFIG_CMDS="cat ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/gki_defconfig ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/hikey960_gki.fragment > ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG};"
-POST_DEFCONFIG_CMDS="rm ./common/arch/arm64/configs/${DEFCONFIG}"
+POST_DEFCONFIG_CMDS="rm ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG}"
 
 EXT_MODULES="
 hikey-modules/midgard

drivers/base/arch_topology.c

@@ -35,7 +35,7 @@ void arch_set_freq_scale(struct cpumask *cpus, unsigned long cur_freq,
 
 	scale = (cur_freq << SCHED_CAPACITY_SHIFT) / max_freq;
 
-	trace_android_vh_arch_set_freq_scale(cur_freq, max_freq, &scale);
+	trace_android_vh_arch_set_freq_scale(cpus, cur_freq, max_freq, &scale);
 
 	for_each_cpu(i, cpus){
 		per_cpu(freq_scale, i) = scale;
@@ -58,7 +58,7 @@ void arch_set_max_freq_scale(struct cpumask *cpus,
 
 	scale = (policy_max_freq << SCHED_CAPACITY_SHIFT) / max_freq;
 
-	trace_android_vh_arch_set_freq_scale(policy_max_freq, max_freq, &scale);
+	trace_android_vh_arch_set_freq_scale(cpus, policy_max_freq, max_freq, &scale);
 
 	for_each_cpu(cpu, cpus)
 		per_cpu(max_freq_scale, cpu) = scale;

include/trace/hooks/topology.h

@@ -9,16 +9,18 @@
 
 #include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>
+#include <linux/cpumask.h>
 
 #if defined(CONFIG_TRACEPOINTS) && defined(CONFIG_ANDROID_VENDOR_HOOKS)
 
 DECLARE_HOOK(android_vh_arch_set_freq_scale,
-	TP_PROTO(unsigned long freq, unsigned long max, unsigned long *scale),
+	TP_PROTO(struct cpumask *cpus, unsigned long freq, unsigned long max,
-	TP_ARGS(freq, max, scale));
+		unsigned long *scale),
+	TP_ARGS(cpus, freq, max, scale));
 
 #else
 
-#define trace_android_vh_arch_set_freq_scale(freq, max, scale)
+#define trace_android_vh_arch_set_freq_scale(cpus, freq, max, scale)
 
 #endif
 

kernel/kthread.c

@@ -886,7 +886,9 @@ static void __kthread_queue_delayed_work(struct kthread_worker *worker,
 	struct timer_list *timer = &dwork->timer;
 	struct kthread_work *work = &dwork->work;
 
+#ifndef CONFIG_CFI_CLANG
 	WARN_ON_ONCE(timer->function != kthread_delayed_work_timer_fn);
+#endif
 
 	/*
 	 * If @delay is 0, queue @dwork->work immediately.  This is for

kernel/pid.c

@@ -354,6 +354,7 @@ struct task_struct *find_task_by_vpid(pid_t vnr)
 {
 	return find_task_by_pid_ns(vnr, task_active_pid_ns(current));
 }
+EXPORT_SYMBOL_GPL(find_task_by_vpid);
 
 struct task_struct *find_get_task_by_vpid(pid_t nr)
 {

kernel/sched/core.c

@@ -44,6 +44,7 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(pelt_se_tp);
 EXPORT_TRACEPOINT_SYMBOL_GPL(sched_overutilized_tp);
 
 DEFINE_PER_CPU_SHARED_ALIGNED(struct rq, runqueues);
+EXPORT_SYMBOL_GPL(runqueues);
 
 #if defined(CONFIG_SCHED_DEBUG) && defined(CONFIG_JUMP_LABEL)
 /*

kernel/sched/cputime.c

@@ -482,6 +482,7 @@ void thread_group_cputime_adjusted(struct task_struct *p, u64 *ut, u64 *st)
 	*ut = cputime.utime;
 	*st = cputime.stime;
 }
+EXPORT_SYMBOL_GPL(thread_group_cputime_adjusted);
 
 #else /* !CONFIG_VIRT_CPU_ACCOUNTING_NATIVE: */
 
@@ -696,6 +697,8 @@ void thread_group_cputime_adjusted(struct task_struct *p, u64 *ut, u64 *st)
 	thread_group_cputime(p, &cputime);
 	cputime_adjust(&cputime, &p->signal->prev_cputime, ut, st);
 }
+EXPORT_SYMBOL_GPL(thread_group_cputime_adjusted);
+
 #endif /* !CONFIG_VIRT_CPU_ACCOUNTING_NATIVE */
 
 #ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN

kernel/sched/loadavg.c

@@ -75,6 +75,7 @@ void get_avenrun(unsigned long *loads, unsigned long offset, int shift)
 	loads[1] = (avenrun[1] + offset) << shift;
 	loads[2] = (avenrun[2] + offset) << shift;
 }
+EXPORT_SYMBOL_GPL(get_avenrun);
 
 long calc_load_fold_active(struct rq *this_rq, long adjust)
 {

kernel/signal.c

@@ -1397,6 +1397,7 @@ struct sighand_struct *__lock_task_sighand(struct task_struct *tsk,
 
 	return sighand;
 }
+EXPORT_SYMBOL_GPL(__lock_task_sighand);
 
 /*
  * send signal info to all the members of a group

kernel/time/time.c

@@ -776,6 +776,7 @@ u64 nsec_to_clock_t(u64 x)
 	return div_u64(x * 9, (9ull * NSEC_PER_SEC + (USER_HZ / 2)) / USER_HZ);
 #endif
 }
+EXPORT_SYMBOL_GPL(nsec_to_clock_t);
 
 u64 jiffies64_to_nsecs(u64 j)
 {