diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2012-09-14 12:57:39 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2012-09-26 15:45:20 +0200 |
| commit | 305e4f108b683a96254d36f916ecab79dcc3ea4f (patch) | |
| tree | 2bf151bedfeae10f1da2ff2edec4185e8b30c674 /arch/s390 | |
| parent | 0e37b0cbb8edf64dc87ae95831c177db6c6d3b5c (diff) | |
| download | linux-stable-305e4f108b683a96254d36f916ecab79dcc3ea4f.tar.gz linux-stable-305e4f108b683a96254d36f916ecab79dcc3ea4f.tar.bz2 linux-stable-305e4f108b683a96254d36f916ecab79dcc3ea4f.zip | |
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 <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/kernel/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
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 |