On Fri, Jan 25, 2013 at 6:46 PM, Borislav Petkov <b...@alien8.de> wrote:
> From: Borislav Petkov <b...@suse.de>
>
> Fix this one:
>
> arch/x86/kernel/cpu/perf_event.c: In function ‘init_hw_perf_events’:
> arch/x86/kernel/cpu/perf_event.c:1508:7: warning: assignment from incompatible
> pointer type [enabled by default]
> arch/x86/kernel/cpu/perf_event.c:1510:31: warning: assignment from
> incompatible
> pointer type [enabled by default]
>
> Signed-off-by: Borislav Petkov <b...@suse.de>
> Cc: Andi Kleen <a...@linux.intel.com>
> Cc: Stephane Eranian <eran...@google.com>
Acked-by: Stephane Eranian <eran...@google.com>
> ---
> arch/x86/kernel/cpu/perf_event.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/x86/kernel/cpu/perf_event.c
> b/arch/x86/kernel/cpu/perf_event.c
> index 1e2519d0dc7a..c6ef37af76b0 100644
> --- a/arch/x86/kernel/cpu/perf_event.c
> +++ b/arch/x86/kernel/cpu/perf_event.c
> @@ -1503,7 +1503,7 @@ static int __init init_hw_perf_events(void)
> filter_events(x86_pmu_events_group.attrs);
>
> if (x86_pmu.cpu_events) {
> - struct attribute *tmp;
> + struct attribute **tmp;
>
> tmp = merge_attr(x86_pmu_events_group.attrs,
> x86_pmu.cpu_events);
> if (!WARN_ON(!tmp))
> --
> 1.8.1.rc3
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
