diff options
| author | Christoph Hellwig <hch@lst.de> | 2018-07-31 14:39:29 +0300 |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-08-02 02:03:23 +0300 |
| commit | 17c46a6aff5c423f406adfb06eb832f771c06bd1 (patch) | |
| tree | 545448a8d433617b66482c653daaa04aa239347a | |
| parent | 9bea18010f210dd24d2a4f2bd3df7b92132537ae (diff) | |
| download | linux-17c46a6aff5c423f406adfb06eb832f771c06bd1.tar.xz | |
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>
| -rw-r--r-- | arch/microblaze/Kconfig | 4 | ||||
| -rw-r--r-- | arch/nios2/Kconfig | 4 | ||||
| -rw-r--r-- | init/Kconfig | 9 |
3 files changed, 10 insertions, 7 deletions
diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig index d14782100088..cc139d1b1284 100644 --- 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 3d4ec88f1db1..3f9d4ef8b20f 100644 --- 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 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 |