mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
btf: rename /sys/kernel/btf/kernel into /sys/kernel/btf/vmlinux
Expose kernel's BTF under the name vmlinux to be more uniform with using
kernel module names as file names in the future.
Fixes: 341dfcf8d7 ("btf: expose BTF info through sysfs")
Suggested-by: Daniel Borkmann <[email protected]>
Signed-off-by: Andrii Nakryiko <[email protected]>
Signed-off-by: Daniel Borkmann <[email protected]>
This commit is contained in:
parent
9840a4ffcf
commit
7fd785685e
3 changed files with 25 additions and 25 deletions
|
|
@ -117,9 +117,9 @@ gen_btf()
|
|||
# dump .BTF section into raw binary file to link with final vmlinux
|
||||
bin_arch=$(${OBJDUMP} -f ${1} | grep architecture | \
|
||||
cut -d, -f1 | cut -d' ' -f2)
|
||||
${OBJCOPY} --dump-section .BTF=.btf.kernel.bin ${1} 2>/dev/null
|
||||
${OBJCOPY} --dump-section .BTF=.btf.vmlinux.bin ${1} 2>/dev/null
|
||||
${OBJCOPY} -I binary -O ${CONFIG_OUTPUT_FORMAT} -B ${bin_arch} \
|
||||
--rename-section .data=.BTF .btf.kernel.bin ${2}
|
||||
--rename-section .data=.BTF .btf.vmlinux.bin ${2}
|
||||
}
|
||||
|
||||
# Create ${2} .o file with all symbols from the ${1} object file
|
||||
|
|
@ -227,10 +227,10 @@ ${MAKE} -f "${srctree}/scripts/Makefile.modpost" vmlinux.o
|
|||
info MODINFO modules.builtin.modinfo
|
||||
${OBJCOPY} -j .modinfo -O binary vmlinux.o modules.builtin.modinfo
|
||||
|
||||
btf_kernel_bin_o=""
|
||||
btf_vmlinux_bin_o=""
|
||||
if [ -n "${CONFIG_DEBUG_INFO_BTF}" ]; then
|
||||
if gen_btf .tmp_vmlinux.btf .btf.kernel.bin.o ; then
|
||||
btf_kernel_bin_o=.btf.kernel.bin.o
|
||||
if gen_btf .tmp_vmlinux.btf .btf.vmlinux.bin.o ; then
|
||||
btf_vmlinux_bin_o=.btf.vmlinux.bin.o
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
@ -265,11 +265,11 @@ if [ -n "${CONFIG_KALLSYMS}" ]; then
|
|||
kallsyms_vmlinux=.tmp_vmlinux2
|
||||
|
||||
# step 1
|
||||
vmlinux_link .tmp_vmlinux1 ${btf_kernel_bin_o}
|
||||
vmlinux_link .tmp_vmlinux1 ${btf_vmlinux_bin_o}
|
||||
kallsyms .tmp_vmlinux1 .tmp_kallsyms1.o
|
||||
|
||||
# step 2
|
||||
vmlinux_link .tmp_vmlinux2 .tmp_kallsyms1.o ${btf_kernel_bin_o}
|
||||
vmlinux_link .tmp_vmlinux2 .tmp_kallsyms1.o ${btf_vmlinux_bin_o}
|
||||
kallsyms .tmp_vmlinux2 .tmp_kallsyms2.o
|
||||
|
||||
# step 3
|
||||
|
|
@ -280,13 +280,13 @@ if [ -n "${CONFIG_KALLSYMS}" ]; then
|
|||
kallsymso=.tmp_kallsyms3.o
|
||||
kallsyms_vmlinux=.tmp_vmlinux3
|
||||
|
||||
vmlinux_link .tmp_vmlinux3 .tmp_kallsyms2.o ${btf_kernel_bin_o}
|
||||
vmlinux_link .tmp_vmlinux3 .tmp_kallsyms2.o ${btf_vmlinux_bin_o}
|
||||
kallsyms .tmp_vmlinux3 .tmp_kallsyms3.o
|
||||
fi
|
||||
fi
|
||||
|
||||
info LD vmlinux
|
||||
vmlinux_link vmlinux "${kallsymso}" "${btf_kernel_bin_o}"
|
||||
vmlinux_link vmlinux "${kallsymso}" "${btf_vmlinux_bin_o}"
|
||||
|
||||
if [ -n "${CONFIG_BUILDTIME_EXTABLE_SORT}" ]; then
|
||||
info SORTEX vmlinux
|
||||
|
|
|
|||
Loading…
Reference in a new issue