Prev: perf-probe updates - data-structure support, etc.
Next: [patch 0/2] x86, apic, perf - make apic_write/read noop on !APIC case
From: Cyrill Gorcunov on 17 Mar 2010 06:50
Since apic_write maps to a plain noop in !CONFIG_X86_LOCAL_APIC
case we're safe to remove this conditional compilation
and clean code a bit.

CC: fweisbec(a)gmail.com
CC: acme(a)redhat.com
CC: eranian(a)google.com
CC: peterz(a)infradead.org
Signed-off-by: Cyrill Gorcunov <gorcunov(a)openvz.org>
---
arch/x86/kernel/cpu/perf_event.c | 4 ----
arch/x86/kernel/cpu/perf_event_p4.c | 2 --
2 files changed, 6 deletions(-)

Index: linux-2.6.git/arch/x86/kernel/cpu/perf_event.c
=====================================================================
--- linux-2.6.git.orig/arch/x86/kernel/cpu/perf_event.c
+++ linux-2.6.git/arch/x86/kernel/cpu/perf_event.c
@@ -1135,7 +1135,6 @@ void set_perf_event_pending(void)

void perf_events_lapic_init(void)
{
-#ifdef CONFIG_X86_LOCAL_APIC
if (!x86_pmu.apic || !x86_pmu_initialized())
return;

@@ -1143,7 +1142,6 @@ void perf_events_lapic_init(void)
* Always use NMI for PMU
*/
apic_write(APIC_LVTPC, APIC_DM_NMI);
-#endif
}

static int __kprobes
@@ -1167,9 +1165,7 @@ perf_event_nmi_handler(struct notifier_b

regs = args->regs;

-#ifdef CONFIG_X86_LOCAL_APIC
apic_write(APIC_LVTPC, APIC_DM_NMI);
-#endif
/*
* Can't rely on the handled return value to say it was our NMI, two
* events could trigger 'simultaneously' raising two back-to-back NMIs.
Index: linux-2.6.git/arch/x86/kernel/cpu/perf_event_p4.c
=====================================================================
--- linux-2.6.git.orig/arch/x86/kernel/cpu/perf_event_p4.c
+++ linux-2.6.git/arch/x86/kernel/cpu/perf_event_p4.c
@@ -363,10 +363,8 @@ static int p4_pmu_handle_irq(struct pt_r
}

if (handled) {
-#ifdef CONFIG_X86_LOCAL_APIC
/* p4 quirk: unmask it again */
apic_write(APIC_LVTPC, apic_read(APIC_LVTPC) & ~APIC_LVT_MASKED);
-#endif
inc_irq_stat(apic_perf_irqs);
}


--
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: perf-probe updates - data-structure support, etc.
Next: [patch 0/2] x86, apic, perf - make apic_write/read noop on !APIC case