Unverified Commit 2ddfdd8a authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!768 Backport 5.10.151 LTS 

Merge Pull Request from: @sanglipeng 
 
Backport 5.10.151 LTS patches from upstream.

Total patches: 5 
 
Link:https://gitee.com/openeuler/kernel/pulls/768

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 213e8d25 d7de1c44

Makefile

+3 −0
Original line number Diff line number Diff line
@@ -467,6 +467,8 @@ LZ4 = lz4c 
XZ		= xz

ZSTD		= zstd



PAHOLE_FLAGS	= $(shell PAHOLE=$(PAHOLE) $(srctree)/scripts/pahole-flags.sh)



CHECKFLAGS     := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \

		  -Wbitwise -Wno-return-void -Wno-unknown-attribute $(CF)

NOSTDINC_FLAGS :=
@@ -520,6 +522,7 @@ export KBUILD_CFLAGS CFLAGS_KERNEL CFLAGS_MODULE 
export KBUILD_AFLAGS AFLAGS_KERNEL AFLAGS_MODULE

export KBUILD_AFLAGS_MODULE KBUILD_CFLAGS_MODULE KBUILD_LDFLAGS_MODULE

export KBUILD_AFLAGS_KERNEL KBUILD_CFLAGS_KERNEL

export PAHOLE_FLAGS



# Files to ignore in find ... statements

scripts/link-vmlinux.sh

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,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

scripts/pahole-flags.sh

0 → 100755
+21 −0
Original line number Diff line number Diff line 
#!/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}