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_7450.c
diff --git
a/arch/powerpc/oprofile/op_model_7450.c
b/arch/powerpc/oprofile/op_model_7450.c
index
32abfdb
..
5d1bbaf
100644
(file)
--- a/
arch/powerpc/oprofile/op_model_7450.c
+++ b/
arch/powerpc/oprofile/op_model_7450.c
@@
-1,5
+1,5
@@
/*
/*
- * oprofile/op_model_7450.c
+ *
arch/powerpc/
oprofile/op_model_7450.c
*
* Freescale 745x/744x oprofile support, based on fsl_booke support
* Copyright (C) 2004 Anton Blanchard <anton@au.ibm.com>, IBM
*
* Freescale 745x/744x oprofile support, based on fsl_booke support
* Copyright (C) 2004 Anton Blanchard <anton@au.ibm.com>, IBM
@@
-81,7
+81,7
@@
static void pmc_stop_ctrs(void)
/* Configures the counters on this CPU based on the global
* settings */
/* Configures the counters on this CPU based on the global
* settings */
-static void fsl7450_cpu_setup(
void *unused
)
+static void fsl7450_cpu_setup(
struct op_counter_config *ctr
)
{
/* freeze all counters */
pmc_stop_ctrs();
{
/* freeze all counters */
pmc_stop_ctrs();
@@
-137,9
+137,9
@@
static void fsl7450_start(struct op_counter_config *ctr)
for (i = 0; i < NUM_CTRS; ++i) {
if (ctr[i].enabled)
for (i = 0; i < NUM_CTRS; ++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);
}
/* Clear the freeze bit, and enable the interrupt.
}
/* Clear the freeze bit, and enable the interrupt.
@@
-176,16
+176,16
@@
static void fsl7450_handle_interrupt(struct pt_regs *regs,
mtmsr(mfmsr() | MSR_PMM);
pc = mfspr(SPRN_SIAR);
mtmsr(mfmsr() | MSR_PMM);
pc = mfspr(SPRN_SIAR);
- is_kernel =
(pc >= KERNELBASE
);
+ is_kernel =
is_kernel_addr(pc
);
for (i = 0; i < NUM_CTRS; ++i) {
for (i = 0; i < NUM_CTRS; ++i) {
- val = ctr_read(i);
+ val = c
lassic_c
tr_read(i);
if (val < 0) {
if (oprofile_running && ctr[i].enabled) {
if (val < 0) {
if (oprofile_running && ctr[i].enabled) {
- oprofile_add_
pc(pc, is_kernel, i
);
- ctr_write(i, reset_value[i]);
+ oprofile_add_
ext_sample(pc, regs, i, is_kernel
);
+ c
lassic_c
tr_write(i, reset_value[i]);
} else {
} else {
- ctr_write(i, 0);
+ c
lassic_c
tr_write(i, 0);
}
}
}
}
}
}