Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into x86/urgent
This commit is contained in:
commit
b7a0afb0b4
|
@ -222,7 +222,7 @@ static void nmi_cpu_switch(void *dummy)
|
||||||
|
|
||||||
/* move to next set */
|
/* move to next set */
|
||||||
si += model->num_counters;
|
si += model->num_counters;
|
||||||
if ((si > model->num_virt_counters) || (counter_config[si].count == 0))
|
if ((si >= model->num_virt_counters) || (counter_config[si].count == 0))
|
||||||
per_cpu(switch_index, cpu) = 0;
|
per_cpu(switch_index, cpu) = 0;
|
||||||
else
|
else
|
||||||
per_cpu(switch_index, cpu) = si;
|
per_cpu(switch_index, cpu) = si;
|
||||||
|
@ -598,6 +598,7 @@ static int __init ppro_init(char **cpu_type)
|
||||||
case 15: case 23:
|
case 15: case 23:
|
||||||
*cpu_type = "i386/core_2";
|
*cpu_type = "i386/core_2";
|
||||||
break;
|
break;
|
||||||
|
case 0x2e:
|
||||||
case 26:
|
case 26:
|
||||||
spec = &op_arch_perfmon_spec;
|
spec = &op_arch_perfmon_spec;
|
||||||
*cpu_type = "i386/core_i7";
|
*cpu_type = "i386/core_i7";
|
||||||
|
|
Loading…
Reference in New Issue