projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'torvalds/master' into perf/core
[linux-2.6-microblaze.git]
/
tools
/
perf
/
arch
/
powerpc
/
util
/
mem-events.c
diff --git
a/tools/perf/arch/powerpc/util/mem-events.c
b/tools/perf/arch/powerpc/util/mem-events.c
index
07fb5e0
..
4120faf
100644
(file)
--- a/
tools/perf/arch/powerpc/util/mem-events.c
+++ b/
tools/perf/arch/powerpc/util/mem-events.c
@@
-3,7
+3,7
@@
#include "mem-events.h"
/* PowerPC does not support 'ldlat' parameter. */
-char *perf_mem_events__name(int i)
+char *perf_mem_events__name(int i
, char *pmu_name __maybe_unused
)
{
if (i == PERF_MEM_EVENTS__LOAD)
return (char *) "cpu/mem-loads/";