summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2010-01-27 10:52:36 +0100
committerIngo Molnar <mingo@elte.hu>2010-01-27 10:52:36 +0100
commitb7a0afb0b4649d9b43488d5f5b1660bc9cffcff6 (patch)
tree9ab329626864b3e872bbaffeb1efd00401f84e84 /arch
parentda482474b8396e1a099c37ffc6541b78775aedb4 (diff)
parente83e452b0692c9c13372540deb88a77d4ae2553d (diff)
downloadop-kernel-dev-b7a0afb0b4649d9b43488d5f5b1660bc9cffcff6.zip
op-kernel-dev-b7a0afb0b4649d9b43488d5f5b1660bc9cffcff6.tar.gz
Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into x86/urgent
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/oprofile/nmi_int.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
index cb88b1a..3347f69 100644
--- a/arch/x86/oprofile/nmi_int.c
+++ b/arch/x86/oprofile/nmi_int.c
@@ -222,7 +222,7 @@ static void nmi_cpu_switch(void *dummy)
/* move to next set */
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;
else
per_cpu(switch_index, cpu) = si;
@@ -598,6 +598,7 @@ static int __init ppro_init(char **cpu_type)
case 15: case 23:
*cpu_type = "i386/core_2";
break;
+ case 0x2e:
case 26:
spec = &op_arch_perfmon_spec;
*cpu_type = "i386/core_i7";
OpenPOWER on IntegriCloud