summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2018-07-31 13:39:29 +0200
committerMasahiro Yamada <yamada.masahiro@socionext.com>2018-08-02 08:03:23 +0900
commit17c46a6aff5c423f406adfb06eb832f771c06bd1 (patch)
tree545448a8d433617b66482c653daaa04aa239347a /init
parent9bea18010f210dd24d2a4f2bd3df7b92132537ae (diff)
downloadlinux-stable-17c46a6aff5c423f406adfb06eb832f771c06bd1.tar.gz
linux-stable-17c46a6aff5c423f406adfb06eb832f771c06bd1.tar.bz2
linux-stable-17c46a6aff5c423f406adfb06eb832f771c06bd1.zip
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>
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig9
1 files changed, 8 insertions, 1 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 041f3a022122..1e69f93b809e 100644
--- 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