Prev: [PATCH] V4L/DVB: mx1-camera: compile fix
Next: [PATCH v2 0/2] ahci: Add support for non-PCI devices
From: Robert Richter on 4 Mar 2010 12:00
Use reserve_perfctr()/release_perfctr() in perf code.

Signed-off-by: Robert Richter <robert.richter(a)amd.com>
---
arch/x86/kernel/cpu/perf_event.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
index 62a1a5e..16ae7b4 100644
--- a/arch/x86/kernel/cpu/perf_event.c
+++ b/arch/x86/kernel/cpu/perf_event.c
@@ -244,7 +244,7 @@ static bool reserve_pmc_hardware(void)
disable_lapic_nmi_watchdog();

for (i = 0; i < x86_pmu.num_events; i++) {
- if (!reserve_perfctr_nmi(x86_pmu.perfctr + i))
+ if (!reserve_perfctr(i))
goto perfctr_fail;
}

@@ -252,7 +252,7 @@ static bool reserve_pmc_hardware(void)

perfctr_fail:
for (i--; i >= 0; i--)
- release_perfctr_nmi(x86_pmu.perfctr + i);
+ release_perfctr(i);

if (nmi_watchdog == NMI_LOCAL_APIC)
enable_lapic_nmi_watchdog();
@@ -265,7 +265,7 @@ static void release_pmc_hardware(void)
int i;

for (i = 0; i < x86_pmu.num_events; i++)
- release_perfctr_nmi(x86_pmu.perfctr + i);
+ release_perfctr(i);

if (nmi_watchdog == NMI_LOCAL_APIC)
enable_lapic_nmi_watchdog();
--
1.7.0


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [PATCH] V4L/DVB: mx1-camera: compile fix
Next: [PATCH v2 0/2] ahci: Add support for non-PCI devices