]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
perf tools: Fix build break on powerpc due to sample_reg_masks
authorSukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Thu, 24 Sep 2015 21:53:49 +0000 (17:53 -0400)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Wed, 7 Oct 2015 13:20:08 +0000 (10:20 -0300)
commit9fb4765451f22c5e782c1590747717550bff34b2
tree6f10f90abd7d98fad3107ef184de086698125c47
parent097f70b3c4d84ffccca15195bdfde3a37c0a7c0f
perf tools: Fix build break on powerpc due to sample_reg_masks

perf_regs.c does not get built on Powerpc as CONFIG_PERF_REGS is false.
So the weak definition for 'sample_regs_masks' doesn't get picked up.

Adding perf_regs.o to util/Build unconditionally, exposes a redefinition
error for 'perf_reg_value()' function (due to the static inline version
in util/perf_regs.h). So use #ifdef HAVE_PERF_REGS_SUPPORT' around that
function.

Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: linuxppc-dev@ozlabs.org
Link: http://lkml.kernel.org/r/20150930182836.GA27858@us.ibm.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/util/Build
tools/perf/util/perf_regs.c
tools/perf/util/perf_regs.h