APPLIED[Xenial/linux]: [PATCH] UBUNTU: [Config] arm64: disable BPF_JIT_ALWAYS_ON

[Kleber Souza]

On 04/13/18 11:41, Paolo Pisati wrote:
> BugLink: https://bugs.launchpad.net/bugs/1763644
> 
> Signed-off-by: Paolo Pisati <paolo.pisati at canonical.com>
> ---
>  debian.master/config/amd64/config.common.amd64 | 1 +
>  debian.master/config/arm64/config.common.arm64 | 1 +
>  debian.master/config/config.common.ubuntu      | 1 -
>  debian.master/config/s390x/config.common.s390x | 1 +
>  4 files changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
> index 1377cde..4717770 100644
> --- a/debian.master/config/amd64/config.common.amd64
> +++ b/debian.master/config/amd64/config.common.amd64
> @@ -52,6 +52,7 @@ CONFIG_BLK_DEV_SKD=m
>  CONFIG_BLK_DEV_SX8=m
>  CONFIG_BLK_DEV_UMEM=m
>  CONFIG_BOUNCE=y
> +CONFIG_BPF_JIT_ALWAYS_ON=y
>  CONFIG_BSD_DISKLABEL=y
>  CONFIG_C2PORT=m
>  CONFIG_CADENCE_WATCHDOG=m
> diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
> index 06c6881..18f8e06 100644
> --- a/debian.master/config/arm64/config.common.arm64
> +++ b/debian.master/config/arm64/config.common.arm64
> @@ -52,6 +52,7 @@ CONFIG_BLK_DEV_SKD=m
>  CONFIG_BLK_DEV_SX8=m
>  CONFIG_BLK_DEV_UMEM=m
>  CONFIG_BOUNCE=y
> +# CONFIG_BPF_JIT_ALWAYS_ON is not set
>  CONFIG_BSD_DISKLABEL=y
>  CONFIG_C2PORT=m
>  CONFIG_CADENCE_WATCHDOG=m
> diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
> index 408ccc3..151cd37 100644
> --- a/debian.master/config/config.common.ubuntu
> +++ b/debian.master/config/config.common.ubuntu
> @@ -931,7 +931,6 @@ CONFIG_BOOT_PRINTK_DELAY=y
>  CONFIG_BPF=y
>  CONFIG_BPF_EVENTS=y
>  CONFIG_BPF_JIT=y
> -CONFIG_BPF_JIT_ALWAYS_ON=y
>  CONFIG_BPF_SYSCALL=y
>  CONFIG_BPQETHER=m
>  CONFIG_BQL=y
> diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
> index b82bf27..6d64fdf 100644
> --- a/debian.master/config/s390x/config.common.s390x
> +++ b/debian.master/config/s390x/config.common.s390x
> @@ -43,6 +43,7 @@ CONFIG_BLK_DEV_SR_VENDOR=y
>  # CONFIG_BLK_DEV_SX8 is not set
>  # CONFIG_BLK_DEV_UMEM is not set
>  # CONFIG_BOUNCE is not set
> +CONFIG_BPF_JIT_ALWAYS_ON=y
>  # CONFIG_BSD_DISKLABEL is not set
>  # CONFIG_C2PORT is not set
>  # CONFIG_CADENCE_WATCHDOG is not set
> 

Applied to xenial/master-next branch.

Thanks,
Kleber