[OpenWrt-Devel] [PATCH 1/2] mvebu: move HARDEN_BRANCH_PREDICTOR to common config

[Rosen Penev]

On Sun, Jan 13, 2019 at 12:29 PM Tomasz Maciej Nowak <tomek_n at o2.pl> wrote:
>
> This symbol is enabled in all subtargets, move it to common kernel
> config.
>
> Signed-off-by: Tomasz Maciej Nowak <tomek_n at o2.pl>
> ---
>  target/linux/mvebu/config-4.14              | 1 +
>  target/linux/mvebu/cortexa53/config-default | 1 -
>  target/linux/mvebu/cortexa72/config-default | 1 -
>  target/linux/mvebu/cortexa9/config-default  | 1 -
>  4 files changed, 1 insertion(+), 3 deletions(-)
>  delete mode 100644 target/linux/mvebu/cortexa9/config-default
>
> diff --git a/target/linux/mvebu/config-4.14 b/target/linux/mvebu/config-4.14
> index 296da5a109..cb26a927f9 100644
> --- a/target/linux/mvebu/config-4.14
> +++ b/target/linux/mvebu/config-4.14
> @@ -212,6 +212,7 @@ CONFIG_GPIO_PCA953X_IRQ=y
>  CONFIG_GPIO_SYSFS=y
>  # CONFIG_GRO_CELLS is not set
>  CONFIG_HANDLE_DOMAIN_IRQ=y
> +CONFIG_HARDEN_BRANCH_PREDICTOR=y
>  CONFIG_HARDIRQS_SW_RESEND=y
>  CONFIG_HAS_DMA=y
>  CONFIG_HAS_IOMEM=y
> diff --git a/target/linux/mvebu/cortexa53/config-default b/target/linux/mvebu/cortexa53/config-default
> index b631c30f5f..c5fcc0f3f8 100644
> --- a/target/linux/mvebu/cortexa53/config-default
> +++ b/target/linux/mvebu/cortexa53/config-default
> @@ -65,7 +65,6 @@ CONFIG_GENERIC_CSUM=y
>  CONFIG_GENERIC_IRQ_MIGRATION=y
>  CONFIG_GENERIC_PINCONF=y
>  CONFIG_GENERIC_TIME_VSYSCALL=y
> -CONFIG_HARDEN_BRANCH_PREDICTOR=y
>  CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
>  CONFIG_HAVE_ARCH_HUGE_VMAP=y
>  CONFIG_HAVE_ARCH_KASAN=y
> diff --git a/target/linux/mvebu/cortexa72/config-default b/target/linux/mvebu/cortexa72/config-default
> index 50b8d21c32..b855aa21d1 100644
> --- a/target/linux/mvebu/cortexa72/config-default
> +++ b/target/linux/mvebu/cortexa72/config-default
> @@ -63,7 +63,6 @@ CONFIG_GENERIC_CSUM=y
>  CONFIG_GENERIC_IRQ_MIGRATION=y
>  CONFIG_GENERIC_PINCONF=y
>  CONFIG_GENERIC_TIME_VSYSCALL=y
> -CONFIG_HARDEN_BRANCH_PREDICTOR=y
>  CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
>  CONFIG_HAVE_ARCH_HUGE_VMAP=y
>  CONFIG_HAVE_ARCH_KASAN=y
> diff --git a/target/linux/mvebu/cortexa9/config-default b/target/linux/mvebu/cortexa9/config-default
> deleted file mode 100644
> index c9f039ba96..0000000000
> --- a/target/linux/mvebu/cortexa9/config-default
> +++ /dev/null
> @@ -1 +0,0 @@
> -CONFIG_HARDEN_BRANCH_PREDICTOR=y
Acked-by: Rosen Penev <rosenp at gmail.com>

I've been carrying this in my tree since it got introduced as it broke
my builds (probably needed a new .config file).
> --
> 2.20.1
>
>
> _______________________________________________
> openwrt-devel mailing list
> openwrt-devel at lists.openwrt.org
> https://lists.openwrt.org/mailman/listinfo/openwrt-devel

_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel