diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2014-05-12 16:05:55 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2014-05-12 16:05:55 -0400 |
| commit | d20bdcfeed0ba049c77c70f2f3efe4d1577838c5 (patch) | |
| tree | a52d5e86633ec75a40bdb6ec42fb18a8920bcd47 /arch/s390 | |
| parent | fe723c8bd3b6f71672ac8f9c01ab712a8fdd318a (diff) | |
| parent | ae2a5e128caf100a957cd142818fd7be6276bd11 (diff) | |
| download | linux-rt-d20bdcfeed0ba049c77c70f2f3efe4d1577838c5.tar.gz | |
Merge tag 'v3.12.18' into v3.12-rt
This is the 3.12.18 stable release
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index 3e01afa21710..6671e8db1861 100644 --- 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_FUTEX_CMPXCHG if FUTEX select HAVE_KERNEL_BZIP2 select HAVE_KERNEL_GZIP select HAVE_KERNEL_LZ4 |