summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhunt <hunt>2007-04-27 14:47:53 +0000
committerhunt <hunt>2007-04-27 14:47:53 +0000
commit7a5a1efc5bfad6a773e29efe362d10649d583436 (patch)
tree477e0da00452232317874deac557eb9ae19ee020
parent6f5ce62109a76cea4020c9783980999927fe3fa4 (diff)
downloadsystemtap-steved-7a5a1efc5bfad6a773e29efe362d10649d583436.tar.gz
systemtap-steved-7a5a1efc5bfad6a773e29efe362d10649d583436.tar.xz
systemtap-steved-7a5a1efc5bfad6a773e29efe362d10649d583436.zip
2007-04-27 Martin Hunt <hunt@redhat.com>
* runtime.h: Improve check for debugfs in kernel.
-rw-r--r--runtime/ChangeLog4
-rw-r--r--runtime/runtime.h8
2 files changed, 10 insertions, 2 deletions
diff --git a/runtime/ChangeLog b/runtime/ChangeLog
index ca92880b..f7b7e84d 100644
--- a/runtime/ChangeLog
+++ b/runtime/ChangeLog
@@ -1,3 +1,7 @@
+2007-04-27 Martin Hunt <hunt@redhat.com>
+
+ * runtime.h: Improve check for debugfs in kernel.
+
2007-04-27 Frank Ch. Eigler <fche@elastic.org>
* autoconf-inode-private.c: New file from hunt.
diff --git a/runtime/runtime.h b/runtime/runtime.h
index 6fa168dc..756f8607 100644
--- a/runtime/runtime.h
+++ b/runtime/runtime.h
@@ -30,8 +30,12 @@
#include <linux/compat.h>
#include <linux/mm.h>
-/* the new transport requires debugfs and a newer relayfs */
-#if !defined (CONFIG_DEBUG_FS) || (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15))
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
+#if !defined (CONFIG_DEBUG_FS) && !defined (CONFIG_DEBUG_FS_MODULE)
+#error "DebugFS is required and was not found in the kernel."
+#endif
+#else
+/* older kernels have no debugfs and older version of relayfs. */
#define STP_OLD_TRANSPORT
#endif