UBUNTU: [Config] MITIGATE_SPECTRE_BRANCH_HISTORY=y && HARDEN_BRANCH_HISTORY=y

[mirror_ubuntu-jammy-kernel.git] / debian.master / config / config.common.ubuntu

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index f662c7d87c87447b75fb19c1b275a5e0a567b5c0..f2507e5f3e105a38da28acf21af3868c7265036e 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -980,6 +980,7 @@ CONFIG_AUDIT_ARCH=y
 CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y
 CONFIG_AUDIT_COMPAT_GENERIC=y
 CONFIG_AUDIT_GENERIC=y
+# CONFIG_AUFS_FS is not set
 CONFIG_AUTO_ZRELADDR=y
 CONFIG_AUXILIARY_BUS=y
 CONFIG_AX25=m
@@ -2254,6 +2255,7 @@ CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
 CONFIG_CRYPTO_CHACHA20_NEON=m
 CONFIG_CRYPTO_CHACHA20_X86_64=m
+CONFIG_CRYPTO_CHACHA_S390=m
 CONFIG_CRYPTO_CMAC=m
 CONFIG_CRYPTO_CRC32=m
 CONFIG_CRYPTO_CRC32C=y
@@ -2583,8 +2585,8 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y
 CONFIG_DEBUG_INFO=y
 CONFIG_DEBUG_INFO_BTF_MODULES=y
 # CONFIG_DEBUG_INFO_COMPRESSED is not set
-CONFIG_DEBUG_INFO_DWARF4=y
-# CONFIG_DEBUG_INFO_DWARF5 is not set
+# CONFIG_DEBUG_INFO_DWARF4 is not set
+CONFIG_DEBUG_INFO_DWARF5=y
 # CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
@@ -4088,6 +4090,7 @@ CONFIG_HAPPYMEAL=m
 CONFIG_HARDENED_USERCOPY=y
 # CONFIG_HARDENED_USERCOPY_FALLBACK is not set
 # CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
+CONFIG_HARDEN_BRANCH_HISTORY=y
 CONFIG_HARDEN_BRANCH_PREDICTOR=y
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_HARDLOCKUP_CHECK_TIMESTAMP=y
@@ -4409,7 +4412,6 @@ CONFIG_HIGHMEM=y
 CONFIG_HIGHPTE=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_HINIC=m
-# CONFIG_HIO is not set
 CONFIG_HIP04_ETH=m
 # CONFIG_HIPPI is not set
 CONFIG_HISILICON_ERRATUM_161010101=y
@@ -6208,6 +6210,7 @@ CONFIG_MISDN_L1OIP=m
 CONFIG_MISDN_NETJET=m
 CONFIG_MISDN_SPEEDFAX=m
 CONFIG_MISDN_W6692=m
+CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y
 # CONFIG_MK8 is not set
 CONFIG_MKISS=m
 CONFIG_MLX4_CORE=m
@@ -7379,7 +7382,6 @@ CONFIG_OF_IOMMU=y
 CONFIG_OF_IRQ=y
 CONFIG_OF_KOBJ=y
 CONFIG_OF_MDIO=y
-CONFIG_OF_NET=y
 CONFIG_OF_NUMA=y
 CONFIG_OF_OVERLAY=y
 CONFIG_OF_PMEM=m
@@ -7466,6 +7468,7 @@ CONFIG_PAGE_POOL=y
 CONFIG_PAGE_REPORTING=y
 CONFIG_PAGE_TABLE_ISOLATION=y
 CONFIG_PAHOLE_HAS_SPLIT_BTF=y
+CONFIG_PAHOLE_VERSION=122
 CONFIG_PALMAS_GPADC=m
 CONFIG_PANASONIC_LAPTOP=m
 CONFIG_PANEL=m
@@ -8478,7 +8481,7 @@ CONFIG_QED_SRIOV=y
 CONFIG_QETH=m
 CONFIG_QETH_L2=m
 CONFIG_QETH_L3=m
-CONFIG_QETH_OSX=y
+# CONFIG_QETH_OSX is not set
 CONFIG_QE_GPIO=y
 CONFIG_QE_TDM=y
 CONFIG_QE_USB=y
@@ -10904,7 +10907,6 @@ CONFIG_SYSC_R8A779A0=y
 CONFIG_SYSC_RCAR=y
 CONFIG_SYSC_RMOBILE=y
 CONFIG_SYSFB=y
-CONFIG_SYSFB_SIMPLEFB=y
 CONFIG_SYSFS=y
 # CONFIG_SYSFS_DEPRECATED is not set
 CONFIG_SYSFS_SYSCALL=y