From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S933558AbbIVNyD (ORCPT <rfc822;w@1wt.eu>);
	Tue, 22 Sep 2015 09:54:03 -0400
Received: from mx1.redhat.com ([209.132.183.28]:46569 "EHLO mx1.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S933428AbbIVNx5 (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Tue, 22 Sep 2015 09:53:57 -0400
Date: Tue, 22 Sep 2015 10:53:52 -0300
From: Arnaldo Carvalho de Melo <acme@redhat.com>
To: Vinson Lee <vlee@twopensource.com>
Cc: rostedt@goodmis.org, Jiri Olsa <jolsa@kernel.org>,
        matt@codeblueprint.co.uk, raphael.beamonte@gmail.com,
        "H. Peter Anvin" <hpa@zytor.com>, LKML <linux-kernel@vger.kernel.org>,
        Peter Zijlstra <a.p.zijlstra@chello.nl>,
        David Ahern <dsahern@gmail.com>, Ingo Molnar <mingo@kernel.org>,
        Thomas Gleixner <tglx@linutronix.de>,
        Namhyung Kim <namhyung@kernel.org>, linux-tip-commits@vger.kernel.org,
        acme@kernel.org
Subject: Re: [tip:perf/core] tools lib api fs: Remove debugfs, tracefs and
 findfs objects
Message-ID: <20150922135352.GB2580@redhat.com>
References: <1441180605-24737-15-git-send-email-jolsa@kernel.org>
 <tip-60a1133a5b39738671eff1e4d77bedc1ee3fa528@git.kernel.org>
 <CAHTgTXWYbtd8B77dva2K=dHS1t-8nV7TtaEpoZFY87Q9XGTfBQ@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <CAHTgTXWYbtd8B77dva2K=dHS1t-8nV7TtaEpoZFY87Q9XGTfBQ@mail.gmail.com>
X-Url: http://acmel.wordpress.com
User-Agent: Mutt/1.5.20 (2009-12-10)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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@zytor.com> wrote:
> > Commit-ID:  60a1133a5b39738671eff1e4d77bedc1ee3fa528
> > Gitweb:     http://git.kernel.org/tip/60a1133a5b39738671eff1e4d77bedc1ee3fa528
> > Author:     Jiri Olsa <jolsa@kernel.org>
> > AuthorDate: Wed, 2 Sep 2015 09:56:44 +0200
> > Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
> > 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@kernel.org>
> > Cc: David Ahern <dsahern@gmail.com>
> > Cc: Matt Fleming <matt@codeblueprint.co.uk>
> > Cc: Namhyung Kim <namhyung@kernel.org>
> > Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
> > Cc: Raphael Beamonte <raphael.beamonte@gmail.com>
> > Cc: Steven Rostedt <rostedt@goodmis.org>
> > Link: http://lkml.kernel.org/r/1441180605-24737-15-git-send-email-jolsa@kernel.org
> > Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
> 
> 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);