From: Heiko Carstens Date: Fri, 14 Sep 2012 10:57:39 +0000 (+0200) Subject: s390/perf_events: compile only for CONFIG_64BIT X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=305e4f108b683a96254d36f916ecab79dcc3ea4f;p=linux-beck.git s390/perf_events: compile only for CONFIG_64BIT The whole hardware support is only available in zArch mode. Fixes also this compile warning: arch/s390/kernel/perf_cpum_cf.c: In function ‘cpumf_pmu_init’: arch/s390/kernel/perf_cpum_cf.c:670:2: warning: left shift count >= width of type [enabled by default] Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky --- diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile index bba01bf678a6..249aaeb65d35 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