lkml.org 
[lkml]   [2010]   [Mar]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] x86,perf: Unmask LVTPC only if we have APIC supported

* Cyrill Gorcunov <gorcunov@openvz.org> wrote:

> Ingo reported
> |
> | There's a build failure on -tip with the P4 driver, on UP 32-bit, if
> | PERF_EVENTS is enabled but UP_APIC is disabled:
> |
> | arch/x86/built-in.o: In function `p4_pmu_handle_irq':
> | perf_event.c:(.text+0xa756): undefined reference to `apic'
> | perf_event.c:(.text+0xa76e): undefined reference to `apic'
> |
>
> So we have to unmask LVTPC only if we're configured to have one.
>
> Reported-by: Ingo Molnar <mingo@elte.hu>
> CC: Lin Ming <ming.m.lin@intel.com>
> CC: Peter Zijlstra <peterz@infradead.org>
> Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
> ---
> arch/x86/kernel/cpu/perf_event_p4.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> 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
> @@ -365,8 +365,10 @@ 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);

This ugly #ifdef looks like a workaround though. Why doesnt apic_write() map
to nothing in that case?

Ingo


\
 
 \ /
  Last update: 2010-03-13 13:27    [W:0.083 / U:0.132 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site