hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: 60a1133a5b ("tools lib api fs: Remove debugfs, tracefs and findfs objects")
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo 2015-09-22 13:13:04 -03:00
parent 96d8bf75da
commit f6489bc2d4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/vm/page-types.c
View File

@ -42,7 +42,7 @@
#include <sys/mman.h> #include <sys/mman.h>
#include "../../include/uapi/linux/magic.h" #include "../../include/uapi/linux/magic.h"
#include "../../include/uapi/linux/kernel-page-flags.h" #include "../../include/uapi/linux/kernel-page-flags.h"
#include <api/fs/debugfs.h> #include <api/fs/fs.h>
#ifndef MAX_PATH #ifndef MAX_PATH
# define MAX_PATH 256 # define MAX_PATH 256
@ -188,7 +188,7 @@ static int kpageflags_fd;
static int opt_hwpoison; static int opt_hwpoison;
static int opt_unpoison; static int opt_unpoison;
static char *hwpoison_debug_fs; static const char *hwpoison_debug_fs;
static int hwpoison_inject_fd; static int hwpoison_inject_fd;
static int hwpoison_forget_fd; static int hwpoison_forget_fd;
@ -487,7 +487,7 @@ static void prepare_hwpoison_fd(void)
{ {
char buf[MAX_PATH + 1]; char buf[MAX_PATH + 1];
hwpoison_debug_fs = debugfs_mount(NULL); hwpoison_debug_fs = debugfs__mount();
if (!hwpoison_debug_fs) { if (!hwpoison_debug_fs) {
perror("mount debugfs"); perror("mount debugfs");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);