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 'core/softlockup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
mips
/
oprofile
/
common.c
diff --git
a/arch/mips/oprofile/common.c
b/arch/mips/oprofile/common.c
index
aa52aa1
..
dd2fbd6
100644
(file)
--- a/
arch/mips/oprofile/common.c
+++ b/
arch/mips/oprofile/common.c
@@
-27,7
+27,7
@@
static int op_mips_setup(void)
model->reg_setup(ctr);
/* Configure the registers on all cpus. */
model->reg_setup(ctr);
/* Configure the registers on all cpus. */
- on_each_cpu(model->cpu_setup, NULL,
0,
1);
+ on_each_cpu(model->cpu_setup, NULL, 1);
return 0;
}
return 0;
}
@@
-58,7
+58,7
@@
static int op_mips_create_files(struct super_block * sb, struct dentry * root)
static int op_mips_start(void)
{
static int op_mips_start(void)
{
- on_each_cpu(model->cpu_start, NULL,
0,
1);
+ on_each_cpu(model->cpu_start, NULL, 1);
return 0;
}
return 0;
}
@@
-66,7
+66,7
@@
static int op_mips_start(void)
static void op_mips_stop(void)
{
/* Disable performance monitoring for all counters. */
static void op_mips_stop(void)
{
/* Disable performance monitoring for all counters. */
- on_each_cpu(model->cpu_stop, NULL,
0,
1);
+ on_each_cpu(model->cpu_stop, NULL, 1);
}
int __init oprofile_arch_init(struct oprofile_operations *ops)
}
int __init oprofile_arch_init(struct oprofile_operations *ops)
@@
-80,6
+80,7
@@
int __init oprofile_arch_init(struct oprofile_operations *ops)
case CPU_24K:
case CPU_25KF:
case CPU_34K:
case CPU_24K:
case CPU_25KF:
case CPU_34K:
+ case CPU_1004K:
case CPU_74K:
case CPU_SB1:
case CPU_SB1A:
case CPU_74K:
case CPU_SB1:
case CPU_SB1A: