diff options
| author | Aleksander Jan Bajkowski <olek2@wp.pl> | 2022-03-27 11:53:09 +0200 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2022-03-27 15:50:14 +0100 |
| commit | 26e7c2275730486a5a1201fbafe72ccdac15f6e4 (patch) | |
| tree | 737ca988e086109cc6656b7f06bd4cd81b3017fb /target/linux/generic/config-5.10 | |
| parent | 1e83d53fd96a400b2f131b8cb0e5b5e92dc546b0 (diff) | |
| download | upstream-26e7c2275730486a5a1201fbafe72ccdac15f6e4.tar.gz upstream-26e7c2275730486a5a1201fbafe72ccdac15f6e4.tar.bz2 upstream-26e7c2275730486a5a1201fbafe72ccdac15f6e4.zip | |
kernel: sort generic configuration
This was done by executing these commands:
$ ./scripts/kconfig.pl '+' target/linux/generic/config-5.10 /dev/null > target/linux/generic/config-5.10-new
$ mv target/linux/generic/config-5.10-new target/linux/generic/config-5.10
$ ./scripts/kconfig.pl '+' target/linux/generic/config-5.15 /dev/null > target/linux/generic/config-5.15-new
$ mv target/linux/generic/config-5.15-new target/linux/generic/config-5.15
Signed-off-by: Aleksander Jan Bajkowski <olek2@wp.pl>
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Diffstat (limited to 'target/linux/generic/config-5.10')
| -rw-r--r-- | target/linux/generic/config-5.10 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/config-5.10 b/target/linux/generic/config-5.10 index a093861b9d..a46fe13e64 100644 --- a/target/linux/generic/config-5.10 +++ b/target/linux/generic/config-5.10 @@ -2168,6 +2168,7 @@ CONFIG_GPIO_SYSFS=y 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_EL2_VECTORS=y # CONFIG_HARDLOCKUP_DETECTOR is not set # CONFIG_HAVE_ARM_ARCH_TIMER is not set @@ -3389,8 +3390,6 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 # CONFIG_MICROCHIP_T1_PHY is not set # CONFIG_MICROSEMI_PHY is not set # CONFIG_MIGRATION is not set -CONFIG_HARDEN_BRANCH_HISTORY=y -CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y CONFIG_MII=y # CONFIG_MIKROTIK is not set # CONFIG_MIKROTIK_RB532 is not set @@ -3421,6 +3420,7 @@ CONFIG_MISC_FILESYSTEMS=y # CONFIG_MISDN_NETJET is not set # CONFIG_MISDN_SPEEDFAX is not set # CONFIG_MISDN_W6692 is not set +CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y # CONFIG_MKISS is not set # CONFIG_MLX4_CORE is not set # CONFIG_MLX4_EN is not set |