Merge keystone/android14-6.1-keystone-qcom-release.6.1.15 (4d4b0e0) into msm-pineapple

* refs/heads/tmp-4d4b0e0:
  ANDROID: GKI: defconfig: enable BTF debug info

Change-Id: I99699da2c45c459deee28e8c801e27384367b4fe
Upstream-Build: ks_qcom-android14-6.1-keystone-qcom-release@9775816 UKQ2.230320.001
Signed-off-by: jianzhou <quic_jianzhou@quicinc.com>
This commit is contained in:
jianzhou 2023-03-20 22:20:36 -07:00
commit 64b3aa994a
5 changed files with 109229 additions and 6657 deletions

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -675,6 +675,8 @@ CONFIG_PRINTK_TIME=y
CONFIG_PRINTK_CALLER=y
CONFIG_DYNAMIC_DEBUG_CORE=y
CONFIG_DEBUG_INFO_DWARF4=y
CONFIG_DEBUG_INFO_BTF=y
CONFIG_MODULE_ALLOW_BTF_MISMATCH=y
CONFIG_HEADERS_INSTALL=y
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
CONFIG_MAGIC_SYSRQ=y

View file

@ -626,6 +626,8 @@ CONFIG_DMA_CMA=y
CONFIG_PRINTK_TIME=y
CONFIG_DYNAMIC_DEBUG_CORE=y
CONFIG_DEBUG_INFO_DWARF4=y
CONFIG_DEBUG_INFO_BTF=y
CONFIG_MODULE_ALLOW_BTF_MISMATCH=y
CONFIG_HEADERS_INSTALL=y
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
CONFIG_MAGIC_SYSRQ=y

View file

@ -4829,6 +4829,7 @@ kernel/bpf/reuseport_array.c
kernel/bpf/ringbuf.c
kernel/bpf/stackmap.c
kernel/bpf/syscall.c
kernel/bpf/sysfs_btf.c
kernel/bpf/task_iter.c
kernel/bpf/tnum.c
kernel/bpf/trampoline.c
@ -5930,6 +5931,7 @@ net/netfilter/core.c
net/netfilter/nf_conncount.c
net/netfilter/nf_conntrack_acct.c
net/netfilter/nf_conntrack_amanda.c
net/netfilter/nf_conntrack_bpf.c
net/netfilter/nf_conntrack_broadcast.c
net/netfilter/nf_conntrack_core.c
net/netfilter/nf_conntrack_ecache.c
@ -5960,6 +5962,7 @@ net/netfilter/nf_conntrack_tftp.c
net/netfilter/nf_internals.h
net/netfilter/nf_log.c
net/netfilter/nf_nat_amanda.c
net/netfilter/nf_nat_bpf.c
net/netfilter/nf_nat_core.c
net/netfilter/nf_nat_ftp.c
net/netfilter/nf_nat_helper.c