kernel: disable ARCH_WANTS_THP_SWAP by default

Only one arch (x86_64) enables this option. So disable
ARCH_WANTS_THP_SWAP by default and remove referencies to it from all
configs (except x86_64) to make them clean.

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>
(cherry picked from commit f928c338ad6c8215a5fe280473e37786157a2d05)

diff --git a/target/linux/apm821xx/config-4.14 b/target/linux/apm821xx/config-4.14
index feaba21eb4f970e6003efb892ee23ac964ce72a3..9ace3ebf4c0cad70e0bb0e4a6a1fb2354f940ca0 100644 (file)
--- a/target/linux/apm821xx/config-4.14
+++ b/target/linux/apm821xx/config-4.14
@@ -38,7 +38,6 @@ CONFIG_ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT=y
 CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARCH_USE_BUILTIN_BSWAP=y
-# CONFIG_ARCH_WANTS_THP_SWAP is not set
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_ARCH_WEAK_RELEASE_ACQUIRE=y
 CONFIG_AUDIT_ARCH=y

diff --git a/target/linux/archs38/config-4.14 b/target/linux/archs38/config-4.14
index 9a04154a20b1421b6c21a46bf2b776a9b545e37a..db5c6f19e5a01b938e385f0c0e3b796a14301b1a 100644 (file)
--- a/target/linux/archs38/config-4.14
+++ b/target/linux/archs38/config-4.14
@@ -8,7 +8,6 @@ CONFIG_ARCH_HAS_SG_CHAIN=y
 # CONFIG_ARCH_OPTIONAL_KERNEL_RWX is not set
 # CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT is not set
 CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
-# CONFIG_ARCH_WANTS_THP_SWAP is not set
 CONFIG_ARC_BUILTIN_DTB_NAME=""
 CONFIG_ARC_CACHE=y
 CONFIG_ARC_CACHE_LINE_SHIFT=6

diff --git a/target/linux/ath79/config-4.14 b/target/linux/ath79/config-4.14
index f1cdf350ffeaf151688eb4bbab27c91db9f22168..857c2109ef5e594bdb12a3cffa1f38ce7ecd1a96 100644 (file)
--- a/target/linux/ath79/config-4.14
+++ b/target/linux/ath79/config-4.14
@@ -24,7 +24,6 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARCH_USE_BUILTIN_BSWAP=y
 CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
 CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y
-# CONFIG_ARCH_WANTS_THP_SWAP is not set
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_AT803X_PHY=y
 CONFIG_ATH79=y

diff --git a/target/linux/bcm53xx/config-4.14 b/target/linux/bcm53xx/config-4.14
index be062dc7f27d3dc8306fa4921f08eaffa30b3b5e..954a32d2af537ba364d1909c3fa325543b91ba79 100644 (file)
--- a/target/linux/bcm53xx/config-4.14
+++ b/target/linux/bcm53xx/config-4.14
@@ -29,7 +29,6 @@ CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARCH_USE_BUILTIN_BSWAP=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
-# CONFIG_ARCH_WANTS_THP_SWAP is not set
 CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_ARM=y

diff --git a/target/linux/brcm47xx/config-4.14 b/target/linux/brcm47xx/config-4.14
index 9211d10e690df22755d5d0c8304801d7f29926e1..3f35ca51656c551ddecf3fb17d25856bd5a76ff1 100644 (file)
--- a/target/linux/brcm47xx/config-4.14
+++ b/target/linux/brcm47xx/config-4.14
@@ -19,7 +19,6 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARCH_USE_BUILTIN_BSWAP=y
 CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
 CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y
-# CONFIG_ARCH_WANTS_THP_SWAP is not set
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_BCM47XX=y
 CONFIG_BCM47XX_BCMA=y

diff --git a/target/linux/brcm63xx/config-4.14 b/target/linux/brcm63xx/config-4.14
index 87cfe288615def5767b382d30d4db65030902537..c6cca7a51f6b5a67a3023d503cad5a5c3cabdeae 100644 (file)
--- a/target/linux/brcm63xx/config-4.14
+++ b/target/linux/brcm63xx/config-4.14
@@ -18,7 +18,6 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARCH_USE_BUILTIN_BSWAP=y
 CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
 CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y
