Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux.git] / scripts / link-vmlinux.sh

diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
index dd2b31ccca6a40f5c8a8d10bba81d76ea1425d15..a7124f895b2454179827ccdc7850bdb48aae1085 100755 (executable)
--- a/scripts/link-vmlinux.sh
+++ b/scripts/link-vmlinux.sh
@@ -96,10 +96,15 @@ gen_btf()
 {
        local pahole_ver;
 
+       if ! [ -x "$(command -v ${PAHOLE})" ]; then
+               info "BTF" "${1}: pahole (${PAHOLE}) is not available"
+               return 0
+       fi
+
        pahole_ver=$(${PAHOLE} --version | sed -E 's/v([0-9]+)\.([0-9]+)/\1\2/')
        if [ "${pahole_ver}" -lt "113" ]; then
                info "BTF" "${1}: pahole version $(${PAHOLE} --version) is too old, need at least v1.13"
-               exit 0
+               return 0
        fi
 
        info "BTF" ${1}
@@ -207,6 +212,9 @@ modpost_link vmlinux.o
 # modpost vmlinux.o to check for section mismatches
 ${MAKE} -f "${srctree}/scripts/Makefile.modpost" vmlinux.o
 
+info MODINFO modules.builtin.modinfo
+${OBJCOPY} -j .modinfo -O binary vmlinux.o modules.builtin.modinfo
+
 kallsymso=""
 kallsyms_vmlinux=""
 if [ -n "${CONFIG_KALLSYMS}" ]; then