Merge "defconfig: consolidate: Enable PAGE_OWNER and pointer printing"

This commit is contained in:
qctecmdr 2021-03-04 22:36:47 -08:00 committed by Gerrit - the friendly Code Review server
commit a5daf21bc8
2 changed files with 4 additions and 2 deletions

View File

@ -4,6 +4,7 @@ CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=1
CONFIG_BUG_ON_HW_MEM_ONLINE_FAIL=y
CONFIG_CMA_DEBUG=y
CONFIG_CMA_DEBUGFS=y
CONFIG_CMDLINE="kasan.stacktrace=off stack_depot_disable=off page_owner=on no_hash_pointers"
CONFIG_CNSS2_DEBUG=y
CONFIG_DEBUG_KMEMLEAK=y
# CONFIG_DEBUG_KMEMLEAK_AUTO_SCAN is not set

View File

@ -119,10 +119,11 @@ function check_merged_defconfig() {
local output=$(mktemp)
${KERNEL_DIR}/scripts/diffconfig "${KERNEL_DIR}/arch/${ARCH}/configs/${DEFCONFIG}" ${OUT_DIR}/.config > $output
set +x
if grep -q -v -E -e "^\+" $output; then
# Allow CONFIG_CMDLINE changes
if grep -q -v -E -e "^\+" -e "^CMDLINE " $output; then
echo "========================================================"
echo "ERROR! Defconfig fragment did not apply as expected"
grep -v -E -e "^\+" $output
grep -v -E -e "^\+" -e "^CMDLINE " $output
rm $output
exit 1
fi