projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM: Fix FIQ code on VIVT CPUs
[firefly-linux-kernel-4.4.55.git]
/
arch
/
s390
/
Kconfig
diff --git
a/arch/s390/Kconfig
b/arch/s390/Kconfig
index da183c5a103ce1df1da3617bbde788011f0351d3..d8d6eeca56b0abaebcda8c6022f74257d6103292 100644
(file)
--- a/
arch/s390/Kconfig
+++ b/
arch/s390/Kconfig
@@
-116,6
+116,7
@@
config S390
select HAVE_FUNCTION_GRAPH_TRACER
select HAVE_FUNCTION_TRACER
select HAVE_FUNCTION_TRACE_MCOUNT_TEST
select HAVE_FUNCTION_GRAPH_TRACER
select HAVE_FUNCTION_TRACER
select HAVE_FUNCTION_TRACE_MCOUNT_TEST
+ select HAVE_FUTEX_CMPXCHG if FUTEX
select HAVE_KERNEL_BZIP2
select HAVE_KERNEL_GZIP
select HAVE_KERNEL_LZMA
select HAVE_KERNEL_BZIP2
select HAVE_KERNEL_GZIP
select HAVE_KERNEL_LZMA
@@
-227,11
+228,12
@@
config MARCH_Z196
not work on older machines.
config MARCH_ZEC12
not work on older machines.
config MARCH_ZEC12
- bool "IBM zEC12"
+ bool "IBM z
BC12 and z
EC12"
select HAVE_MARCH_ZEC12_FEATURES if 64BIT
help
select HAVE_MARCH_ZEC12_FEATURES if 64BIT
help
- Select this to enable optimizations for IBM zEC12 (2827 series). The
- kernel will be slightly faster but will not work on older machines.
+ Select this to enable optimizations for IBM zBC12 and zEC12 (2828 and
+ 2827 series). The kernel will be slightly faster but will not work on
+ older machines.
endchoice
endchoice