perf, tools, stat: Include asm/bug.h for WARN_ON
PATCH 1/1 perf, tools, stat: Include asm/bug.h for WARN_ON
From: Andi Kleen <[email protected]>
In my set up (separate objdir, DEBUG=1) tip perf doesn't build without this change. It may be that in some other setups asm/bug.h is implicitely included. But always include it into builtin-stat.c
builtin-stat.c: In function ‘set_maps’:
builtin-stat.c:2126:6: error: implicit declaration of function ‘WARN_ONCE’ [-Werror=implicit-function-declaration]
if (WARN_ONCE(st->maps_allocated, "stats double allocation\n"))
^
builtin-stat.c:2126:2: error: nested extern declaration of ‘WARN_ONCE’ [-Werror=nested-externs]
if (WARN_ONCE(st->maps_allocated, "stats double allocation\n"))
^
--- tools/perf/builtin-stat.c | 1 + 1 file changed, 1 insertion(+)
tools/perf/builtin-stat.c +1 -0
@@ -60,6 +60,7 @@#include "util/thread_map.h" #include "util/counts.h" #include "util/group.h" +#include "asm/bug.h" #include <api/fs/fs.h> #include <stdlib.h>
Signature · 1 line
2.5.0
Arnaldo Carvalho de Melo
maintainerEm Wed, Feb 17, 2016 at 10:39:08AM -0800, Andi Kleen escreveu:
Quoted 4 lines
From: Andi Kleen <[email protected]>
In my set up (separate objdir, DEBUG=1) tip perf doesn't build without this change. It may be that in some other setups
asm/bug.his implicitely included.
Doesn't matter, as there is usage of something defined in that header, so we must have it included
Thanks, applying your fix, after making it build on acme/perf/core:
[acme@jouet linux]$ patch -p1 < /wb/1.patch
patching file tools/perf/builtin-stat.c
Hunk #1 FAILED at 60.
1 out of 1 hunk FAILED -- saving rejects to file tools/perf/builtin-stat.c.rej [acme@jouet linux]$
Quoted 29 lines
But always include it into
builtin-stat.c
builtin-stat.c: In function ‘set_maps’:
builtin-stat.c:2126:6: error: implicit declaration of function ‘WARN_ONCE’ [-Werror=implicit-function-declaration]
if (WARN_ONCE(st->maps_allocated, "stats double allocation\n"))^builtin-stat.c:2126:2: error: nested extern declaration of ‘WARN_ONCE’ [-Werror=nested-externs]
if (WARN_ONCE(st->maps_allocated, "stats double allocation\n"))
^Signed-off-by Andi Kleen <[email protected]>--- tools/perf/builtin-stat.c | 1 + 1 file changed, 1 insertion(+)tools/perf/builtin-stat.c +1
-0@@ -60,6 +60,7 @@#include "util/thread_map.h" #include "util/counts.h" #include "util/group.h" +#include "asm/bug.h" #include <api/fs/fs.h> #include <stdlib.h> Signature · 1 line
2.5.0
Arnaldo Carvalho de Melo
maintainerEm Wed, Feb 17, 2016 at 03:52:09PM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 5 lines
Em Wed, Feb 17, 2016 at 10:39:08AM -0800, Andi Kleen escreveu:
Quoted 2 lines
In my set up (separate objdir, DEBUG=1) tip perf doesn't build without this change. It may be that in some other setups
asm/bug.his implicitely included.Thanks, applying your fix, after making it build on acme/perf/core:
I take that back, it is already there:
[acme@jouet linux]$ git blame tools/perf/builtin-stat.c | grep -w bug\.hba6039b6c8fcc tools/perf/builtin-stat.c (Jiri Olsa 2015-11-05 15:40:55 +0100 64) #include "asm/bug.h"
[acme@jouet linux]$ git log --oneline -1 ba6039b6c8fcc ba6039b6c8fc perf stat report: Add report command
[acme@jouet linux]$ git tag --contains ba6039b6c8fcc
v4.5-rc1
v4.5-rc2
v4.5-rc3
v4.5-rc4
[acme@jouet linux]$
- Arnaldo
Quoted 8 lines · Arnaldo Carvalho de Melo
Em Wed, Feb 17, 2016 at 03:52:09PM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 5 lines
Em Wed, Feb 17, 2016 at 10:39:08AM -0800, Andi Kleen escreveu:
Quoted 2 lines
In my set up (separate objdir, DEBUG=1) tip perf doesn't build without this change. It may be that in some other setups
asm/bug.his implicitely included.Thanks, applying your fix, after making it build on acme/perf/core:
I take that back, it is already there:
Ok, but not in tip/perf/core. Can you push it there please?
-Andi
Arnaldo Carvalho de Melo
maintainerEm Wed, Feb 17, 2016 at 08:15:35PM +0100, Andi Kleen escreveu:
Quoted 11 lines · Arnaldo Carvalho de Melo
Quoted 8 lines
Em Wed, Feb 17, 2016 at 03:52:09PM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 5 lines
Em Wed, Feb 17, 2016 at 10:39:08AM -0800, Andi Kleen escreveu:
Quoted 2 lines
In my set up (separate objdir, DEBUG=1) tip perf doesn't build without this change. It may be that in some other setups
asm/bug.his implicitely included.Thanks, applying your fix, after making it build on acme/perf/core:
I take that back, it is already there:
Ok, but not in tip/perf/core. Can you push it there please?
Huh? I can't, this is not my tree, its Ingo's. But lemme check there...
[acme@jouet linux]$ git remote update tip
Fetching tip
remote: Counting objects: 13, done.
remote: Compressing objects: 100% (13/13), done.
remote: Total 13 (delta 11), reused 0 (delta 0)
Unpacking objects: 100% (13/13), done.
Quoted 1 line
From
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
5eaa0c926246..d7c926f699aa master -> tip/master
+ e2c90dd7e11e...65c23c65bee4 x86/efi -> tip/x86/efi (forced update)
605a46ee8353..8f8e2aec9944 x86/platform -> tip/x86/platform
[acme@jouet linux]$ git checkout -b aktest tip/perf/core Branch aktest set up to track remote branch perf/core from tip. Switched to a new branch 'aktest'
[acme@jouet linux]$ git blame tools/perf/builtin-stat.c | grep -w bug\.hba6039b6c8fcc tools/perf/builtin-stat.c (Jiri Olsa 2015-11-05 15:40:55 +0100 64) #include "asm/bug.h"
[acme@jouet linux]$ git remote -v | grep tip
tip git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git (fetch)
tip git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git (push)
[acme@jouet linux]$
Quoted 7 lines · Arnaldo Carvalho de Melo
Em Wed, Feb 17, 2016 at 08:15:35PM +0100, Andi Kleen escreveu:
Quoted 6 lines · Arnaldo Carvalho de Melo
Quoted 5 lines
Em Wed, Feb 17, 2016 at 03:52:09PM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 3 lines
Em Wed, Feb 17, 2016 at 10:39:08AM -0800, Andi Kleen escreveu:
Quoted 2 lines
In my set up (separate objdir, DEBUG=1) tip perf doesn't build without this change. It may be that in some other setups
asm/bug.his implicitely included.
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
Quoted 1 line
Thanks, applying your fix, after making it build on acme/perf/core:
I take that back, it is already there:
Ok, but not in tip/perf/core. Can you push it there please?
Huh? I can't, this is not my tree, its Ingo's. But lemme check there...
Never mind. Ended up being a local problem. Thanks for checking.
-Andi