p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Christoph Hellwig 2018-07-31 13:39:29 +02:00 committed by Masahiro Yamada
parent 9bea18010f
commit 17c46a6aff
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/microblaze/Kconfig
View File

@ -1,5 +1,6 @@
config MICROBLAZE config MICROBLAZE
def_bool y def_bool y
select ARCH_NO_SWAP
select ARCH_HAS_GCOV_PROFILE_ALL select ARCH_HAS_GCOV_PROFILE_ALL
select ARCH_MIGHT_HAVE_PC_PARPORT select ARCH_MIGHT_HAVE_PC_PARPORT
select ARCH_NO_COHERENT_DMA_MMAP if !MMU select ARCH_NO_COHERENT_DMA_MMAP if !MMU
@ -52,9 +53,6 @@ config CPU_LITTLE_ENDIAN
endchoice endchoice
config SWAP
def_bool n
config RWSEM_GENERIC_SPINLOCK config RWSEM_GENERIC_SPINLOCK
def_bool y def_bool y

4
arch/nios2/Kconfig
View File

@ -1,6 +1,7 @@
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
config NIOS2 config NIOS2
def_bool y def_bool y
select ARCH_NO_SWAP
select TIMER_OF select TIMER_OF
select GENERIC_ATOMIC64 select GENERIC_ATOMIC64
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
@ -38,9 +39,6 @@ config HAS_DMA
config FPU config FPU
def_bool n def_bool n
config SWAP
def_bool n
config RWSEM_GENERIC_SPINLOCK config RWSEM_GENERIC_SPINLOCK
def_bool y def_bool y

9
init/Kconfig
View File

@ -218,9 +218,16 @@ config DEFAULT_HOSTNAME
but you may wish to use a different default here to make a minimal but you may wish to use a different default here to make a minimal
system more usable with less configuration. 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 config SWAP
bool "Support for paging of anonymous memory (swap)" bool "Support for paging of anonymous memory (swap)"
depends on MMU && BLOCK depends on MMU && BLOCK && !ARCH_NO_SWAP
default y default y
help help
This option allows you to choose whether you want to have support This option allows you to choose whether you want to have support