From: Irina Tirdea <irina.tirdea@gmail.com>
To: mingo@redhat.com, acme@ghostprotocols.net,
a.p.zijlstra@chello.nl, rostedt@goodmis.org
Cc: paulus@samba.org, dsahern@gmail.com, namhyung.kim@lge.com,
linux-kernel@vger.kernel.org,
Irina Tirdea <irina.tirdea@intel.com>
Subject: [PATCH v2 01/12] perf tools: include wrapper for magic.h
Date: Sat, 8 Sep 2012 03:43:13 +0300 [thread overview]
Message-ID: <1347065004-15306-2-git-send-email-irina.tirdea@intel.com> (raw)
In-Reply-To: <1347065004-15306-1-git-send-email-irina.tirdea@intel.com>
From: Irina Tirdea <irina.tirdea@intel.com>
perf is currently including magic.h directly from the kernel. If the glibc
magic.h is also included, this leads to warnings that the constants are
redefined. This happens on some systems (e.g. Android).
Redefinition errors on Android:
In file included from util/util.h:79:0,
from util/cache.h:5,
from util/abspath.c:1:
util/../../../include/linux/magic.h:5:0:
error: "AFFS_SUPER_MAGIC" redefined [-Werror]
bionic/libc/include/sys/vfs.h:53:0:
note: this is the location of the previous definition
util/../../../include/linux/magic.h:19:0:
error: "EFS_SUPER_MAGIC" redefined [-Werror]
bionic/libc/include/sys/vfs.h:61:0:
note: this is the location of the previous definition
util/../../../include/linux/magic.h:26:0:
error: "HPFS_SUPER_MAGIC" redefined [-Werror]
bionic/libc/include/sys/vfs.h:67:0:
note: this is the location of the previous definition
Only two constants from magic.h are used by perf (DEBUGFS_MAGIC and
SYSFS_MAGIC). This fix provides a wrapper for magic.h that includes only
these constants instead of including the kernel header file directly.
Signed-off-by: Irina Tirdea <irina.tirdea@intel.com>
---
tools/perf/Makefile | 1 +
tools/perf/util/include/linux/magic.h | 12 ++++++++++++
tools/perf/util/util.h | 2 +-
3 files changed, 14 insertions(+), 1 deletion(-)
create mode 100644 tools/perf/util/include/linux/magic.h
diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index afd5075..25d2bab 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -264,6 +264,7 @@ LIB_H += util/include/linux/ctype.h
LIB_H += util/include/linux/kernel.h
LIB_H += util/include/linux/list.h
LIB_H += util/include/linux/export.h
+LIB_H += util/include/linux/magic.h
LIB_H += util/include/linux/poison.h
LIB_H += util/include/linux/prefetch.h
LIB_H += util/include/linux/rbtree.h
diff --git a/tools/perf/util/include/linux/magic.h b/tools/perf/util/include/linux/magic.h
new file mode 100644
index 0000000..58b64ed
--- /dev/null
+++ b/tools/perf/util/include/linux/magic.h
@@ -0,0 +1,12 @@
+#ifndef _PERF_LINUX_MAGIC_H_
+#define _PERF_LINUX_MAGIC_H_
+
+#ifndef DEBUGFS_MAGIC
+#define DEBUGFS_MAGIC 0x64626720
+#endif
+
+#ifndef SYSFS_MAGIC
+#define SYSFS_MAGIC 0x62656572
+#endif
+
+#endif
diff --git a/tools/perf/util/util.h b/tools/perf/util/util.h
index 67a3713..70fa70b 100644
--- a/tools/perf/util/util.h
+++ b/tools/perf/util/util.h
@@ -70,7 +70,7 @@
#include <sys/socket.h>
#include <sys/ioctl.h>
#include <inttypes.h>
-#include "../../../include/linux/magic.h"
+#include <linux/magic.h>
#include "types.h"
#include <sys/ttydefaults.h>
--
1.7.9.5
next prev parent reply other threads:[~2012-09-08 0:46 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-08 0:43 [PATCH v2 00/12] Porting perf to Android Irina Tirdea
2012-09-08 0:43 ` Irina Tirdea [this message]
2012-09-08 9:13 ` [PATCH v2 01/12] perf tools: include wrapper for magic.h Pekka Enberg
2012-09-08 22:39 ` Irina Tirdea
2012-09-08 0:43 ` [PATCH v2 02/12] perf tools: update types definitions for Android Irina Tirdea
2012-09-08 0:43 ` [PATCH v2 03/12] perf tools: include __WORDSIZE definition Irina Tirdea
2012-09-08 9:07 ` Pekka Enberg
2012-09-08 22:19 ` Irina Tirdea
2012-09-10 14:44 ` Peter Zijlstra
2012-09-10 21:42 ` Irina Tirdea
2012-09-08 0:43 ` [PATCH v2 04/12] perf tools: fix ALIGN redefinition in system headers Irina Tirdea
2012-09-08 0:43 ` [PATCH v2 05/12] perf tools: include basename for non-glibc systems Irina Tirdea
2012-09-08 9:09 ` Pekka Enberg
2012-09-08 14:33 ` David Ahern
2012-09-08 11:43 ` [tip:perf/core] " tip-bot for Irina Tirdea
2012-09-08 0:43 ` [PATCH v2 06/12] perf tools: fix missing winsize definition Irina Tirdea
2012-09-08 11:44 ` [tip:perf/core] " tip-bot for Irina Tirdea
2012-09-08 0:43 ` [PATCH v2 07/12] perf tools: include missing pthread.h header Irina Tirdea
2012-09-08 11:45 ` [tip:perf/core] " tip-bot for Irina Tirdea
2012-09-08 0:43 ` [PATCH v2 08/12] perf tools: fix no return in non-void function Irina Tirdea
2012-09-08 0:43 ` [PATCH v2 09/12] perf tools: replace mkostemp with mkstemp Irina Tirdea
2012-09-08 11:46 ` [tip:perf/core] " tip-bot for Irina Tirdea
2012-09-08 0:43 ` [PATCH v2 10/12] tools lib traceevent: replace mempcpy with memcpy Irina Tirdea
2012-09-08 11:47 ` [tip:perf/core] " tip-bot for Irina Tirdea
2012-09-08 0:43 ` [PATCH v2 11/12] perf tools: add NO_BACKTRACE for application self-debugging Irina Tirdea
2012-09-08 11:48 ` [tip:perf/core] " tip-bot for Irina Tirdea
2012-09-08 0:43 ` [PATCH v2 12/12] perf tools: Use __maybe_used for unused variables Irina Tirdea
2012-09-08 1:14 ` [PATCH v2 00/12] Porting perf to Android Arnaldo Carvalho de Melo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1347065004-15306-2-git-send-email-irina.tirdea@intel.com \
--to=irina.tirdea@gmail.com \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@ghostprotocols.net \
--cc=dsahern@gmail.com \
--cc=irina.tirdea@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=namhyung.kim@lge.com \
--cc=paulus@samba.org \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome