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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
arch
/
powerpc
/
kernel
/
power7-pmu.c
diff --git
a/arch/powerpc/kernel/power7-pmu.c
b/arch/powerpc/kernel/power7-pmu.c
index
5a9f5cb
..
018d094
100644
(file)
--- a/
arch/powerpc/kernel/power7-pmu.c
+++ b/
arch/powerpc/kernel/power7-pmu.c
@@
-317,7
+317,7
@@
static int power7_generic_events[] = {
*/
static int power7_cache_events[C(MAX)][C(OP_MAX)][C(RESULT_MAX)] = {
[C(L1D)] = { /* RESULT_ACCESS RESULT_MISS */
*/
static int power7_cache_events[C(MAX)][C(OP_MAX)][C(RESULT_MAX)] = {
[C(L1D)] = { /* RESULT_ACCESS RESULT_MISS */
- [C(OP_READ)] = { 0x
400f0, 0xc880
},
+ [C(OP_READ)] = { 0x
c880, 0x400f0
},
[C(OP_WRITE)] = { 0, 0x300f0 },
[C(OP_PREFETCH)] = { 0xd8b8, 0 },
},
[C(OP_WRITE)] = { 0, 0x300f0 },
[C(OP_PREFETCH)] = { 0xd8b8, 0 },
},
@@
-327,8
+327,8
@@
static int power7_cache_events[C(MAX)][C(OP_MAX)][C(RESULT_MAX)] = {
[C(OP_PREFETCH)] = { 0x408a, 0 },
},
[C(LL)] = { /* RESULT_ACCESS RESULT_MISS */
[C(OP_PREFETCH)] = { 0x408a, 0 },
},
[C(LL)] = { /* RESULT_ACCESS RESULT_MISS */
- [C(OP_READ)] = { 0x
6080, 0x6084
},
- [C(OP_WRITE)] = { 0x
6082, 0x6086
},
+ [C(OP_READ)] = { 0x
16080, 0x26080
},
+ [C(OP_WRITE)] = { 0x
16082, 0x26082
},
[C(OP_PREFETCH)] = { 0, 0 },
},
[C(DTLB)] = { /* RESULT_ACCESS RESULT_MISS */
[C(OP_PREFETCH)] = { 0, 0 },
},
[C(DTLB)] = { /* RESULT_ACCESS RESULT_MISS */
@@
-366,7
+366,8
@@
static struct power_pmu power7_pmu = {
static int init_power7_pmu(void)
{
static int init_power7_pmu(void)
{
- if (strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power7"))
+ if (!cur_cpu_spec->oprofile_cpu_type ||
+ strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power7"))
return -ENODEV;
return register_power_pmu(&power7_pmu);
return -ENODEV;
return register_power_pmu(&power7_pmu);