aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-07-24 10:44:24 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2018-07-24 10:44:24 -0700
commitf89ed2f880ccb117246ba095e12087d9c3df89c5 (patch)
tree206606fc5e8556256d93390e62d306f50f318162
parent0894da849f145af51bde88a6b84f95b9c9e0bc66 (diff)
parent2fba3573f1cf876ad94992c256c5c410039e60b4 (diff)
downloadlinux-f89ed2f880ccb117246ba095e12087d9c3df89c5.tar.gz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fix from Martin Schwidefsky. Guenter Roeck reports that the s390 allmodconfig build fails because of a gcc plugin problem. The fix won't be in-tree until 4.19, so for now disable the gcc plugins on s390. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: s390: disable gcc plugins
-rw-r--r--arch/s390/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index e44bb2b2873e0..8a1863d9ed533 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -140,7 +140,7 @@ config S390
select HAVE_FUNCTION_GRAPH_TRACER
select HAVE_FUNCTION_TRACER
select HAVE_FUTEX_CMPXCHG if FUTEX
- select HAVE_GCC_PLUGINS
+ select HAVE_GCC_PLUGINS if BROKEN
select HAVE_KERNEL_BZIP2
select HAVE_KERNEL_GZIP
select HAVE_KERNEL_LZ4