diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2015-09-22 12:13:04 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2015-09-22 21:42:39 -0400 |
commit | f6489bc2d402c0db84aa64f13b864d17f7eecb07 (patch) | |
tree | 69c544b848473097b5c58b76fdf33206e146f049 /tools/vm | |
parent | 96d8bf75da12df17f2c861043158dad2dabfe491 (diff) |
tools vm: Fix build due to removal of tools/lib/api/fs/debugfs.h
There were some changes in how this debugfs mounting helper is
implemented/exported and we forgot to check if there were other users
besides perf, fix it.
Need to do a make -C tools/ everytime we do changes to
tools/{lib,include} and other places where we're moving things from
tools/perf/ to be used by other tools/ living code.
Fixed:
$ make -C tools/vm
make: Entering directory '/home/git/linux/tools/vm'
make -C ../lib/api
make[1]: Entering directory '/home/git/linux/tools/lib/api'
CC fd/array.o
LD fd/libapi-in.o
CC fs/fs.o
CC fs/tracing_path.o
LD fs/libapi-in.o
CC cpu.o
LD libapi-in.o
AR libapi.a
make[1]: Leaving directory '/home/git/linux/tools/lib/api'
gcc -Wall -Wextra -I../lib/ -o page-types page-types.c ../lib/api/libapi.a
make: Leaving directory '/home/git/linux/tools/vm'
$
Reported-by: Vinson Lee <vlee@twopensource.com>
Tested-by: Vinson Lee <vlee@twopensource.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Matt Fleming <matt@codeblueprint.co.uk>
Cc: Raphael Beamonte <raphael.beamonte@gmail.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: David Ahern <dsahern@gmail.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Namhyung Kim <namhyung@kernel.org>
Fixes: 60a1133a5b39 ("tools lib api fs: Remove debugfs, tracefs and findfs objects")
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/vm')
-rw-r--r-- | tools/vm/page-types.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/vm/page-types.c b/tools/vm/page-types.c index 7f73fa32a590..bcf5ec760eb9 100644 --- a/tools/vm/page-types.c +++ b/tools/vm/page-types.c | |||
@@ -42,7 +42,7 @@ | |||
42 | #include <sys/mman.h> | 42 | #include <sys/mman.h> |
43 | #include "../../include/uapi/linux/magic.h" | 43 | #include "../../include/uapi/linux/magic.h" |
44 | #include "../../include/uapi/linux/kernel-page-flags.h" | 44 | #include "../../include/uapi/linux/kernel-page-flags.h" |
45 | #include <api/fs/debugfs.h> | 45 | #include <api/fs/fs.h> |
46 | 46 | ||
47 | #ifndef MAX_PATH | 47 | #ifndef MAX_PATH |
48 | # define MAX_PATH 256 | 48 | # define MAX_PATH 256 |
@@ -188,7 +188,7 @@ static int kpageflags_fd; | |||
188 | static int opt_hwpoison; | 188 | static int opt_hwpoison; |
189 | static int opt_unpoison; | 189 | static int opt_unpoison; |
190 | 190 | ||
191 | static char *hwpoison_debug_fs; | 191 | static const char *hwpoison_debug_fs; |
192 | static int hwpoison_inject_fd; | 192 | static int hwpoison_inject_fd; |
193 | static int hwpoison_forget_fd; | 193 | static int hwpoison_forget_fd; |
194 | 194 | ||
@@ -487,7 +487,7 @@ static void prepare_hwpoison_fd(void) | |||
487 | { | 487 | { |
488 | char buf[MAX_PATH + 1]; | 488 | char buf[MAX_PATH + 1]; |
489 | 489 | ||
490 | hwpoison_debug_fs = debugfs_mount(NULL); | 490 | hwpoison_debug_fs = debugfs__mount(); |
491 | if (!hwpoison_debug_fs) { | 491 | if (!hwpoison_debug_fs) { |
492 | perror("mount debugfs"); | 492 | perror("mount debugfs"); |
493 | exit(EXIT_FAILURE); | 493 | exit(EXIT_FAILURE); |