git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
[pandora-kernel.git]
/
arch
/
powerpc
/
kernel
/
ppc970-pmu.c
diff --git
a/arch/powerpc/kernel/ppc970-pmu.c
b/arch/powerpc/kernel/ppc970-pmu.c
index
9a6e093
..
8c21902
100644
(file)
--- a/
arch/powerpc/kernel/ppc970-pmu.c
+++ b/
arch/powerpc/kernel/ppc970-pmu.c
@@
-467,6
+467,11
@@
static int ppc970_cache_events[C(MAX)][C(OP_MAX)][C(RESULT_MAX)] = {
[C(OP_WRITE)] = { -1, -1 },
[C(OP_PREFETCH)] = { -1, -1 },
},
[C(OP_WRITE)] = { -1, -1 },
[C(OP_PREFETCH)] = { -1, -1 },
},
+ [C(NODE)] = { /* RESULT_ACCESS RESULT_MISS */
+ [C(OP_READ)] = { -1, -1 },
+ [C(OP_WRITE)] = { -1, -1 },
+ [C(OP_PREFETCH)] = { -1, -1 },
+ },
};
static struct power_pmu ppc970_pmu = {
};
static struct power_pmu ppc970_pmu = {
@@
-484,7
+489,7
@@
static struct power_pmu ppc970_pmu = {
.cache_events = &ppc970_cache_events,
};
.cache_events = &ppc970_cache_events,
};
-static int init_ppc970_pmu(void)
+static int
__init
init_ppc970_pmu(void)
{
if (!cur_cpu_spec->oprofile_cpu_type ||
(strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/970")
{
if (!cur_cpu_spec->oprofile_cpu_type ||
(strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/970")