From e37efb194770621f7c6a8eee3d81488edf99ddaf Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Tue, 1 Jun 2021 14:15:57 +0100 Subject: [PATCH] ANDROID: gki_defconfig: Make 'saveconfig' check happy CONFIG_BPF_{JIT,JIT_ALWAYS_ON,SYSCALL} Kconfig entries were moved from init/Kconfig to their very own file in kernel/bpf/Kconfig during the latest Mainline release candidate. This has the unfortunate side- effect of ending up in slightly different places in 'saveconfig's resultant .config file. The upshot is that CI now fails, despite no real change to the config taking place. This patch makes CI happy again. Signed-off-by: Lee Jones Change-Id: I084e4d71dcec5573457e08b4dcd1cd4bff9ad45c --- arch/arm64/configs/gki_defconfig | 6 +++--- arch/x86/configs/gki_defconfig | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 34004188272b..8b44a17aeed7 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -2,6 +2,9 @@ CONFIG_LOCALVERSION="-mainline" CONFIG_AUDIT=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y +CONFIG_BPF_SYSCALL=y +CONFIG_BPF_JIT=y +CONFIG_BPF_JIT_ALWAYS_ON=y CONFIG_PREEMPT=y CONFIG_IRQ_TIME_ACCOUNTING=y CONFIG_TASK_XACCT=y @@ -33,8 +36,6 @@ CONFIG_BOOT_CONFIG=y # CONFIG_SYSFS_SYSCALL is not set # CONFIG_FHANDLE is not set CONFIG_KALLSYMS_ALL=y -CONFIG_BPF_SYSCALL=y -CONFIG_BPF_JIT_ALWAYS_ON=y CONFIG_USERFAULTFD=y # CONFIG_RSEQ is not set CONFIG_EMBEDDED=y @@ -232,7 +233,6 @@ CONFIG_NET_ACT_POLICE=y CONFIG_NET_ACT_GACT=y CONFIG_NET_ACT_MIRRED=y CONFIG_VSOCKETS=y -CONFIG_BPF_JIT=y CONFIG_BT=y CONFIG_BT_RFCOMM=y CONFIG_BT_RFCOMM_TTY=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index e99367feaa5f..bf7eb4d077ac 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -4,6 +4,9 @@ CONFIG_KERNEL_LZ4=y CONFIG_AUDIT=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y +CONFIG_BPF_SYSCALL=y +CONFIG_BPF_JIT=y +CONFIG_BPF_JIT_ALWAYS_ON=y CONFIG_PREEMPT=y CONFIG_IRQ_TIME_ACCOUNTING=y CONFIG_TASK_XACCT=y @@ -35,8 +38,6 @@ CONFIG_BOOT_CONFIG=y # CONFIG_SYSFS_SYSCALL is not set # CONFIG_FHANDLE is not set CONFIG_KALLSYMS_ALL=y -CONFIG_BPF_SYSCALL=y -CONFIG_BPF_JIT_ALWAYS_ON=y CONFIG_USERFAULTFD=y # CONFIG_RSEQ is not set CONFIG_EMBEDDED=y @@ -213,7 +214,6 @@ CONFIG_NET_ACT_POLICE=y CONFIG_NET_ACT_GACT=y CONFIG_NET_ACT_MIRRED=y CONFIG_VSOCKETS=y -CONFIG_BPF_JIT=y CONFIG_BT=y CONFIG_BT_RFCOMM=y CONFIG_BT_RFCOMM_TTY=y