Fix build failure with Linux 4.1 and FTRACE

Signed-off-by: Frédéric VANNIÈRE <f.vanniere@planet-work.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #3546

diff --git a/include/sys/trace_acl.h b/include/sys/trace_acl.h
index 780a131da27d223992402b29ae492293e940f874..b94cb79c656a82232268ae3c92192574c861c37f 100644 (file)
--- 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 5d180b1d5f86e00514861909bc21e59995a909f8..31c3cdcb9b21f088e59aff7efbc91939b7f73528 100644 (file)
--- 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 34bc74e1e60d80290534ed92e9261a4b8aec70f3..49e35e3dcbfe2bd32a54deea7480b135d9f9dba2 100644 (file)
--- 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 154e32096c83562c4045dd858a18945814450e49..e070997bca432b9b479144ec67a9ac707e8f62eb 100644 (file)
--- 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 2f874d596fc712486a29f21f2ac5b5671b2d88e6..ee63c29cd119d2d436738496142f2ef34ef610e4 100644 (file)
--- 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 e977b25a8dd66b8a19c9c7f11f8be40caa15922d..61d650984cd349357a4b92bbd45fc2bc89f64c9f 100644 (file)
--- 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 3ff68fb2a82f6355ccbf0202de4ed2d2b6d8a9b5..e97466fde5e3689bcd6ba8760f2e0c16aba6d68a 100644 (file)
--- 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 8c811c2aa0b33781d4a522deb69785518165c910..e1399c468a74ad6e19b8621d14175aa926f4824f 100644 (file)
--- 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