From 01b77f5449a35e38c40ad137e9d797ac54428b83 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Fri, 14 Sep 2012 12:57:39 +0200
Subject: [PATCH] --- yaml --- r: 324104 b: refs/heads/master c:
 305e4f108b683a96254d36f916ecab79dcc3ea4f h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/arch/s390/kernel/Makefile | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e92f4cd35180..c6e847e759df 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e37b0cbb8edf64dc87ae95831c177db6c6d3b5c
+refs/heads/master: 305e4f108b683a96254d36f916ecab79dcc3ea4f
diff --git a/trunk/arch/s390/kernel/Makefile b/trunk/arch/s390/kernel/Makefile
index bba01bf678a6..249aaeb65d35 100644
--- a/trunk/arch/s390/kernel/Makefile
+++ b/trunk/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