Skip to content

Commit

Permalink
[arm64]: add kconfig force inclusion for COMPAT_VSDO
Browse files Browse the repository at this point in the history
Kernel support for 32-bit EL0 (COMPAT) [Y/n/?] y
  Enable kuser helpers page for 32-bit applications (KUSER_HELPERS) [Y/n/?] y
  Enable vDSO for 32-bit applications (COMPAT_VDSO) [Y/n/?] (NEW)

make -C olddefconfig will clear the this kconfig. thus, introduce
force_inclusion file and directly add the kconfig without further check.

Signed-off-by: Guohan Lu <lguohan@gmail.com>
  • Loading branch information
lguohan authored and saiarcot895 committed Nov 9, 2021
1 parent fafaaea commit 39c7d18
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 1 deletion.
13 changes: 12 additions & 1 deletion manage-config
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ function get_section_opts(){
ret=0
exclusion_file="../patch/kconfig-exclusions"
inclusion_file="../patch/kconfig-inclusions"
if [ -e ${exclusion_file} -o -e ${inclusion_file} ]; then
force_inclusion_file="../patch/kconfig-force-inclusions"
if [ -e ${exclusion_file} -o -e ${inclusion_file} -o -e ${force_inclusion_file} ]; then

# Process any exclusions in the kernel
if [ -f ${exclusion_file} ]; then
Expand Down Expand Up @@ -124,6 +125,16 @@ if [ -e ${exclusion_file} -o -e ${inclusion_file} ]; then
fi
fi

# Process any force inclusions in the kernel
if [ -f ${force_inclusion_file} ]; then
force_inclusion_opts=$(get_section_opts ${force_inclusion_file} "common" ${ARCH} ${PLATFORM})
while read -r opt; do
if [ ! -z "$opt" ] && [[ ! "$opt" =~ ^#.* ]]; then
echo $opt >> ${CONFIG_FILE}
fi
done <<< ${force_inclusion_opts};
fi

echo
fi

Expand Down
3 changes: 3 additions & 0 deletions patch/kconfig-force-inclusions
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[arm64]
CONFIG_COMPAT_VDSO=y
CONFIG_THUMB2_COMPAT_VDSO=y

0 comments on commit 39c7d18

Please sign in to comment.