]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
s390: enable CPU alternatives unconditionally
authorHeiko Carstens <heiko.carstens@de.ibm.com>
Fri, 27 Apr 2018 05:36:46 +0000 (07:36 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 29 Apr 2018 05:50:02 +0000 (07:50 +0200)
commit243f3abcfd64a5cfa774eb32aa0a349693bf6eaa
tree70852564a87c3ee37ab844971362046f931bcd67
parent4eaf8dace704fb5392b330a01dbf579d3190b0b3
s390: enable CPU alternatives unconditionally

[ Upstream commit 049a2c2d486e8cc82c5cd79fa479c5b105b109e9 ]

Remove the CPU_ALTERNATIVES config option and enable the code
unconditionally. The config option was only added to avoid a conflict
with the named saved segment support. Since that code is gone there is
no reason to keep the CPU_ALTERNATIVES config option.

Just enable it unconditionally to also reduce the number of config
options and make it less likely that something breaks.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/s390/Kconfig
arch/s390/include/asm/alternative.h
arch/s390/kernel/Makefile
arch/s390/kernel/module.c