summaryrefslogtreecommitdiff
path: root/arch/s390/kernel/Makefile
diff options
context:
space:
mode:
authorMartin Schwidefsky <schwidefsky@de.ibm.com>2017-10-09 12:16:49 +0300
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2017-10-09 12:16:49 +0300
commit3bdf5679c9e46088a0d677e795afc92b5f77940f (patch)
treebe5a99e62b5ff078413d71297154ece9f724ec9e /arch/s390/kernel/Makefile
parent91a1fad759ffd616b836984ca0420c7ad5996eef (diff)
parent3d8757b87d7fc15a87928bc970f060bc9c6dc618 (diff)
downloadlinux-3bdf5679c9e46088a0d677e795afc92b5f77940f.tar.xz
Merge branch 'sthyi' into features
Add the store-hypervisor-information code into features using a tip branch for parallel merging into the KVM tree.
Diffstat (limited to 'arch/s390/kernel/Makefile')
-rw-r--r--arch/s390/kernel/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile
index 9118e62f9fca..7b742ffac7d3 100644
--- a/arch/s390/kernel/Makefile
+++ b/arch/s390/kernel/Makefile
@@ -57,7 +57,7 @@ obj-y := traps.o time.o process.o base.o early.o setup.o idle.o vtime.o
obj-y += processor.o sys_s390.o ptrace.o signal.o cpcmd.o ebcdic.o nmi.o
obj-y += debug.o irq.o ipl.o dis.o diag.o vdso.o als.o
obj-y += sysinfo.o jump_label.o lgr.o os_info.o machine_kexec.o pgm_check.o
-obj-y += runtime_instr.o cache.o fpu.o dumpstack.o guarded_storage.o
+obj-y += runtime_instr.o cache.o fpu.o dumpstack.o guarded_storage.o sthyi.o
obj-y += entry.o reipl.o relocate_kernel.o kdebugfs.o
extra-y += head.o head64.o vmlinux.lds