diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile
index bba01bf678a6151e20a34db54a6fdb6d90d28600..249aaeb65d3507233275307c15f74d9f580e590b 100644
--- a/arch/s390/kernel/Makefile
+++ b/arch/s390/kernel/Makefile
@@ -48,8 +48,11 @@ obj-$(CONFIG_DYNAMIC_FTRACE)	+= ftrace.o
 obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += ftrace.o
 obj-$(CONFIG_FTRACE_SYSCALLS)  += ftrace.o
 obj-$(CONFIG_CRASH_DUMP)	+= crash_dump.o
+
+ifdef CONFIG_64BIT
 obj-$(CONFIG_PERF_EVENTS)	+= perf_event.o perf_cpum_cf.o
-obj-$(CONFIG_64BIT)		+= runtime_instr.o cache.o
+obj-y				+= runtime_instr.o cache.o
+endif
 
 # Kexec part
 S390_KEXEC_OBJS := machine_kexec.o