Linux: Include linux/uaccess.h rather than asm/uaccess.h if present

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

diff --git a/src/afs/sysincludes.h b/src/afs/sysincludes.h
index 916d02a..629b3e6 100644 (file)
--- a/src/afs/sysincludes.h
+++ b/src/afs/sysincludes.h
@@ -52,6 +52,9 @@
 # include <sys/timeout.h>
 
 #elif defined(AFS_NBSD40_ENV)
+# if defined(AFS_NBSD50_ENV) && !defined(AFS_NBSD70_ENV)
+#  include <sys/simplelock.h>
+# endif
 # include <sys/errno.h>
 # include <sys/types.h>
 # include <sys/mount.h> /* may define MOUNT_AFS */
@@ -82,21 +85,14 @@
 # include <sys/socket.h>
 # include <sys/socketvar.h>
 # include <sys/dirent.h>
-# include <sys/user.h>
 # include <sys/kauth.h>
 # include <sys/uio.h>
 # include <sys/buf.h>
 # include <sys/stat.h>
 # include <sys/file.h>
 # include <sys/namei.h>
-# include <sys/socket.h>
-# include <sys/socketvar.h>
-# include <sys/dirent.h>
-# include <sys/user.h>
-# include <sys/kauth.h>
 # include <sys/uio.h>
 # include <sys/buf.h>
-# include <sys/stat.h>
 # include <sys/file.h>
 # include <sys/namei.h>
 # include <sys/vnode.h>
@@ -106,9 +102,7 @@
 # include <ufs/ufs/extattr.h>
 # include <ufs/ufs/ufsmount.h>
 # ifndef MLEN
-#  if 0
-#   include <sys/mbuf.h>
-#  endif /* 0 */
+#  include <sys/mbuf.h>
 #  include <net/if.h>
 # endif /* !MLEN */
 # include <sys/protosw.h>
@@ -151,15 +145,23 @@ struct coda_inode_info {
 struct xfs_inode_info {
 };
 # endif
-# include <asm/uaccess.h>
+# if defined(HAVE_LINUX_UACCESS_H)
+#  include <linux/uaccess.h>
+# else
+#  include <asm/uaccess.h>
+# endif
 # include <linux/list.h>
 # include <linux/dcache.h>
 # include <linux/mount.h>
 # include <linux/fs.h>
 # include <linux/quota.h>
 # include <linux/sched.h>
+# if defined(HAVE_LINUX_SCHED_SIGNAL_H)
+#  include <linux/sched/signal.h>
+# endif
 # include <linux/mm.h>
 # include <linux/slab.h>
+# include <linux/proc_fs.h>
 # include <linux/string.h>
 # if defined(HAVE_LINUX_SEMAPHORE_H)
 #  include <linux/semaphore.h>
@@ -170,12 +172,13 @@ struct xfs_inode_info {
 #  include <linux/mutex.h>
 # endif
 # include <linux/errno.h>
-# ifdef HAVE_LINUX_COMPLETION_H
-#  include <linux/completion.h>
-# endif
+# include <linux/completion.h>
 # if defined(HAVE_LINUX_EXPORTFS_H)
 #  include <linux/exportfs.h>
 # endif
+# ifdef AFS_LINUX24_ENV
+#  include <linux/pagemap.h>
+# endif
 
 #else /* AFS_LINUX22_ENV */
 # if defined(AFS_DARWIN_ENV)
@@ -204,6 +207,12 @@ typedef unsigned short etap_event_t;
 # include "h/systm.h"
 # include "h/time.h"
 
+# ifdef AFS_FBSD_ENV
+#  include <sys/socket.h>
+#  include <net/if.h>
+#  include <net/if_var.h>
+# endif
+
 # ifdef        AFS_AIX_ENV
 #  ifdef AFS_AIX41_ENV
 #   include "sys/statfs.h"
@@ -266,12 +275,9 @@ typedef unsigned short etap_event_t;
 
 # ifdef        AFS_SUN5_ENV
 #  include <sys/cmn_err.h>     /* for kernel printf() prototype */
-# endif
-
-# if   defined(AFS_SUN56_ENV)
-#  include "h/vfs.h"           /* stops SUN56 socketvar.h warnings */
-#  include "h/stropts.h"               /* stops SUN56 socketvar.h warnings */
-#  include "h/stream.h"                /* stops SUN56 socketvar.h errors */
+#  include "h/vfs.h"           /* stops SUN5 socketvar.h warnings */
+#  include "h/stropts.h"               /* stops SUN5 socketvar.h warnings */
+#  include "h/stream.h"                /* stops SUN5 socketvar.h errors */
 # endif
 
 # ifdef AFS_SUN510_ENV
@@ -284,7 +290,7 @@ typedef unsigned short etap_event_t;
 # include "h/protosw.h"
 
 # if defined(AFS_FBSD_ENV)
-#  include "limits.h"
+#  include "sys/limits.h"
 # endif
 
 # ifdef AFS_HPUX_ENV