lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'tip/perfcounters-for-linus' into oprofile/master

Browse Source 
Conflicts:
	arch/x86/oprofile/op_model_ppro.c

Signed-off-by: Robert Richter <robert.richter@amd.com>
This commit is contained in:
Robert Richter
2009-06-12 17:58:48 +02:00
parent 51563a0e56 940010c5a3
commit 1241eb8f13
506 changed files with 44855 additions and 8421 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
arch/x86/oprofile/op_model_ppro.c
View File

@@ -118,6 +118,13 @@ static int ppro_check_ctrs(struct pt_regs * const regs,
u64 val;
int i;
/*
* This can happen if perf counters are in use when
* we steal the die notifier NMI.
*/
if (unlikely(!reset_value))
goto out;
for (i = 0 ; i < num_counters; ++i) {
if (!reset_value[i])
continue;
@@ -128,6 +135,7 @@ static int ppro_check_ctrs(struct pt_regs * const regs,
wrmsrl(msrs->counters[i].addr, -reset_value[i]);
}
out:
/* Only P6 based Pentium M need to re-unmask the apic vector but it
* doesn't hurt other P6 variant */
apic_write(APIC_LVTPC, apic_read(APIC_LVTPC) & ~APIC_LVT_MASKED);