kconfig: remove duplicate SWAP symbol defintions

microblaze and nios2 define their own always n SWAP symbols.  Remove those
and let the generic defintion do the right thing by adding a new symbol
to disable swap entirely.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index d14782100088a89011f44cf91705cea8fbe79100..cc139d1b12845a45fe83685f7bfde61e35efcccb 100644 (file)
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@ -1,5 +1,6 @@
 config MICROBLAZE
        def_bool y
+       select ARCH_NO_SWAP
        select ARCH_HAS_GCOV_PROFILE_ALL
        select ARCH_MIGHT_HAVE_PC_PARPORT
        select ARCH_NO_COHERENT_DMA_MMAP if !MMU
@@ -52,9 +53,6 @@ config CPU_LITTLE_ENDIAN
 
 endchoice
 
-config SWAP
-       def_bool n
-
 config RWSEM_GENERIC_SPINLOCK
        def_bool y
 

diff --git a/arch/nios2/Kconfig b/arch/nios2/Kconfig
index 3d4ec88f1db1ccbee8a43f0649f752b3b6888719..3f9d4ef8b20f1532dcf93be05b5905f6bbef89bd 100644 (file)
--- a/arch/nios2/Kconfig
+++ b/arch/nios2/Kconfig
@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 config NIOS2
        def_bool y
+       select ARCH_NO_SWAP
        select TIMER_OF
        select GENERIC_ATOMIC64
        select GENERIC_CLOCKEVENTS
@@ -38,9 +39,6 @@ config HAS_DMA
 config FPU
        def_bool n
 
-config SWAP
-       def_bool n
-
 config RWSEM_GENERIC_SPINLOCK
        def_bool y
 

diff --git a/init/Kconfig b/init/Kconfig
index 041f3a022122d559b8588c8c24c8db37756464de..1e69f93b809ec18d7c48c225e9ced8a92fcbda53 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -218,9 +218,16 @@ config DEFAULT_HOSTNAME
          but you may wish to use a different default here to make a minimal
          system more usable with less configuration.
 
+#
+# For some reason microblaze and nios2 hard code SWAP=n.  Hopefully we can
+# add proper SWAP support to them, in which case this can be remove.
+#
+config ARCH_NO_SWAP
+       bool
+
 config SWAP
        bool "Support for paging of anonymous memory (swap)"
-       depends on MMU && BLOCK
+       depends on MMU && BLOCK && !ARCH_NO_SWAP
        default y
        help
          This option allows you to choose whether you want to have support