kdump-linux-header-fixes-20001201

[openafs.git] / src / venus / kdump.c

diff --git a/src/venus/kdump.c b/src/venus/kdump.c
index 42026b3..54d4e98 100644 (file)
--- a/src/venus/kdump.c
+++ b/src/venus/kdump.c
@@ -1,8 +1,16 @@
 /*
- * Copyright (C)  1999  Transarc Corporation.  All rights reserved.
- *
+ * Copyright 2000, International Business Machines Corporation and others.
+ * All Rights Reserved.
+ * 
+ * This software has been released under the terms of the IBM Public
+ * License.  For details, see the LICENSE file in the top-level source
+ * directory or online at http://www.openafs.org/dl/license10.html
  */
 
+#include <stdio.h>
+#include <stdlib.h>    /* for malloc() */
+#include <string.h>
+
 #ifdef __linux__
 #define _CFS_HEADER_
 #define _AFFS_FS_I
@@ -30,7 +38,10 @@ struct ntfs_inode_info{};
 #define u32 unsigned int
 #define s32 int
 #define u16 unsigned short
+#include <features.h>
+#if __GLIBC_MINOR__ >= 2
 #define _SYS_TYPES_H
+#endif
 #define __KERNEL__
 #endif
 
@@ -39,10 +50,6 @@ struct ntfs_inode_info{};
 
 #include <afs/param.h>
 
-#include <stdio.h>
-#include <stdlib.h>    /* for malloc() */
-#include <string.h>
-
 /*
  * Need to include <netdb.h> before _KERNEL is defined since on IRIX 6.5
  * <netdb.h> includes <netinet/in.h>, which in turn declares inet_addr()
@@ -2419,8 +2426,13 @@ void print_vnode(kmem, vep, ptr, pnt)
           vep->i_nrpages);
     printf("\ti_op=0x%x, i_dev=0x%x, i_rdev=0x%x, i_sb=0x%x\n",
           vep->i_op, vep->i_dev, vep->i_rdev, vep->i_sb);
+#ifdef AFS_LINUX24_ENV
+    printf("\ti_sem: count=%d, sleepers=%d, wait=0x%x\n",
+          vep->i_sem.count, vep->i_sem.sleepers, vep->i_sem.wait);
+#else
     printf("\ti_sem: count=%d, waking=%d, wait=0x%x\n",
           vep->i_sem.count, vep->i_sem.waking, vep->i_sem.wait);
+#endif
     printf("\ti_hash=0x%x:0x%x, i_list=0x%x:0x%x, i_dentry=0x%x:0x%x\n",
           vep->i_hash.prev, vep->i_hash.next,
           vep->i_list.prev, vep->i_list.next,