Build fix for recent FreeBSD -current

r273707 added a flags argument to syscall_register(), so
add the appropriate version check in param.generic_fbsd.h
and ues that in the main code.

Change-Id: I7ddf6e1295d7ed94625f19fdeee4e38ef5fd511e
Reviewed-on: http://gerrit.openafs.org/11565
Tested-by: Benjamin Kaduk <kaduk@mit.edu>
Reviewed-by: D Brashear <shadow@your-file-system.com>

diff --git a/src/afs/FBSD/osi_vfsops.c b/src/afs/FBSD/osi_vfsops.c
index 54d33668ce653e81e64de762f80d693c9d693138..5b3f33b78e02be8b52f150d3b5ac8570aa8f0968 100644 (file)
--- a/src/afs/FBSD/osi_vfsops.c
+++ b/src/afs/FBSD/osi_vfsops.c
@@ -49,7 +49,11 @@ afs_init(struct vfsconf *vfc)
     int code;
     int offset = AFS_SYSCALL;
 #if defined(AFS_FBSD90_ENV) || defined(AFS_FBSD82_ENV)
+# if defined(FBSD_SYSCALL_REGISTER_FOUR_ARGS)
+    code = syscall_register(&offset, &afs_sysent, &old_sysent, 0);
+# else
     code = syscall_register(&offset, &afs_sysent, &old_sysent);
+# endif
     if (code) {
        printf("AFS_SYSCALL in use, error %i. aborting\n", code);
        return code;

diff --git a/src/config/param.generic_fbsd.h b/src/config/param.generic_fbsd.h
index 4d47118893f8eb618f6121e651cb27df3b6b98e8..f8bea607abe93bb70c24f7d5194d403182b69e68 100644 (file)
--- a/src/config/param.generic_fbsd.h
+++ b/src/config/param.generic_fbsd.h
@@ -122,6 +122,11 @@ enum vcexcl { NONEXCL, EXCL };
 #define FBSD_IFA_IFWITHNET_THREE_ARGS
 #endif
 
+/* r273707 added a flags argument to syscall_register() */
+#if __FreeBSD_version >= 1100041
+#define FBSD_SYSCALL_REGISTER_FOUR_ARGS
+#endif
+
 #else /* !defined(UKERNEL) */
 
 /* This section for user space compiles only */