-# CONFIG_ARCH_WANTS_THP_SWAP is not set
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_BCM6345_EXT_IRQ=y
 CONFIG_BCM6345_PERIPH_IRQ=y

diff --git a/target/linux/cns3xxx/config-4.14 b/target/linux/cns3xxx/config-4.14
index 5a1aab95f254234bcc21c5bc22bb236a295c61cb..29ac65eab5e2f5a8b905927835a2e1fc73043d49 100644 (file)
--- a/target/linux/cns3xxx/config-4.14
+++ b/target/linux/cns3xxx/config-4.14
@@ -27,7 +27,6 @@ CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARCH_USE_BUILTIN_BSWAP=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
-# CONFIG_ARCH_WANTS_THP_SWAP is not set
 CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_ARM=y

diff --git a/target/linux/gemini/config-4.14 b/target/linux/gemini/config-4.14
index 88ec795d22a1d5210bc74bef3de70c4aa00588c7..cf1944219296478291cceed1b7df2dece151a25a 100644 (file)
--- a/target/linux/gemini/config-4.14
+++ b/target/linux/gemini/config-4.14
@@ -28,7 +28,6 @@ CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
 CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_ARCH_USE_BUILTIN_BSWAP=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
-# CONFIG_ARCH_WANTS_THP_SWAP is not set
 CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_ARM=y

diff --git a/target/linux/generic/config-4.14 b/target/linux/generic/config-4.14
index 90ff264a79d7933480a3ef29c6162e7e780b182a..53081556372bf20c629361903ee1813931d6e34c 100644 (file)
--- a/target/linux/generic/config-4.14
+++ b/target/linux/generic/config-4.14
@@ -262,6 +262,7 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
 # CONFIG_ARCH_VT8500 is not set
 # CONFIG_ARCH_VULCAN is not set
 # CONFIG_ARCH_W90X900 is not set
+# CONFIG_ARCH_WANTS_THP_SWAP is not set
 # CONFIG_ARCH_WANTS_UBSAN_NO_NULL is not set
 # CONFIG_ARCH_WM8505 is not set
 # CONFIG_ARCH_WM8750 is not set

diff --git a/target/linux/imx6/config-4.14 b/target/linux/imx6/config-4.14
index fc32dbf7bf1a1018e63e4be0c0789ea4b3a28370..0877d7d450983d3723b2a0385f909afe4c769fc9 100644 (file)
--- a/target/linux/imx6/config-4.14
+++ b/target/linux/imx6/config-4.14
@@ -30,7 +30,6 @@ CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARCH_USE_BUILTIN_BSWAP=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
-# CONFIG_ARCH_WANTS_THP_SWAP is not set
 CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_ARM=y

diff --git a/target/linux/ipq40xx/config-4.14 b/target/linux/ipq40xx/config-4.14
index 18a8bafd5f99de96c22b4e7f2c3bce87267d40fe..643ce094ca9598cd6cce71ca93b1ae17c7aa40e0 100644 (file)
--- a/target/linux/ipq40xx/config-4.14
+++ b/target/linux/ipq40xx/config-4.14
@@ -35,7 +35,6 @@ CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARCH_USE_BUILTIN_BSWAP=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
-# CONFIG_ARCH_WANTS_THP_SWAP is not set
 CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_ARM=y

diff --git a/target/linux/kirkwood/config-4.14 b/target/linux/kirkwood/config-4.14
index 3ea1a9b41939642f142a007df7729478fc84fedd..f16c6bd47b9e4487014db10f0a22471848d3a3c3 100644 (file)
--- a/target/linux/kirkwood/config-4.14
+++ b/target/linux/kirkwood/config-4.14
@@ -28,7 +28,6 @@ CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARCH_USE_BUILTIN_BSWAP=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
-# CONFIG_ARCH_WANTS_THP_SWAP is not set
 CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_ARCH_WANT_LIBATA_LEDS=y

