This is the 5.10.151 stable release
-----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmNbttoACgkQONu9yGCS aT6QuA/+Mt8t7zw4PFEi4/pQ47Yc211jLj9mWyEwWsxfXW+H69G4WoDS0/OzZEik yY7TYOsxn4Gwzv7g6ThnzqBe9FpVAx1Yev91G5cANV1UCzm4mbRQ5+8hcE7ao0Ae IDKvKKOltYnU5iCVM3qPZehKyqwvKujiP4vLvolBk0psEabr/V6v/MDSaMkksaOB 3zvedd2alF+h05JM8cNyF4IZVJVGqaGir2IiiQQxjjoc1sXxBbqXV1xvRTZ3hzFb 4/WrFU2wyOFtic1Gv943VO1XrHrXy1a6FpRyw1Yzbvi8M+4mI1UJLvcp/bB4YyPt 7TVB/RxMP5yxd3wUavfGU4f5r7tBkejzVt14J9k1Qkkv1tIemnO8OYcfm3x9LilC COVaWFGUV3DMwReF9bkdVXgSxichjDhaGZWFcCQrTq7Rc4ND4Pal38M2mw+At/VG syvKmcAGK9bFLgDLp+nLppmNxZAeb7/0YXFFWGmPrGTog6LPorti7sbRPb9yKbsY WKiyVdpjdP4mqZaxyj1+Ga8KharQTxKtJvqE6YR24lvNLcfz/Q6leoKmYQta7hcr QTALyScCPbNzFtyKTqFIYzCuBRosewk/rRS0cNLSuok4PwCGrn8QNfAFPdorTHxs kuXTTL0xv3ePMyKKpPg0K7CTZKnVc+oiVObQ8DBq4hEtALKaUe0= =xH7u -----END PGP SIGNATURE----- Merge 5.10.151 into android12-5.10-lts Changes in 5.10.151 bpf: Generate BTF_KIND_FLOAT when linking vmlinux kbuild: Quote OBJCOPY var to avoid a pahole call break the build kbuild: skip per-CPU BTF generation for pahole v1.18-v1.21 kbuild: Unify options for BTF generation for vmlinux and modules kbuild: Add skip_encoding_btf_enum64 option to pahole Linux 5.10.151 Change-Id: I9933085e5146688af0c7ebae2708c1c978100a90 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
commit
bf759deb0f
3 changed files with 26 additions and 2 deletions
|
|
@ -234,7 +234,7 @@ gen_btf()
|
|||
vmlinux_link ${1}
|
||||
|
||||
info "BTF" ${2}
|
||||
LLVM_OBJCOPY=${OBJCOPY} ${PAHOLE} -J ${1}
|
||||
LLVM_OBJCOPY="${OBJCOPY}" ${PAHOLE} -J ${PAHOLE_FLAGS} ${1}
|
||||
|
||||
# Create ${2} which contains just .BTF section but no symbols. Add
|
||||
# SHF_ALLOC because .BTF will be part of the vmlinux image. --strip-all
|
||||
|
|
|
|||
21
scripts/pahole-flags.sh
Executable file
21
scripts/pahole-flags.sh
Executable file
|
|
@ -0,0 +1,21 @@
|
|||
#!/bin/sh
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
|
||||
extra_paholeopt=
|
||||
|
||||
if ! [ -x "$(command -v ${PAHOLE})" ]; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
pahole_ver=$(${PAHOLE} --version | sed -E 's/v([0-9]+)\.([0-9]+)/\1\2/')
|
||||
|
||||
if [ "${pahole_ver}" -ge "118" ] && [ "${pahole_ver}" -le "121" ]; then
|
||||
# pahole 1.18 through 1.21 can't handle zero-sized per-CPU vars
|
||||
extra_paholeopt="${extra_paholeopt} --skip_encoding_btf_vars"
|
||||
fi
|
||||
|
||||
if [ "${pahole_ver}" -ge "124" ]; then
|
||||
extra_paholeopt="${extra_paholeopt} --skip_encoding_btf_enum64"
|
||||
fi
|
||||
|
||||
echo ${extra_paholeopt}
|
||||
Loading…
Add table
Add a link
Reference in a new issue