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 'for-linus' of ssh://master.kernel.org/pub/scm/linux/kernel/git/ieee1394...
[pandora-kernel.git]
/
arch
/
powerpc
/
oprofile
/
op_model_power4.c
diff --git
a/arch/powerpc/oprofile/op_model_power4.c
b/arch/powerpc/oprofile/op_model_power4.c
index
506f6b7
..
fe597a1
100644
(file)
--- a/
arch/powerpc/oprofile/op_model_power4.c
+++ b/
arch/powerpc/oprofile/op_model_power4.c
@@
-76,13
+76,13
@@
static inline int mmcra_must_set_sample(void)
{
if (__is_processor(PV_POWER4) || __is_processor(PV_POWER4p) ||
__is_processor(PV_970) || __is_processor(PV_970FX) ||
{
if (__is_processor(PV_POWER4) || __is_processor(PV_POWER4p) ||
__is_processor(PV_970) || __is_processor(PV_970FX) ||
- __is_processor(PV_970MP))
+ __is_processor(PV_970MP)
|| __is_processor(PV_970GX)
)
return 1;
return 0;
}
return 1;
return 0;
}
-static void power4_cpu_setup(
void *unused
)
+static void power4_cpu_setup(
struct op_counter_config *ctr
)
{
unsigned int mmcr0 = mmcr0_val;
unsigned long mmcra = mmcra_val;
{
unsigned int mmcr0 = mmcr0_val;
unsigned long mmcra = mmcra_val;
@@
-121,9
+121,9
@@
static void power4_start(struct op_counter_config *ctr)
for (i = 0; i < cur_cpu_spec->num_pmcs; ++i) {
if (ctr[i].enabled) {
for (i = 0; i < cur_cpu_spec->num_pmcs; ++i) {
if (ctr[i].enabled) {
- ctr_write(i, reset_value[i]);
+ c
lassic_c
tr_write(i, reset_value[i]);
} else {
} else {
- ctr_write(i, 0);
+ c
lassic_c
tr_write(i, 0);
}
}
}
}
@@
-254,13
+254,13
@@
static void power4_handle_interrupt(struct pt_regs *regs,
mtmsrd(mfmsr() | MSR_PMM);
for (i = 0; i < cur_cpu_spec->num_pmcs; ++i) {
mtmsrd(mfmsr() | MSR_PMM);
for (i = 0; i < cur_cpu_spec->num_pmcs; ++i) {
- val = ctr_read(i);
+ val = c
lassic_c
tr_read(i);
if (val < 0) {
if (oprofile_running && ctr[i].enabled) {
oprofile_add_ext_sample(pc, regs, i, is_kernel);
if (val < 0) {
if (oprofile_running && ctr[i].enabled) {
oprofile_add_ext_sample(pc, regs, i, is_kernel);
- ctr_write(i, reset_value[i]);
+ c
lassic_c
tr_write(i, reset_value[i]);
} else {
} else {
- ctr_write(i, 0);
+ c
lassic_c
tr_write(i, 0);
}
}
}
}
}
}