diff --git a/target/linux/lantiq/config-4.14 b/target/linux/lantiq/config-4.14
index 063f2ba3eb5436044b6f0f42ccb578e4ee47e77f..04be66b2b2bbf04e688b1d6a58b7102d3645b4c4 100644 (file)
--- a/target/linux/lantiq/config-4.14
+++ b/target/linux/lantiq/config-4.14
@@ -19,7 +19,6 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARCH_USE_BUILTIN_BSWAP=y
 CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
 CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y
-# CONFIG_ARCH_WANTS_THP_SWAP is not set
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 # CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y

diff --git a/target/linux/mediatek/config-4.14 b/target/linux/mediatek/config-4.14
index 88165045c8654b566fc1c56c75a78f3f30c531c1..b331312eb40645cea0337e88fa5d42a34740da71 100644 (file)
--- a/target/linux/mediatek/config-4.14
+++ b/target/linux/mediatek/config-4.14
@@ -28,7 +28,6 @@ CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARCH_USE_BUILTIN_BSWAP=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
-# CONFIG_ARCH_WANTS_THP_SWAP is not set
 CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_ARM=y

diff --git a/target/linux/mvebu/config-4.14 b/target/linux/mvebu/config-4.14
index 5286bf9b83149254c77a5f4af46fd3bc4cb5b7c0..572e4fd8562017be10e917ea0b25d3a6851a6c5d 100644 (file)
--- a/target/linux/mvebu/config-4.14
+++ b/target/linux/mvebu/config-4.14
@@ -28,7 +28,6 @@ CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARCH_USE_BUILTIN_BSWAP=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
-# CONFIG_ARCH_WANTS_THP_SWAP is not set
 CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_ARM=y

diff --git a/target/linux/mxs/config-4.14 b/target/linux/mxs/config-4.14
index 6e01aea42c4e932d8739cf7d2f3fd8d79370c384..84c42b6ad8bf5c15586a989212235bfb5e494f76 100644 (file)
--- a/target/linux/mxs/config-4.14
+++ b/target/linux/mxs/config-4.14
@@ -27,7 +27,6 @@ CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARCH_USE_BUILTIN_BSWAP=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
-# CONFIG_ARCH_WANTS_THP_SWAP is not set
 CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_ARM=y

diff --git a/target/linux/octeon/config-4.14 b/target/linux/octeon/config-4.14
index 24cba2b80ad1e8b34ff7b624c53c4bd653296857..4a928cff5831875bb1c75236a276c1f357302725 100644 (file)
--- a/target/linux/octeon/config-4.14
+++ b/target/linux/octeon/config-4.14
@@ -26,7 +26,6 @@ CONFIG_ARCH_USE_BUILTIN_BSWAP=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
 CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y
-# CONFIG_ARCH_WANTS_THP_SWAP is not set
 CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y

diff --git a/target/linux/octeontx/config-4.14 b/target/linux/octeontx/config-4.14
index b2ea99be0a082a64037f9e914e883b9f31b33b93..e27b68c30b1f002a98ef968290b2443d84a4e85b 100644 (file)
--- a/target/linux/octeontx/config-4.14
+++ b/target/linux/octeontx/config-4.14
@@ -37,7 +37,6 @@ CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARCH_THUNDER=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
-# CONFIG_ARCH_WANTS_THP_SWAP is not set
 CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
 CONFIG_ARCH_WANT_FRAME_POINTERS=y
 CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y

diff --git a/target/linux/pistachio/config-4.14 b/target/linux/pistachio/config-4.14
index 4c5cd579bde70ff4c11e44390b635540bb0efb3c..87c14fc1e499eee7c5c1fc0af331f143fe7e2f3f 100644 (file)
--- a/target/linux/pistachio/config-4.14
+++ b/target/linux/pistachio/config-4.14
@@ -18,7 +18,6 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARCH_USE_BUILTIN_BSWAP=y
 CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
 CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y
