UBUNTU: [Config] update configs and annotations after rebase to 6.0-rc5

In particular drop CONFIG_ARM64_BTI_KERNEL that is not supported anymore
if the kernel is built with gcc, see:

 c0a454b904 ("arm64/bti: Disable in kernel BTI when cross section thunks are broken")

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
This commit is contained in:
Andrea Righi
2022-09-12 13:57:34 +02:00
committed by Paolo Pisati
parent 3a87b14c78
commit 8bd8662cf8
2 changed files with 1 additions and 2 deletions
-1
View File
@@ -13479,7 +13479,6 @@ CONFIG_ARM64_TLB_RANGE policy<{'arm64': 'y'}>
# Menu: Processor type and features >> ARMv8.5 architectural features >> Architecture: arm64
CONFIG_ARM64_BTI policy<{'arm64': 'y'}>
CONFIG_ARM64_BTI_KERNEL policy<{'arm64': 'y'}>
CONFIG_ARM64_E0PD policy<{'arm64': 'y'}>
CONFIG_ARM64_MTE policy<{'arm64': 'y'}>
+1 -1
View File
@@ -673,7 +673,6 @@ CONFIG_ARM64_ACPI_PARKING_PROTOCOL=y
CONFIG_ARM64_AMU_EXTN=y
CONFIG_ARM64_AS_HAS_MTE=y
CONFIG_ARM64_BTI=y
CONFIG_ARM64_BTI_KERNEL=y
CONFIG_ARM64_CNP=y
CONFIG_ARM64_CRYPTO=y
# CONFIG_ARM64_DEBUG_PRIORITY_MASKING is not set
@@ -11169,6 +11168,7 @@ CONFIG_SOC_TEGRA_POWERGATE_BPMP=y
CONFIG_SOC_TI81XX=y
CONFIG_SOC_VF610=y
CONFIG_SOC_VIRT=y
CONFIG_SOFTIRQ_ON_OWN_STACK=y
CONFIG_SOFTLOCKUP_DETECTOR=y
CONFIG_SOFT_WATCHDOG=m
CONFIG_SOFT_WATCHDOG_PRETIMEOUT=y