Skip to contentSkip to conversation

perf/urgent fix

GIT PULL In review Arnaldo Carvalho de Melo 3 participants 4 messages Mar 28, 2016 – Mar 29, 2016 perf events

lore
Share & tools
lore

Arnaldo Carvalho de Melo

author maintainer
#0 lore raw

Hi Ingo,

Please consider pulling,

- Arnaldo

The following changes since commit a49ac9f83b31e41c8311d64bd2b3f97a23dcb38d:

perf/x86: Move events_sysfs_show() outside CPU_SUP_INTEL (2016-03-25 09:46:53 +0100)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git tags/perf-urgent-for-mingo-20160328

for you to fetch changes up to 379649cfeafef29b77d29860741f4d1c5870b65f:

perf tools: Fix build break on powerpc (2016-03-28 17:46:20 -0300)

----------------------------------------------------------------
perf/urgent fix:

- Fix build break on powerpc due to missing headers with prototypes for functions defined in tools/perf/arch/powerpc/util/header.c (Sukadev Bhattiprolu)

Signed-off-by Arnaldo Carvalho de Melo <[email protected]>

----------------------------------------------------------------
Sukadev Bhattiprolu (1):
perf tools: Fix build break on powerpc

 tools/perf/arch/powerpc/util/header.c | 2 ++
 1 file changed, 2 insertions(+)
author maintainer
#1 lore raw

PATCH 1/1 perf tools: Fix build break on powerpc

From: Sukadev Bhattiprolu <[email protected]>

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 <[email protected]>
Tested-by Arnaldo Carvalho de Melo <[email protected]>
Cc Stephen Rothwell <[email protected]>
Fixes 531d2410635c ("perf tools: Do not include stringify.h from the kernel sources")
Signed-off-by Sukadev Bhattiprolu <[email protected]>
[ Included "util.h" too, to get the scnprintf() prototype ]
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
---
 tools/perf/arch/powerpc/util/header.c | 2 ++
 1 file changed, 2 insertions(+)
tools/perf/arch/powerpc/util/header.c +2 -0
index 6138bdef6e63..f8ccee132867 100644
@@ -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) \
Signature · 1 line
2.5.5
#2 lore raw

Re: [PATCH 1/1] perf tools: Fix build break on powerpc

Hi Arnaldo,

Quoted 38 lines · On Mon, 28 Mar 2016 17:52:34 -0300 Arnaldo Carvalho de Melo <[email protected]>…

From: Sukadev Bhattiprolu <[email protected]>

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 <[email protected]>
Tested-by Arnaldo Carvalho de Melo <[email protected]>
Cc Stephen Rothwell <[email protected]>
Fixes 531d2410635c ("perf tools: Do not include stringify.h from the kernel sources")
Signed-off-by Sukadev Bhattiprolu <[email protected]>
[ Included "util.h" too, to get the scnprintf() prototype ]
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
---
 tools/perf/arch/powerpc/util/header.c | 2 ++
 1 file changed, 2 insertions(+)
tools/perf/arch/powerpc/util/header.c +2 -0
index 6138bdef6e63..f8ccee132867 100644
@@ -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) \
Signature · 1 line
2.5.5

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

Signature · 2 lines
Cheers,
Stephen Rothwell
#3 lore raw
In reply to Arnaldo Carvalho de Melo
Quoted 24 lines · Arnaldo Carvalho de Melo

Hi Ingo,

Please consider pulling,

- Arnaldo

The following changes since commit a49ac9f83b31e41c8311d64bd2b3f97a23dcb38d:

perf/x86: Move events_sysfs_show() outside CPU_SUP_INTEL (2016-03-25 09:46:53 +0100)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git tags/perf-urgent-for-mingo-20160328

for you to fetch changes up to 379649cfeafef29b77d29860741f4d1c5870b65f:

perf tools: Fix build break on powerpc (2016-03-28 17:46:20 -0300)

----------------------------------------------------------------
perf/urgent fix:

- Fix build break on powerpc due to missing headers with prototypes for functions defined in tools/perf/arch/powerpc/util/header.c (Sukadev Bhattiprolu)

Quoted 8 lines
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>

----------------------------------------------------------------
Sukadev Bhattiprolu (1):
perf tools: Fix build break on powerpc

 tools/perf/arch/powerpc/util/header.c | 2 ++
 1 file changed, 2 insertions(+)

Pulled, thanks a lot Arnaldo!

Ingo