From 74b479311911cf8ebd00269d32fb4f68f96905be Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 13 Oct 2014 19:44:28 +0100 Subject: [PATCH] Move BPF_JIT to generic as all platforms now support it (no func change) --- config-arm64 | 3 --- config-armv7-generic | 3 --- config-generic | 2 ++ config-powerpc64 | 1 - config-powerpc64p7 | 1 - config-s390x | 1 - config-x86_64-generic | 2 -- 7 files changed, 2 insertions(+), 11 deletions(-) diff --git a/config-arm64 b/config-arm64 index aaec288f0..29a2436ac 100644 --- a/config-arm64 +++ b/config-arm64 @@ -18,7 +18,6 @@ CONFIG_ARM64_64K_PAGES=y CONFIG_BCMA_POSSIBLE=y CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 -CONFIG_BQL=y CONFIG_BRCMUTIL=m CONFIG_BUG=y CONFIG_CLKDEV_LOOKUP=y @@ -136,8 +135,6 @@ CONFIG_ACPI_CONTAINER=y CONFIG_ACPI_HED=m CONFIG_ACPI_CUSTOM_METHOD=m -CONFIG_BPF_JIT=y - CONFIG_AMD_XGBE=m CONFIG_AMD_XGBE_PHY=m # CONFIG_AMD_XGBE_DCB is not set diff --git a/config-armv7-generic b/config-armv7-generic index 42f3ea901..dc996e098 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -806,9 +806,6 @@ CONFIG_MFD_CROS_EC_SPI=m CONFIG_KEYBOARD_CROS_EC=m CONFIG_I2C_CROS_EC_TUNNEL=m -# Should be in generic -CONFIG_BPF_JIT=y - # Needs work/investigation # CONFIG_ARM_KPROBES_TEST is not set diff --git a/config-generic b/config-generic index b91f2d210..ceac8662f 100644 --- a/config-generic +++ b/config-generic @@ -711,6 +711,8 @@ CONFIG_NET_DMA=y CONFIG_NETLINK_MMAP=y CONFIG_NETLINK_DIAG=m +CONFIG_BPF_JIT=y + CONFIG_TCP_CONG_ADVANCED=y CONFIG_TCP_CONG_BIC=m CONFIG_TCP_CONG_CUBIC=y diff --git a/config-powerpc64 b/config-powerpc64 index beb388824..49b4f2e70 100644 --- a/config-powerpc64 +++ b/config-powerpc64 @@ -173,7 +173,6 @@ CONFIG_CRYPTO_DEV_NX_COMPRESS=m CONFIG_CXL=m -CONFIG_BPF_JIT=y # CONFIG_PPC_ICSWX_PID is not set # CONFIG_PPC_ICSWX_USE_SIGILL is not set # CONFIG_PCIEPORTBUS is not set diff --git a/config-powerpc64p7 b/config-powerpc64p7 index c089d75e8..6a5e1c6d9 100644 --- a/config-powerpc64p7 +++ b/config-powerpc64p7 @@ -163,7 +163,6 @@ CONFIG_CRYPTO_DEV_NX_COMPRESS=m CONFIG_CXL=m -CONFIG_BPF_JIT=y # CONFIG_PPC_ICSWX_PID is not set # CONFIG_PPC_ICSWX_USE_SIGILL is not set # CONFIG_PCIEPORTBUS is not set diff --git a/config-s390x b/config-s390x index f9472348d..fd9e28dc6 100644 --- a/config-s390x +++ b/config-s390x @@ -213,7 +213,6 @@ CONFIG_SCHED_BOOK=y CONFIG_CRYPTO_GHASH_S390=m -CONFIG_BPF_JIT=y # CONFIG_TRANSPARENT_HUGEPAGE is not set CONFIG_SCM_BUS=y CONFIG_EADM_SCH=m diff --git a/config-x86_64-generic b/config-x86_64-generic index 677a2d14c..89b7070ef 100644 --- a/config-x86_64-generic +++ b/config-x86_64-generic @@ -153,8 +153,6 @@ CONFIG_FUNCTION_GRAPH_TRACER=y CONFIG_I7300_IDLE=m -CONFIG_BPF_JIT=y - # https://fedoraproject.org/wiki/Features/Checkpoint_Restore CONFIG_CHECKPOINT_RESTORE=y