-# CONFIG_ARCH_WANTS_THP_SWAP is not set
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_SD=y

diff --git a/target/linux/ramips/mt7620/config-4.14 b/target/linux/ramips/mt7620/config-4.14
index 3e006e2ef80c0d60d7b66468ed6d184acd0692a5..adb6078edf32d13df38908a5b761fdb986e59b88 100644 (file)
--- a/target/linux/ramips/mt7620/config-4.14
+++ b/target/linux/ramips/mt7620/config-4.14
@@ -19,7 +19,6 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARCH_USE_BUILTIN_BSWAP=y
 CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
 CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y
-# CONFIG_ARCH_WANTS_THP_SWAP is not set
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_AT803X_PHY=y
 CONFIG_BLK_MQ_PCI=y

diff --git a/target/linux/ramips/mt76x8/config-4.14 b/target/linux/ramips/mt76x8/config-4.14
index 0939aa4d4673f94daaec8d6bb1d4aebde342f169..e83b10c35dda716a99c8a496237ae5450cd8fe19 100644 (file)
--- a/target/linux/ramips/mt76x8/config-4.14
+++ b/target/linux/ramips/mt76x8/config-4.14
@@ -19,7 +19,6 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARCH_USE_BUILTIN_BSWAP=y
 CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
 CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y
-# CONFIG_ARCH_WANTS_THP_SWAP is not set
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_AT803X_PHY=y
 CONFIG_BLK_MQ_PCI=y

diff --git a/target/linux/ramips/rt288x/config-4.14 b/target/linux/ramips/rt288x/config-4.14
index dba539766b04f161bccb107d120d9e2afc33cb6b..4a73b0c79a83f68bb7c150e668d916611d1db07f 100644 (file)
--- a/target/linux/ramips/rt288x/config-4.14
+++ b/target/linux/ramips/rt288x/config-4.14
@@ -19,7 +19,6 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARCH_USE_BUILTIN_BSWAP=y
 CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
 CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y
-# CONFIG_ARCH_WANTS_THP_SWAP is not set
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_BLK_MQ_PCI=y
 # CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE is not set

diff --git a/target/linux/ramips/rt3883/config-4.14 b/target/linux/ramips/rt3883/config-4.14
index 0c0a840c39ca00423a4ae79fde575a1a3087ee70..8e25057a67c6c3bea160dc6c63f769f228b45112 100644 (file)
--- a/target/linux/ramips/rt3883/config-4.14
+++ b/target/linux/ramips/rt3883/config-4.14
@@ -20,7 +20,6 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARCH_USE_BUILTIN_BSWAP=y
 CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
 CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y
-# CONFIG_ARCH_WANTS_THP_SWAP is not set
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_BLK_MQ_PCI=y
 # CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE is not set

diff --git a/target/linux/sunxi/config-4.14 b/target/linux/sunxi/config-4.14
index 94deb5a57912ac3a16580fb7a17bf301a65c14bc..de3be917ca5051e994f08f9b45f21ec56b2f8558 100644 (file)
--- a/target/linux/sunxi/config-4.14
+++ b/target/linux/sunxi/config-4.14
@@ -31,7 +31,6 @@ CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARCH_USE_BUILTIN_BSWAP=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
-# CONFIG_ARCH_WANTS_THP_SWAP is not set
 CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_ARM=y

diff --git a/target/linux/x86/config-4.14 b/target/linux/x86/config-4.14
index fa0595c28e6f7c747358a5ce4fb6fc192fe4a21c..459af435bdd2a71fad60168092c37aef29003f3c 100644 (file)
--- a/target/linux/x86/config-4.14
+++ b/target/linux/x86/config-4.14
@@ -48,7 +48,6 @@ CONFIG_ARCH_USE_BUILTIN_BSWAP=y
 CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
 CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y
 CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
-# CONFIG_ARCH_WANTS_THP_SWAP is not set
 CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
 CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
 CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y