From cb0581f1a0c4a3260fffaa1ba3940d5dbc84107f Mon Sep 17 00:00:00 2001
From: ericm <ericm>
Date: Wed, 3 Sep 2003 16:21:34 +0000
Subject: [PATCH] revert the last fix for cygwin, which make ogdb-uml always
 null.

---
 lnet/utils/debug.c           | 11 -----------
 lustre/portals/utils/debug.c | 11 -----------
 2 files changed, 22 deletions(-)

diff --git a/lnet/utils/debug.c b/lnet/utils/debug.c
index e44d92a..a2a8e77 100644
--- a/lnet/utils/debug.c
+++ b/lnet/utils/debug.c
@@ -41,14 +41,12 @@
 #include <sys/stat.h>
 #include <sys/mman.h>
 
-#ifdef __KERNEL__
 #define BUG()                            /* workaround for module.h includes */
 #include <linux/version.h>
 
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
 #include <linux/module.h>
 #endif
-#endif /* __KERNEL__ */
 
 #include <portals/api-support.h>
 #include <portals/ptlctl.h>
@@ -524,8 +522,6 @@ int jt_dbg_mark_debug_buf(int argc, char **argv)
         return 0;
 }
 
-#ifdef __KERNEL__
-
 int jt_dbg_modules(int argc, char **argv)
 {
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
@@ -596,13 +592,6 @@ int jt_dbg_modules(int argc, char **argv)
 #endif /* linux 2.5 */
 }
 
-#else
-int jt_dbg_modules(int argc, char **argv)
-{
-        return -1;
-}
-#endif /* __KERNEL__ */
-
 int jt_dbg_panic(int argc, char **argv)
 {
         int rc;
diff --git a/lustre/portals/utils/debug.c b/lustre/portals/utils/debug.c
index e44d92a..a2a8e77 100644
--- a/lustre/portals/utils/debug.c
+++ b/lustre/portals/utils/debug.c
@@ -41,14 +41,12 @@
 #include <sys/stat.h>
 #include <sys/mman.h>
 
-#ifdef __KERNEL__
 #define BUG()                            /* workaround for module.h includes */
 #include <linux/version.h>
 
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
 #include <linux/module.h>
 #endif
-#endif /* __KERNEL__ */
 
 #include <portals/api-support.h>
 #include <portals/ptlctl.h>
@@ -524,8 +522,6 @@ int jt_dbg_mark_debug_buf(int argc, char **argv)
         return 0;
 }
 
-#ifdef __KERNEL__
-
 int jt_dbg_modules(int argc, char **argv)
 {
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
@@ -596,13 +592,6 @@ int jt_dbg_modules(int argc, char **argv)
 #endif /* linux 2.5 */
 }
 
-#else
-int jt_dbg_modules(int argc, char **argv)
-{
-        return -1;
-}
-#endif /* __KERNEL__ */
-
 int jt_dbg_panic(int argc, char **argv)
 {
         int rc;
-- 
1.8.3.1