diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-05-25 08:02:43 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-05-25 08:02:43 +0200 |
| commit | bd9c67ad9693bacef086d65c1c6744645d4777e7 (patch) | |
| tree | 1dcbac332819a79dbaa1a1a836a8485f866568ad /arch/s390/kernel/Makefile | |
| parent | Merge tag 'perf-core-for-mingo-4.18-20180523' of git://git.kernel.org/pub/scm... (diff) | |
| parent | Merge branch 'stable/for-linus-4.17' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
| download | linux-bd9c67ad9693bacef086d65c1c6744645d4777e7.tar.xz linux-bd9c67ad9693bacef086d65c1c6744645d4777e7.zip | |
Merge branch 'linus' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/s390/kernel/Makefile')
| -rw-r--r-- | arch/s390/kernel/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile index 84ea6225efb4..f92dd8ed3884 100644 --- a/arch/s390/kernel/Makefile +++ b/arch/s390/kernel/Makefile @@ -65,6 +65,7 @@ obj-y += nospec-branch.o extra-y += head.o head64.o vmlinux.lds +obj-$(CONFIG_SYSFS) += nospec-sysfs.o CFLAGS_REMOVE_nospec-branch.o += $(CC_FLAGS_EXPOLINE) obj-$(CONFIG_MODULES) += module.o |