From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1755340AbcC1WaF (ORCPT <rfc822;w@1wt.eu>);
	Mon, 28 Mar 2016 18:30:05 -0400
Received: from ozlabs.org ([103.22.144.67]:34108 "EHLO ozlabs.org"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1752548AbcC1WaC (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Mon, 28 Mar 2016 18:30:02 -0400
Date: Tue, 29 Mar 2016 09:29:59 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Ingo Molnar <mingo@kernel.org>, linux-kernel@vger.kernel.org,
        Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>,
        Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: Re: [PATCH 1/1] perf tools: Fix build break on powerpc
Message-ID: <20160329092959.4e9aa3cb@canb.auug.org.au>
In-Reply-To: <1459198354-24791-2-git-send-email-acme@kernel.org>
References: <1459198354-24791-1-git-send-email-acme@kernel.org>
	<1459198354-24791-2-git-send-email-acme@kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi Arnaldo,

On Mon, 28 Mar 2016 17:52:34 -0300 Arnaldo Carvalho de Melo <acme@kernel.org> wrote:
>
> From: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
> 
> Commit 531d2410635c ("perf tools: Do not include stringify.h from the
> kernel sources") seems to have accidentially removed the inclusion of
> "util/header.h" from "arch/powerpc/util/header.c".
> 
> "util/header.h" provides the prototype for get_cpuid() and is needed to
> build perf on Powerpc:
> 
> 	arch/powerpc/util/header.c:17:1: error: no previous prototype for 'get_cpuid' [-Werror=missing-prototypes]
> 
> Reported-by: Michael Ellerman <mpe@ellerman.id.au>
> Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
> Cc: Stephen Rothwell <sfr@canb.auug.org.au>
> Fixes: 531d2410635c ("perf tools: Do not include stringify.h from the kernel sources")
> Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
> [ Included "util.h" too, to get the scnprintf() prototype ]
> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
> ---
>  tools/perf/arch/powerpc/util/header.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/tools/perf/arch/powerpc/util/header.c b/tools/perf/arch/powerpc/util/header.c
> index 6138bdef6e63..f8ccee132867 100644
> --- a/tools/perf/arch/powerpc/util/header.c
> +++ b/tools/perf/arch/powerpc/util/header.c
> @@ -4,6 +4,8 @@
>  #include <stdlib.h>
>  #include <string.h>
>  #include <linux/stringify.h>
> +#include "header.h"
> +#include "util.h"
>  
>  #define mfspr(rn)       ({unsigned long rval; \
>  			 asm volatile("mfspr %0," __stringify(rn) \
> -- 
> 2.5.5

Thanks, I will put that in my "fixes" tree until it gets accepted
upstream.

-- 
Cheers,
Stephen Rothwell