summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorSuravee Suthikulpanit <suravee.suthikulpanit@amd.com>2010-01-18 18:25:36 +0100
committerRobert Richter <robert.richter@amd.com>2010-01-25 15:34:53 +0100
commitd8cc108f4fab42b380c6b3f3356f99e8dd5372e2 (patch)
tree095a017bf9d97b67be388f4f26e2e647042336e6 /arch
parentLinux 2.6.33-rc5 (diff)
downloadlinux-d8cc108f4fab42b380c6b3f3356f99e8dd5372e2.tar.xz
linux-d8cc108f4fab42b380c6b3f3356f99e8dd5372e2.zip
oprofile/x86: fix crash when profiling more than 28 events
With multiplexing enabled oprofile crashs when profiling more than 28 events. This patch fixes this. Signed-off-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com> Signed-off-by: Robert Richter <robert.richter@amd.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/oprofile/nmi_int.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
index cb88b1a0bd5f..76d4f566adee 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;