2007-04-27 Martin Hunt <hunt@redhat.com>

	* runtime.h: Improve check for debugfs in kernel.

diff --git a/runtime/ChangeLog b/runtime/ChangeLog
index ca92880b136290f6bb09d48e39e16678fec6fb19..f7b7e84d49da71aac16451c7c7d9ab33ab4254ea 100644 (file)
--- 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 6fa168dc4b31a82d266e12308affe4f800776253..756f8607ead4892e1199ad6960cf500e67b5c427 100644 (file)
--- 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