From: Sergey Ryazanov Date: Mon, 21 May 2018 09:12:36 +0000 (+0300) Subject: kernel: enable FUTEX_PI by default X-Git-Tag: v19.07.0-rc1~3674 X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=commitdiff_plain;h=bdc2b58c4bccb50242af853dc80b50f9324b841c;ds=sidebyside kernel: enable FUTEX_PI by default New FUTEX_PI configuration symbol enabled if FUTEX and RT_MUTEX symbols are enabled. Both of these symbols are enabled by default in the generic config, so enable FUTEX_PI by default too to keep platform specific configs minimal. Signed-off-by: Sergey Ryazanov --- diff --git a/target/linux/apm821xx/config-4.14 b/target/linux/apm821xx/config-4.14 index 06aa760a2e..c3ca04d5ca 100644 --- a/target/linux/apm821xx/config-4.14 +++ b/target/linux/apm821xx/config-4.14 @@ -104,7 +104,6 @@ CONFIG_FIXED_PHY=y CONFIG_FREEZER=y # CONFIG_FSL_LBC is not set # CONFIG_FSL_ULI1575 is not set -CONFIG_FUTEX_PI=y CONFIG_GENERIC_ATOMIC64=y CONFIG_GENERIC_BUG=y CONFIG_GENERIC_CLOCKEVENTS=y diff --git a/target/linux/archs38/config-4.14 b/target/linux/archs38/config-4.14 index d7b62c56b4..21bbd0710c 100644 --- a/target/linux/archs38/config-4.14 +++ b/target/linux/archs38/config-4.14 @@ -70,7 +70,6 @@ CONFIG_EXT4_FS=y # CONFIG_EZNPS_GIC is not set CONFIG_FIXED_PHY=y CONFIG_FS_MBCACHE=y -CONFIG_FUTEX_PI=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CSUM=y CONFIG_GENERIC_FIND_FIRST_BIT=y diff --git a/target/linux/ath79/config-4.14 b/target/linux/ath79/config-4.14 index e2c69768ee..dc869ba282 100644 --- a/target/linux/ath79/config-4.14 +++ b/target/linux/ath79/config-4.14 @@ -58,7 +58,6 @@ CONFIG_DTC=y CONFIG_EARLY_PRINTK=y CONFIG_ETHERNET_PACKET_MANGLE=y CONFIG_FIXED_PHY=y -CONFIG_FUTEX_PI=y CONFIG_GENERIC_ATOMIC64=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CMOS_UPDATE=y diff --git a/target/linux/bcm53xx/config-4.14 b/target/linux/bcm53xx/config-4.14 index 5c22702a19..2971fa7150 100644 --- a/target/linux/bcm53xx/config-4.14 +++ b/target/linux/bcm53xx/config-4.14 @@ -135,7 +135,6 @@ CONFIG_EXTCON=y CONFIG_FIXED_PHY=y CONFIG_FIX_EARLYCON_MEM=y CONFIG_FRAME_POINTER=y -CONFIG_FUTEX_PI=y # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set CONFIG_GENERIC_ALLOCATOR=y CONFIG_GENERIC_ARCH_TOPOLOGY=y diff --git a/target/linux/brcm47xx/config-4.14 b/target/linux/brcm47xx/config-4.14 index 47b7f6c940..aa273b149d 100644 --- a/target/linux/brcm47xx/config-4.14 +++ b/target/linux/brcm47xx/config-4.14 @@ -68,7 +68,6 @@ CONFIG_CSRC_R4K=y CONFIG_DMA_NONCOHERENT=y # CONFIG_EARLY_PRINTK is not set CONFIG_FIXED_PHY=y -CONFIG_FUTEX_PI=y CONFIG_GENERIC_ATOMIC64=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CMOS_UPDATE=y diff --git a/target/linux/brcm63xx/config-4.14 b/target/linux/brcm63xx/config-4.14 index 8394ead7d6..6073575bdc 100644 --- a/target/linux/brcm63xx/config-4.14 +++ b/target/linux/brcm63xx/config-4.14 @@ -78,7 +78,6 @@ CONFIG_DTC=y CONFIG_EARLY_PRINTK=y CONFIG_FIRMWARE_IN_KERNEL=y CONFIG_FIXED_PHY=y -CONFIG_FUTEX_PI=y CONFIG_GENERIC_ATOMIC64=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CMOS_UPDATE=y diff --git a/target/linux/cns3xxx/config-4.14 b/target/linux/cns3xxx/config-4.14 index 7533430610..407b30b4a3 100644 --- a/target/linux/cns3xxx/config-4.14 +++ b/target/linux/cns3xxx/config-4.14 @@ -102,7 +102,6 @@ CONFIG_FIQ=y CONFIG_FIXED_PHY=y CONFIG_FIX_EARLYCON_MEM=y CONFIG_FRAME_POINTER=y -CONFIG_FUTEX_PI=y CONFIG_GENERIC_ALLOCATOR=y CONFIG_GENERIC_BUG=y CONFIG_GENERIC_CLOCKEVENTS=y diff --git a/target/linux/gemini/config-4.14 b/target/linux/gemini/config-4.14 index d3baf9f765..b1737309c0 100644 --- a/target/linux/gemini/config-4.14 +++ b/target/linux/gemini/config-4.14 @@ -159,7 +159,6 @@ CONFIG_FS_MBCACHE=y CONFIG_FS_POSIX_ACL=y CONFIG_FTTMR010_TIMER=y CONFIG_FTWDT010_WATCHDOG=y -CONFIG_FUTEX_PI=y # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set CONFIG_GEMINI_ETHERNET=y CONFIG_GENERIC_ALLOCATOR=y diff --git a/target/linux/generic/config-4.14 b/target/linux/generic/config-4.14 index e0cc123067..7c947aa3cf 100644 --- a/target/linux/generic/config-4.14 +++ b/target/linux/generic/config-4.14 @@ -1446,6 +1446,7 @@ CONFIG_FSNOTIFY=y # CONFIG_FUSION_SAS is not set # CONFIG_FUSION_SPI is not set CONFIG_FUTEX=y +CONFIG_FUTEX_PI=y # CONFIG_FW_CFG_SYSFS is not set CONFIG_FW_LOADER=y CONFIG_FW_LOADER_USER_HELPER=y diff --git a/target/linux/imx6/config-4.14 b/target/linux/imx6/config-4.14 index 8b0d07ca56..445df9dd12 100644 --- a/target/linux/imx6/config-4.14 +++ b/target/linux/imx6/config-4.14 @@ -186,7 +186,6 @@ CONFIG_FSL_GUTS=y CONFIG_FS_ENCRYPTION=y CONFIG_FS_MBCACHE=y CONFIG_FS_POSIX_ACL=y -CONFIG_FUTEX_PI=y CONFIG_GENERIC_ALLOCATOR=y CONFIG_GENERIC_ARCH_TOPOLOGY=y CONFIG_GENERIC_BUG=y diff --git a/target/linux/ipq40xx/config-4.14 b/target/linux/ipq40xx/config-4.14 index 2ab178b50f..1ef9c48977 100644 --- a/target/linux/ipq40xx/config-4.14 +++ b/target/linux/ipq40xx/config-4.14 @@ -160,7 +160,6 @@ CONFIG_ESSEDMA=y CONFIG_EXTCON=y CONFIG_FIXED_PHY=y CONFIG_FIX_EARLYCON_MEM=y -CONFIG_FUTEX_PI=y CONFIG_GENERIC_ALLOCATOR=y CONFIG_GENERIC_BUG=y CONFIG_GENERIC_CLOCKEVENTS=y diff --git a/target/linux/kirkwood/config-4.14 b/target/linux/kirkwood/config-4.14 index 1abec78c40..957e789d52 100644 --- a/target/linux/kirkwood/config-4.14 +++ b/target/linux/kirkwood/config-4.14 @@ -112,7 +112,6 @@ CONFIG_FIXED_PHY=y CONFIG_FIX_EARLYCON_MEM=y CONFIG_FRAME_POINTER=y CONFIG_FS_MBCACHE=y -CONFIG_FUTEX_PI=y CONFIG_GENERIC_ALLOCATOR=y CONFIG_GENERIC_ATOMIC64=y CONFIG_GENERIC_BUG=y diff --git a/target/linux/lantiq/config-4.14 b/target/linux/lantiq/config-4.14 index 477d4edff2..48e6f6ca02 100644 --- a/target/linux/lantiq/config-4.14 +++ b/target/linux/lantiq/config-4.14 @@ -51,7 +51,6 @@ CONFIG_DTC=y CONFIG_EARLY_PRINTK=y CONFIG_ETHERNET_PACKET_MANGLE=y CONFIG_FIXED_PHY=y -CONFIG_FUTEX_PI=y CONFIG_GENERIC_ATOMIC64=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CMOS_UPDATE=y diff --git a/target/linux/mediatek/config-4.14 b/target/linux/mediatek/config-4.14 index 1b6e461602..fa6058653f 100644 --- a/target/linux/mediatek/config-4.14 +++ b/target/linux/mediatek/config-4.14 @@ -168,7 +168,6 @@ CONFIG_ELF_CORE=y CONFIG_FIXED_PHY=y CONFIG_FIX_EARLYCON_MEM=y CONFIG_FREEZER=y -CONFIG_FUTEX_PI=y CONFIG_GENERIC_ALLOCATOR=y CONFIG_GENERIC_BUG=y CONFIG_GENERIC_CLOCKEVENTS=y diff --git a/target/linux/mvebu/config-4.14 b/target/linux/mvebu/config-4.14 index 6d3edfeb45..c8230f58e0 100644 --- a/target/linux/mvebu/config-4.14 +++ b/target/linux/mvebu/config-4.14 @@ -179,7 +179,6 @@ CONFIG_F2FS_STAT_FS=y CONFIG_FIXED_PHY=y CONFIG_FIX_EARLYCON_MEM=y CONFIG_FS_MBCACHE=y -CONFIG_FUTEX_PI=y CONFIG_GENERIC_ALLOCATOR=y CONFIG_GENERIC_ARCH_TOPOLOGY=y CONFIG_GENERIC_BUG=y diff --git a/target/linux/mxs/config-4.14 b/target/linux/mxs/config-4.14 index 226e956239..fdf68428d1 100644 --- a/target/linux/mxs/config-4.14 +++ b/target/linux/mxs/config-4.14 @@ -99,7 +99,6 @@ CONFIG_FIXED_PHY=y CONFIG_FIX_EARLYCON_MEM=y CONFIG_FRAME_POINTER=y CONFIG_FS_MBCACHE=y -CONFIG_FUTEX_PI=y CONFIG_GENERIC_ALLOCATOR=y CONFIG_GENERIC_ATOMIC64=y CONFIG_GENERIC_BUG=y diff --git a/target/linux/octeon/config-4.14 b/target/linux/octeon/config-4.14 index fd80652e4b..18bd70f5ad 100644 --- a/target/linux/octeon/config-4.14 +++ b/target/linux/octeon/config-4.14 @@ -105,7 +105,6 @@ CONFIG_FAT_FS=y CONFIG_FIXED_PHY=y CONFIG_FRAME_WARN=2048 CONFIG_FS_MBCACHE=y -CONFIG_FUTEX_PI=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CMOS_UPDATE=y CONFIG_GENERIC_CPU_AUTOPROBE=y diff --git a/target/linux/octeontx/config-4.14 b/target/linux/octeontx/config-4.14 index a8f6df34c8..9b43211db9 100644 --- a/target/linux/octeontx/config-4.14 +++ b/target/linux/octeontx/config-4.14 @@ -215,7 +215,6 @@ CONFIG_FRAME_POINTER=y CONFIG_FREEZER=y CONFIG_FS_MBCACHE=y CONFIG_FS_POSIX_ACL=y -CONFIG_FUTEX_PI=y CONFIG_GENERIC_ALLOCATOR=y CONFIG_GENERIC_ARCH_TOPOLOGY=y CONFIG_GENERIC_BUG=y diff --git a/target/linux/pistachio/config-4.14 b/target/linux/pistachio/config-4.14 index a5abcb5d36..9c06115d3c 100644 --- a/target/linux/pistachio/config-4.14 +++ b/target/linux/pistachio/config-4.14 @@ -92,7 +92,6 @@ CONFIG_EXT4_FS_SECURITY=y CONFIG_FIXED_PHY=y CONFIG_FS_MBCACHE=y CONFIG_FS_POSIX_ACL=y -CONFIG_FUTEX_PI=y CONFIG_GENERIC_ALLOCATOR=y CONFIG_GENERIC_ATOMIC64=y CONFIG_GENERIC_CLOCKEVENTS=y diff --git a/target/linux/ramips/mt7620/config-4.14 b/target/linux/ramips/mt7620/config-4.14 index 901245e091..ad5f6b059d 100644 --- a/target/linux/ramips/mt7620/config-4.14 +++ b/target/linux/ramips/mt7620/config-4.14 @@ -60,7 +60,6 @@ CONFIG_DTB_RT_NONE=y CONFIG_DTC=y CONFIG_EARLY_PRINTK=y CONFIG_FIXED_PHY=y -CONFIG_FUTEX_PI=y CONFIG_GENERIC_ATOMIC64=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CMOS_UPDATE=y diff --git a/target/linux/ramips/mt76x8/config-4.14 b/target/linux/ramips/mt76x8/config-4.14 index 6e4b22f3d6..be1535f90e 100644 --- a/target/linux/ramips/mt76x8/config-4.14 +++ b/target/linux/ramips/mt76x8/config-4.14 @@ -60,7 +60,6 @@ CONFIG_DTB_RT_NONE=y CONFIG_DTC=y CONFIG_EARLY_PRINTK=y CONFIG_FIXED_PHY=y -CONFIG_FUTEX_PI=y CONFIG_GENERIC_ATOMIC64=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CMOS_UPDATE=y diff --git a/target/linux/ramips/rt288x/config-4.14 b/target/linux/ramips/rt288x/config-4.14 index feaf6ed347..b383bd5764 100644 --- a/target/linux/ramips/rt288x/config-4.14 +++ b/target/linux/ramips/rt288x/config-4.14 @@ -54,7 +54,6 @@ CONFIG_DTB_RT_NONE=y CONFIG_DTC=y CONFIG_EARLY_PRINTK=y CONFIG_FIXED_PHY=y -CONFIG_FUTEX_PI=y CONFIG_GENERIC_ATOMIC64=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CMOS_UPDATE=y diff --git a/target/linux/ramips/rt3883/config-4.14 b/target/linux/ramips/rt3883/config-4.14 index 3ee36419fb..e9997ce553 100644 --- a/target/linux/ramips/rt3883/config-4.14 +++ b/target/linux/ramips/rt3883/config-4.14 @@ -57,7 +57,6 @@ CONFIG_DTC=y CONFIG_EARLY_PRINTK=y CONFIG_ETHERNET_PACKET_MANGLE=y CONFIG_FIXED_PHY=y -CONFIG_FUTEX_PI=y CONFIG_GENERIC_ATOMIC64=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CMOS_UPDATE=y diff --git a/target/linux/sunxi/config-4.14 b/target/linux/sunxi/config-4.14 index 7ff3d16162..81ba1f2d0d 100644 --- a/target/linux/sunxi/config-4.14 +++ b/target/linux/sunxi/config-4.14 @@ -196,7 +196,6 @@ CONFIG_FRAME_WARN=2048 CONFIG_FREEZER=y CONFIG_FS_MBCACHE=y CONFIG_FS_POSIX_ACL=y -CONFIG_FUTEX_PI=y CONFIG_GENERIC_ALLOCATOR=y CONFIG_GENERIC_ARCH_TOPOLOGY=y CONFIG_GENERIC_BUG=y diff --git a/target/linux/x86/config-4.14 b/target/linux/x86/config-4.14 index d2de12902b..61b83a6f73 100644 --- a/target/linux/x86/config-4.14 +++ b/target/linux/x86/config-4.14 @@ -146,7 +146,6 @@ CONFIG_FUSION=y # CONFIG_FUSION_LOGGING is not set CONFIG_FUSION_MAX_SGE=128 CONFIG_FUSION_SPI=y -CONFIG_FUTEX_PI=y CONFIG_GENERIC_ALLOCATOR=y CONFIG_GENERIC_BUG=y CONFIG_GENERIC_CLOCKEVENTS=y