From 2748b36eff2882074dfb26310482f29298c92c8e Mon Sep 17 00:00:00 2001 From: Tony Ambardar Date: Sat, 10 Apr 2021 22:18:10 -0700 Subject: [PATCH] gemini,layerscape,oxnas: don't disable option CONFIG_BPF_SYSCALL Respect the generic kernel config setting, which is "enabled" tree-wide, as previously done for sunxi. Ref: 247ef4d98bab ("sunxi: enable CONFIG_BPF_SYSCALL and CONFIG_EMBEDDED") Signed-off-by: Tony Ambardar (cherry picked from commit 41948c9c1b80e39f2fd2771f42e62e209347b0bf) Signed-off-by: Kevin Darbyshire-Bryant --- target/linux/gemini/config-5.4 | 1 - target/linux/layerscape/armv7/config-5.4 | 1 - target/linux/layerscape/armv8_64b/config-5.4 | 1 - target/linux/oxnas/config-5.4 | 1 - 4 files changed, 4 deletions(-) diff --git a/target/linux/gemini/config-5.4 b/target/linux/gemini/config-5.4 index 7cfdb3ccdb..087da4ffee 100644 --- a/target/linux/gemini/config-5.4 +++ b/target/linux/gemini/config-5.4 @@ -47,7 +47,6 @@ CONFIG_BLK_DEV_SD=y CONFIG_BLK_MQ_PCI=y CONFIG_BLK_SCSI_REQUEST=y CONFIG_BOUNCE=y -# CONFIG_BPF_SYSCALL is not set CONFIG_CLKDEV_LOOKUP=y CONFIG_CLKSRC_MMIO=y CONFIG_CLONE_BACKWARDS=y diff --git a/target/linux/layerscape/armv7/config-5.4 b/target/linux/layerscape/armv7/config-5.4 index 1cdbba426d..35c8eed8da 100644 --- a/target/linux/layerscape/armv7/config-5.4 +++ b/target/linux/layerscape/armv7/config-5.4 @@ -107,7 +107,6 @@ CONFIG_BLK_SCSI_REQUEST=y # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 CONFIG_BOUNCE=y -# CONFIG_BPF_SYSCALL is not set CONFIG_BRCMSTB_GISB_ARB=y CONFIG_BROADCOM_PHY=y CONFIG_CACHE_L2X0=y diff --git a/target/linux/layerscape/armv8_64b/config-5.4 b/target/linux/layerscape/armv8_64b/config-5.4 index 172a9d43b1..ce619ac6c1 100644 --- a/target/linux/layerscape/armv8_64b/config-5.4 +++ b/target/linux/layerscape/armv8_64b/config-5.4 @@ -132,7 +132,6 @@ CONFIG_BLK_PM=y CONFIG_BLK_SCSI_REQUEST=y # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 -# CONFIG_BPF_SYSCALL is not set CONFIG_BSD_PROCESS_ACCT=y CONFIG_BSD_PROCESS_ACCT_V3=y CONFIG_BTRFS_FS=y diff --git a/target/linux/oxnas/config-5.4 b/target/linux/oxnas/config-5.4 index ed6f03d388..1c97c39170 100644 --- a/target/linux/oxnas/config-5.4 +++ b/target/linux/oxnas/config-5.4 @@ -65,7 +65,6 @@ CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=65536 CONFIG_BLK_PM=y CONFIG_BLK_SCSI_REQUEST=y -# CONFIG_BPF_SYSCALL is not set CONFIG_CC_HAS_KASAN_GENERIC=y CONFIG_CLKDEV_LOOKUP=y CONFIG_CLKSRC_MMIO=y -- 2.30.2