git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
arch
/
i386
/
oprofile
/
op_model_ppro.c
diff --git
a/arch/i386/oprofile/op_model_ppro.c
b/arch/i386/oprofile/op_model_ppro.c
index
21578b2
..
0cc8065
100644
(file)
--- a/
arch/i386/oprofile/op_model_ppro.c
+++ b/
arch/i386/oprofile/op_model_ppro.c
@@
-67,7
+67,7
@@
static void ppro_setup_ctrs(struct op_msrs const * const msrs)
/* enable active counters */
for (i = 0; i < NUM_COUNTERS; ++i) {
/* enable active counters */
for (i = 0; i < NUM_COUNTERS; ++i) {
- if (counter_config[i].e
vent
) {
+ if (counter_config[i].e
nabled
) {
reset_value[i] = counter_config[i].count;
CTR_WRITE(counter_config[i].count, msrs, i);
reset_value[i] = counter_config[i].count;
CTR_WRITE(counter_config[i].count, msrs, i);
@@
-91,7
+91,7
@@
static int ppro_check_ctrs(unsigned int const cpu,
{
unsigned int low, high;
int i;
{
unsigned int low, high;
int i;
- unsigned long eip =
instruction_pointer
(regs);
+ unsigned long eip =
profile_pc
(regs);
int is_kernel = !user_mode(regs);
for (i = 0 ; i < NUM_COUNTERS; ++i) {
int is_kernel = !user_mode(regs);
for (i = 0 ; i < NUM_COUNTERS; ++i) {