summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrédéric VANNIÈRE <[email protected]>2015-07-28 14:42:14 +0200
committerBrian Behlendorf <[email protected]>2015-07-29 07:35:06 -0700
commitc1718e9580b9b6222be19c1691d3d7b61e503754 (patch)
tree456bccbc38b83df4ad4dd84251f157cc080440ee
parent1229323d5f82bcb0525b312c80330968cd41466e (diff)
Fix build failure with Linux 4.1 and FTRACE
Signed-off-by: Frédéric VANNIÈRE <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Closes #3546
-rw-r--r--include/sys/trace_acl.h3
-rw-r--r--include/sys/trace_arc.h3
-rw-r--r--include/sys/trace_dbuf.h3
-rw-r--r--include/sys/trace_dmu.h3
-rw-r--r--include/sys/trace_dnode.h3
-rw-r--r--include/sys/trace_txg.h3
-rw-r--r--include/sys/trace_zil.h3
-rw-r--r--include/sys/trace_zrlock.h3
8 files changed, 24 insertions, 0 deletions
diff --git a/include/sys/trace_acl.h b/include/sys/trace_acl.h
index 780a131da..b94cb79c6 100644
--- a/include/sys/trace_acl.h
+++ b/include/sys/trace_acl.h
@@ -24,6 +24,9 @@
#undef TRACE_SYSTEM
#define TRACE_SYSTEM zfs
+#undef TRACE_SYSTEM_VAR
+#define TRACE_SYSTEM_VAR zfs_acl
+
#if !defined(_TRACE_ACL_H) || defined(TRACE_HEADER_MULTI_READ)
#define _TRACE_ACL_H
diff --git a/include/sys/trace_arc.h b/include/sys/trace_arc.h
index 5d180b1d5..31c3cdcb9 100644
--- a/include/sys/trace_arc.h
+++ b/include/sys/trace_arc.h
@@ -26,6 +26,9 @@
#undef TRACE_SYSTEM
#define TRACE_SYSTEM zfs
+#undef TRACE_SYSTEM_VAR
+#define TRACE_SYSTEM_VAR zfs_arc
+
#if !defined(_TRACE_ARC_H) || defined(TRACE_HEADER_MULTI_READ)
#define _TRACE_ARC_H
diff --git a/include/sys/trace_dbuf.h b/include/sys/trace_dbuf.h
index 34bc74e1e..49e35e3dc 100644
--- a/include/sys/trace_dbuf.h
+++ b/include/sys/trace_dbuf.h
@@ -24,6 +24,9 @@
#undef TRACE_SYSTEM
#define TRACE_SYSTEM zfs
+#undef TRACE_SYSTEM_VAR
+#define TRACE_SYSTEM_VAR zfs_dbuf
+
#if !defined(_TRACE_DBUF_H) || defined(TRACE_HEADER_MULTI_READ)
#define _TRACE_DBUF_H
diff --git a/include/sys/trace_dmu.h b/include/sys/trace_dmu.h
index 154e32096..e070997bc 100644
--- a/include/sys/trace_dmu.h
+++ b/include/sys/trace_dmu.h
@@ -24,6 +24,9 @@
#undef TRACE_SYSTEM
#define TRACE_SYSTEM zfs
+#undef TRACE_SYSTEM_VAR
+#define TRACE_SYSTEM_VAR zfs_dmu
+
#if !defined(_TRACE_DMU_H) || defined(TRACE_HEADER_MULTI_READ)
#define _TRACE_DMU_H
diff --git a/include/sys/trace_dnode.h b/include/sys/trace_dnode.h
index 2f874d596..ee63c29cd 100644
--- a/include/sys/trace_dnode.h
+++ b/include/sys/trace_dnode.h
@@ -24,6 +24,9 @@
#undef TRACE_SYSTEM
#define TRACE_SYSTEM zfs
+#undef TRACE_SYSTEM_VAR
+#define TRACE_SYSTEM_VAR zfs_dnode
+
#if !defined(_TRACE_DNODE_H) || defined(TRACE_HEADER_MULTI_READ)
#define _TRACE_DNODE_H
diff --git a/include/sys/trace_txg.h b/include/sys/trace_txg.h
index e977b25a8..61d650984 100644
--- a/include/sys/trace_txg.h
+++ b/include/sys/trace_txg.h
@@ -24,6 +24,9 @@
#undef TRACE_SYSTEM
#define TRACE_SYSTEM zfs
+#undef TRACE_SYSTEM_VAR
+#define TRACE_SYSTEM_VAR zfs_txg
+
#if !defined(_TRACE_TXG_H) || defined(TRACE_HEADER_MULTI_READ)
#define _TRACE_TXG_H
diff --git a/include/sys/trace_zil.h b/include/sys/trace_zil.h
index 3ff68fb2a..e97466fde 100644
--- a/include/sys/trace_zil.h
+++ b/include/sys/trace_zil.h
@@ -24,6 +24,9 @@
#undef TRACE_SYSTEM
#define TRACE_SYSTEM zfs
+#undef TRACE_SYSTEM_VAR
+#define TRACE_SYSTEM_VAR zfs_zil
+
#if !defined(_TRACE_ZIL_H) || defined(TRACE_HEADER_MULTI_READ)
#define _TRACE_ZIL_H
diff --git a/include/sys/trace_zrlock.h b/include/sys/trace_zrlock.h
index 8c811c2aa..e1399c468 100644
--- a/include/sys/trace_zrlock.h
+++ b/include/sys/trace_zrlock.h
@@ -24,6 +24,9 @@
#undef TRACE_SYSTEM
#define TRACE_SYSTEM zfs
+#undef TRACE_SYSTEM_VAR
+#define TRACE_SYSTEM_VAR zfs_zrlock
+
#if !defined(_TRACE_ZRLOCK_H) || defined(TRACE_HEADER_MULTI_READ)
#define _TRACE_ZRLOCK_H