Re: [PATCH 0/3] perf/core, x86: unify perfctr bitmasks

[Peter Zijlstra <peterz@infradead.org>]

On Thu, 2010-04-01 at 14:47 +0800, Lin Ming wrote:
> 
> In file included from arch/x86/kernel/cpu/perf_event.c:1326:
> arch/x86/kernel/cpu/perf_event_p6.c:94: error: ‘x86_hw_config’ undeclared here (not in a function)
> arch/x86/kernel/cpu/perf_event_p6.c:99: error: unknown field ‘raw_event’ specified in initializer
> arch/x86/kernel/cpu/perf_event_p6.c:99: error: ‘x86_pmu_raw_event’ undeclared here (not in a function)
> make[3]: *** [arch/x86/kernel/cpu/perf_event.o] Error 1
> 
> diff --git a/arch/x86/kernel/cpu/perf_event_p6.c b/arch/x86/kernel/cpu/perf_event_p6.c
> index 626abc0..4ec9680 100644
> --- a/arch/x86/kernel/cpu/perf_event_p6.c
> +++ b/arch/x86/kernel/cpu/perf_event_p6.c
> @@ -91,12 +91,11 @@ static __initconst struct x86_pmu p6_pmu = {
>         .enable_all             = p6_pmu_enable_all,
>         .enable                 = p6_pmu_enable_event,
>         .disable                = p6_pmu_disable_event,
> -       .hw_config              = x86_hw_config,
> +       .hw_config              = x86_pmu_hw_config,
>         .schedule_events        = x86_schedule_events,
>         .eventsel               = MSR_P6_EVNTSEL0,
>         .perfctr                = MSR_P6_PERFCTR0,
>         .event_map              = p6_pmu_event_map,
> -       .raw_event              = x86_pmu_raw_event,
>         .max_events             = ARRAY_SIZE(p6_perfmon_event_map),
>         .apic                   = 1,
>         .max_period             = (1ULL << 31) - 1, 

egads, that hunk seems to have tunneled into another patch in my
queue,.. /me goes fix.

Thanks Lin.