linux26-i-security-20040621

[openafs.git] / src / afs / sysincludes.h

diff --git a/src/afs/sysincludes.h b/src/afs/sysincludes.h
index e9489fb..c87b2a9 100644 (file)
--- a/src/afs/sysincludes.h
+++ b/src/afs/sysincludes.h
@@ -60,6 +60,15 @@
 #include <linux/net.h>
 #include <linux/kdev_t.h>
 #include <linux/ioctl.h>
+#if defined(AFS_LINUX26_ENV)
+#include <linux/backing-dev.h>
+#include <linux/pagemap.h>
+#include <linux/namei.h>
+#ifdef STRUCT_INODE_HAS_I_SECURITY
+#include <linux/security.h>
+#endif
+#include <linux/suspend.h>
+#endif
 /* Avoid conflicts with coda overloading AFS type namespace. Must precede
  * inclusion of uaccess.h.
  */
@@ -239,6 +248,10 @@ struct vfspage;                    /* for vnode.h compiler warnings */
 #ifdef AFS_HPUX110_ENV
 #    include "h/resource.h"
 #endif
+#ifdef AFS_HPUX1123_ENV 
+#      include <sys/user.h>
+#      include <sys/cred.h>
+#endif
 #  endif /* AFS_HPUX_ENV */
 #if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)
 #  if defined(AFS_FBSD50_ENV)
@@ -311,7 +324,7 @@ MALLOC_DECLARE(M_AFS);
 #include "h/ioctl.h"
 #endif /* AFS_FBSD_ENV */
 
-#if    defined(AFS_HPUX101_ENV)
+#if    defined(AFS_HPUX101_ENV) && !defined(AFS_HPUX1123_ENV)
 #include "h/proc_iface.h"
 #include "h/vas.h"
 #endif