From f39dd54e11dff5e2b4da3eec419ae7c0825c210f Mon Sep 17 00:00:00 2001 From: Benjamin Kaduk Date: Thu, 30 Oct 2014 19:51:29 -0400 Subject: [PATCH] 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 Reviewed-by: D Brashear --- src/afs/FBSD/osi_vfsops.c | 4 ++++ src/config/param.generic_fbsd.h | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/src/afs/FBSD/osi_vfsops.c b/src/afs/FBSD/osi_vfsops.c index 54d33668c..5b3f33b78 100644 --- 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 4d4711889..f8bea607a 100644 --- 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 */ -- 2.39.5