[build error] perf/urgent broken due to INTEL_UEVENT_PEBS_LDLAT_EXTRA_REG

[build error] perf/urgent broken due to INTEL_UEVENT_PEBS_LDLAT_EXTRA_REG

[David Rientjes]

Commit 3de4ad210387 ("perf/x86: Fix offcore_rsp valid mask for SNB/IVB") 
in perf/urgent breaks the build:

arch/x86/kernel/cpu/perf_event_intel.c:158:2: error: implicit declaration of function 'INTEL_UEVENT_PEBS_LDLAT_EXTRA_REG' [-Werror=implicit-function-declaration]
arch/x86/kernel/cpu/perf_event_intel.c:158:2: warning: missing braces around initializer [-Wmissing-braces]
arch/x86/kernel/cpu/perf_event_intel.c:158:2: warning: (near initialization for 'intel_snb_extra_regs[2]') [-Wmissing-braces]
arch/x86/kernel/cpu/perf_event_intel.c:158:2: error: initializer element is not constant
arch/x86/kernel/cpu/perf_event_intel.c:158:2: error: (near initialization for 'intel_snb_extra_regs[2].event')
arch/x86/kernel/cpu/perf_event_intel.c:159:2: warning: braces around scalar initializer [enabled by default]
arch/x86/kernel/cpu/perf_event_intel.c:159:2: warning: (near initialization for 'intel_snb_extra_regs[2].msr') [enabled by default]
arch/x86/kernel/cpu/perf_event_intel.c:159:2: error: field name not in record or union initializer
arch/x86/kernel/cpu/perf_event_intel.c:159:2: error: (near initialization for 'intel_snb_extra_regs[2].msr')
arch/x86/kernel/cpu/perf_event_intel.c:159:2: error: field name not in record or union initializer
arch/x86/kernel/cpu/perf_event_intel.c:159:2: error: (near initialization for 'intel_snb_extra_regs[2].msr')
arch/x86/kernel/cpu/perf_event_intel.c:159:2: warning: excess elements in scalar initializer [enabled by default]
arch/x86/kernel/cpu/perf_event_intel.c:159:2: warning: (near initialization for 'intel_snb_extra_regs[2].msr') [enabled by default]
arch/x86/kernel/cpu/perf_event_intel.c:159:2: error: field name not in record or union initializer
arch/x86/kernel/cpu/perf_event_intel.c:159:2: error: (near initialization for 'intel_snb_extra_regs[2].msr')
arch/x86/kernel/cpu/perf_event_intel.c:159:2: warning: excess elements in scalar initializer [enabled by default]
arch/x86/kernel/cpu/perf_event_intel.c:159:2: warning: (near initialization for 'intel_snb_extra_regs[2].msr') [enabled by default]
arch/x86/kernel/cpu/perf_event_intel.c:159:2: error: field name not in record or union initializer
arch/x86/kernel/cpu/perf_event_intel.c:159:2: error: (near initialization for 'intel_snb_extra_regs[2].msr')
arch/x86/kernel/cpu/perf_event_intel.c:159:2: warning: excess elements in scalar initializer [enabled by default]
arch/x86/kernel/cpu/perf_event_intel.c:159:2: warning: (near initialization for 'intel_snb_extra_regs[2].msr') [enabled by default]
arch/x86/kernel/cpu/perf_event_intel.c:159:2: error: field name not in record or union initializer
arch/x86/kernel/cpu/perf_event_intel.c:159:2: error: (near initialization for 'intel_snb_extra_regs[2].msr')
arch/x86/kernel/cpu/perf_event_intel.c:159:2: warning: excess elements in scalar initializer [enabled by default]
arch/x86/kernel/cpu/perf_event_intel.c:159:2: warning: (near initialization for 'intel_snb_extra_regs[2].msr') [enabled by default]

Re: [build error] perf/urgent broken due to INTEL_UEVENT_PEBS_LDLAT_EXTRA_REG

[Ingo Molnar]

* David Rientjes <rientjes@google.com> wrote:

> Commit 3de4ad210387 ("perf/x86: Fix offcore_rsp valid mask for SNB/IVB") in 
> perf/urgent breaks the build:

Hm, that's was me resolving the conflicts incorrectly.

Stephane, mind sending a tested version of the patch against current -git that can 
be applied to v3.9 and can be backported?

Thanks,

	Ingo

Re: [build error] perf/urgent broken due to INTEL_UEVENT_PEBS_LDLAT_EXTRA_REG

[Stephane Eranian]

On Tue, Apr 16, 2013 at 9:52 AM, Ingo Molnar <mingo@kernel.org> wrote:
>
> * David Rientjes <rientjes@google.com> wrote:
>
>> Commit 3de4ad210387 ("perf/x86: Fix offcore_rsp valid mask for SNB/IVB") in
>> perf/urgent breaks the build:
>
> Hm, that's was me resolving the conflicts incorrectly.
>
> Stephane, mind sending a tested version of the patch against current -git that can
> be applied to v3.9 and can be backported?
>
To make backport clean, I need to generate a patch against a kernel
git tree which
does not have the PEBS-LL (LDLAT) support. tip.git already has
PEBS-LL, so I need
to use another tree.

Re: [build error] perf/urgent broken due to INTEL_UEVENT_PEBS_LDLAT_EXTRA_REG

[Ingo Molnar]

* Stephane Eranian <eranian@google.com> wrote:

> On Tue, Apr 16, 2013 at 9:52 AM, Ingo Molnar <mingo@kernel.org> wrote:
> >
> > * David Rientjes <rientjes@google.com> wrote:
> >
> >> Commit 3de4ad210387 ("perf/x86: Fix offcore_rsp valid mask for SNB/IVB") in
> >> perf/urgent breaks the build:
> >
> > Hm, that's was me resolving the conflicts incorrectly.
> >
> > Stephane, mind sending a tested version of the patch against current -git that can
> > be applied to v3.9 and can be backported?
> >
>
> To make backport clean, I need to generate a patch against a kernel git tree 
> which does not have the PEBS-LL (LDLAT) support. tip.git already has PEBS-LL, so 
> I need to use another tree.

You can just use the tip:perf/urgent branch for that, it does not have the LDLAT 
patches. But using Linus's tree is fine as a base too.

Thanks,

	Ingo