On Tue, Sep 22, 2015 at 6:53 AM, Arnaldo Carvalho de Melo
<acme@xxxxxxxxxx> wrote:
> Em Mon, Sep 21, 2015 at 05:20:03PM -0700, Vinson Lee escreveu:
>> On Mon, Sep 14, 2015 at 11:59 PM, tip-bot for Jiri Olsa
>> <tipbot@xxxxxxxxx> wrote:
>> > Commit-ID: 60a1133a5b39738671eff1e4d77bedc1ee3fa528
>> > Gitweb: http://git.kernel.org/tip/60a1133a5b39738671eff1e4d77bedc1ee3fa528
>> > Author: Jiri Olsa <jolsa@xxxxxxxxxx>
>> > AuthorDate: Wed, 2 Sep 2015 09:56:44 +0200
>> > Committer: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
>> > CommitDate: Mon, 14 Sep 2015 12:50:15 -0300
>> >
>> > tools lib api fs: Remove debugfs, tracefs and findfs objects
>> >
>> > We have all the functionality in fs.c, let's remove unneeded
>> > objects.
>> >
>> > Signed-off-by: Jiri Olsa <jolsa@xxxxxxxxxx>
>> > Cc: David Ahern <dsahern@xxxxxxxxx>
>> > Cc: Matt Fleming <matt@xxxxxxxxxxxxxxxxxxx>
>> > Cc: Namhyung Kim <namhyung@xxxxxxxxxx>
>> > Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
>> > Cc: Raphael Beamonte <raphael.beamonte@xxxxxxxxx>
>> > Cc: Steven Rostedt <rostedt@xxxxxxxxxxx>
>> > Link: http://lkml.kernel.org/r/1441180605-24737-15-git-send-email-jolsa@xxxxxxxxxx
>> > Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
>>
>> Hi.
>>
>> This commit seems to have introduced a build failure with tools/vm.
>>
>> $ make -C tools vm
>> [...]
>> gcc -Wall -Wextra -I../lib/ -o page-types page-types.c ../lib/api/libapi.a
>> page-types.c:45:28: fatal error: api/fs/debugfs.h: No such file or directory
>> #include <api/fs/debugfs.h>
>
> Can you please check if this solves the problem?
>
> - Arnaldo
>
> 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 @@
> #include <sys/mman.h>
> #include "../../include/uapi/linux/magic.h"
> #include "../../include/uapi/linux/kernel-page-flags.h"
> -#include <api/fs/debugfs.h>
> +#include <api/fs/fs.h>
>
> #ifndef MAX_PATH
> # define MAX_PATH 256
> @@ -188,7 +188,7 @@ static int kpageflags_fd;
> static int opt_hwpoison;
> static int opt_unpoison;
>
> -static char *hwpoison_debug_fs;
> +static const char *hwpoison_debug_fs;
> static int hwpoison_inject_fd;
> static int hwpoison_forget_fd;
>
> @@ -487,7 +487,7 @@ static void prepare_hwpoison_fd(void)
> {
> char buf[MAX_PATH + 1];
>
> - hwpoison_debug_fs = debugfs_mount(NULL);
> + hwpoison_debug_fs = debugfs__mount();
> if (!hwpoison_debug_fs) {
> perror("mount debugfs");
> exit(EXIT_FAILURE);
Yes, this patch fixes the build for me.
Vinson
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|