From 30fb2c1484fdfd9e3469f82d70f37cd6bc4d253d Mon Sep 17 00:00:00 2001 From: Chaskiel M Grundman Date: Sun, 30 Jun 2002 07:48:47 +0000 Subject: [PATCH 1/1] freebsd-initial-46-support-20020630 make it build for 4.6 --- acinclude.m4 | 3 + src/afs/FBSD/osi_vm.c | 2 - src/cf/osconf.m4 | 40 +----------- src/config/afs_sysnames.h | 1 + src/config/param.i386_fbsd_45.h | 4 +- src/config/param.i386_fbsd_46.h | 121 ++++++++++++++++++++++++++++++++++++ src/config/param.i386_fbsd_46_usr.h | 63 +++++++++++++++++++ 7 files changed, 191 insertions(+), 43 deletions(-) create mode 100644 src/config/param.i386_fbsd_46.h create mode 100644 src/config/param.i386_fbsd_46_usr.h diff --git a/acinclude.m4 b/acinclude.m4 index db7ebfd..eef990a 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -238,6 +238,9 @@ else i?86-*-freebsd4.5*) AFS_SYSNAME="i386_fbsd_45" ;; + i?86-*-freebsd4.6*) + AFS_SYSNAME="i386_fbsd_46" + ;; i?86-*-netbsd*1.5*) AFS_PARAM_COMMON=param.nbsd15.h AFS_SYSNAME="i386_nbsd15" diff --git a/src/afs/FBSD/osi_vm.c b/src/afs/FBSD/osi_vm.c index 49d87bf..cedcb97 100644 --- a/src/afs/FBSD/osi_vm.c +++ b/src/afs/FBSD/osi_vm.c @@ -181,11 +181,9 @@ osi_VM_FlushPages(avc, credp) { struct vnode *vp; struct vm_object *obj; - printf("|"); vp=avc; simple_lock(&vp->v_interlock); if (VOP_GETVOBJECT(vp, &obj) == 0) { - printf("X|"); vm_object_page_remove(obj, 0, 0, FALSE); } simple_unlock(&vp->v_interlock); diff --git a/src/cf/osconf.m4 b/src/cf/osconf.m4 index 1b62413..86056ba 100644 --- a/src/cf/osconf.m4 +++ b/src/cf/osconf.m4 @@ -120,45 +120,7 @@ case $AFS_SYSNAME in YACC="/opt/langtools/bin/yacc" ;; - i386_fbsd_42) - LEX="flex -l" - MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' - MT_LIBS="-pthread" - PAM_CFLAGS="-O2 -pipe -fPIC" - SHLIB_LDFLAGS="-shared -Xlinker -x" - TXLIBS="/usr/lib/libncurses.so" - XCFLAGS="-O2 -pipe" - XLIBS="${LIB_AFSDB} -lcompat" - YACC="byacc" - ;; - - i386_fbsd_43) - LEX="flex -l" - MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' - MT_LIBS="-pthread" - PAM_CFLAGS="-O2 -pipe -fPIC" - SHLIB_LDFLAGS="-shared -Xlinker -x" - TXLIBS="/usr/lib/libncurses.so" - XCFLAGS="-O2 -pipe" - XLIBS="${LIB_AFSDB} -lcompat" - YACC="byacc" - ;; - - i386_fbsd_44) - LEX="flex -l" - MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' - MT_LIBS="-pthread" - #MT_CFLAGS='-DAFS_PTHREAD_ENV -D_THREAD_SAFE -I/usr/local/include/pthread/linuxthreads ${XCFLAGS}' - #MT_LIBS="-L/usr/local/lib -llthread -llgcc_r" - PAM_CFLAGS="-O2 -pipe -fPIC" - SHLIB_LDFLAGS="-shared -Xlinker -x" - TXLIBS="/usr/lib/libncurses.so" - XCFLAGS="-O2 -pipe" - XLIBS="${LIB_AFSDB} -lcompat" - YACC="byacc" - ;; - - i386_fbsd_45) + i386_fbsd_4*) LEX="flex -l" MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' MT_LIBS="-pthread" diff --git a/src/config/afs_sysnames.h b/src/config/afs_sysnames.h index e386b9a..d7bc36c 100644 --- a/src/config/afs_sysnames.h +++ b/src/config/afs_sysnames.h @@ -144,6 +144,7 @@ #define SYS_NAME_ID_i386_fbsd_43 2101 #define SYS_NAME_ID_i386_fbsd_44 2102 #define SYS_NAME_ID_i386_fbsd_45 2103 +#define SYS_NAME_ID_i386_fbsd_46 2103 #define SYS_NAME_ID_ia64_linux2 2200 #define SYS_NAME_ID_ia64_linux22 2201 diff --git a/src/config/param.i386_fbsd_45.h b/src/config/param.i386_fbsd_45.h index 6a80d6b..a880ef0 100644 --- a/src/config/param.i386_fbsd_45.h +++ b/src/config/param.i386_fbsd_45.h @@ -52,8 +52,8 @@ #ifndef MOUNT_AFS #define MOUNT_AFS AFS_MOUNT_AFS #endif -#define SYS_NAME "i386_fbsd_44" -#define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_44 +#define SYS_NAME "i386_fbsd_45" +#define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_45 #define AFS_HAVE_FFS 1 /* Use system's ffs. */ #define AFS_HAVE_STATVFS 0 /* System doesn't supports statvfs */ diff --git a/src/config/param.i386_fbsd_46.h b/src/config/param.i386_fbsd_46.h new file mode 100644 index 0000000..285d432 --- /dev/null +++ b/src/config/param.i386_fbsd_46.h @@ -0,0 +1,121 @@ +#ifndef AFS_PARAM_H +#define AFS_PARAM_H + +#include + +#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ +#define AFS_X86_XBSD_ENV 1 + +#define AFS_NAMEI_ENV 1 /* User space interface to file system */ +#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ +#define AFS_FBSD_ENV 1 +#define AFS_FBSD40_ENV 1 +#define AFS_FBSD42_ENV 1 +#define AFS_FBSD43_ENV 1 +#define AFS_FBSD44_ENV 1 +#define AFS_FBSD45_ENV 1 +#define AFS_FBSD46_ENV 1 +#define AFS_X86_FBSD_ENV 1 +#define AFS_X86_FBSD40_ENV 1 +#define AFS_X86_FBSD42_ENV 1 +#define AFS_X86_FBSD43_ENV 1 +#define AFS_X86_FBSD46_ENV 1 +#define AFS_X86_ENV 1 +#define AFS_NONFSTRANS 1 +#define O_SYNC O_FSYNC +#define FTRUNC O_TRUNC + +#define IUPD 0x0010 +#define IACC 0x0020 +#define ICHG 0x0040 +#define IMOD 0x0080 + +#define IN_LOCK(ip) lockmgr(&ip->i_lock, LK_EXCLUSIVE, \ + (struct simplelock *)0, curproc) +#define IN_UNLOCK(ip) lockmgr(&ip->i_lock, LK_RELEASE, \ + (struct simplelock *)0, curproc) + +#include + +#define AFS_VM_RDWR_ENV 1 +#define AFS_VFS_ENV 1 +#define AFS_VFSINCL_ENV 1 +#define AFS_GREEDY43_ENV 1 +#define AFS_ENV 1 + +#define AFS_SYSCALL 210 +#define AFS_MOUNT_AFS "afs" + +#ifndef MOUNT_UFS +#define MOUNT_UFS "ufs" +#endif + +#ifndef MOUNT_AFS +#define MOUNT_AFS AFS_MOUNT_AFS +#endif +#define SYS_NAME "i386_fbsd_46" +#define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_46 + +#define AFS_HAVE_FFS 1 /* Use system's ffs. */ +#define AFS_HAVE_STATVFS 0 /* System doesn't supports statvfs */ + +#define RXK_LISTENER_ENV 1 +#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ +#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */ + +#define AFSLITTLE_ENDIAN 1 + +/* Extra kernel definitions (from kdefs file) */ +#ifdef _KERNEL +#define AFS_GLOBAL_SUNLOCK 1 +#define AFS_VFS34 1 /* What is VFS34??? */ +#define AFS_SHORTGID 1 /* are group id's short? */ +#define afsio_iov uio_iov +#define afsio_iovcnt uio_iovcnt +#define afsio_offset uio_offset +#define afsio_seg uio_segflg +#define afsio_resid uio_resid +#define AFS_UIOSYS UIO_SYSSPACE +#define AFS_UIOUSER UIO_USERSPACE +#define AFS_CLBYTES CLBYTES +#define osi_GetTime(x) microtime(x) +#define AFS_KALLOC(x) malloc(x, M_AFS, M_WAITOK) +#define AFS_KFREE(x,y) free(x,M_AFS) +#define v_count v_usecount +#define v_vfsp v_mount +#define vfs_bsize mnt_stat.f_bsize +#define vfs_fsid mnt_stat.f_fsid +#define va_nodeid va_fileid +#define vfs_vnodecovered mnt_vnodecovered +#define direct dirent +#define vnode_t struct vnode + +#ifndef MUTEX_DEFAULT +#define MUTEX_DEFAULT 0 +#endif /* MUTEX_DEFAULT */ + +#ifndef SSYS +#define SSYS 0x00002 +#endif /* SSYS */ + +#define p_rcred p_ucred + +#define VN_RELE(vp) vrele(((struct vnode *)(vp))) +#define VN_HOLD(vp) VREF(((struct vnode *)(vp))) + +#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) +enum vcexcl {NONEXCL, EXCL}; + +#ifdef KERNEL +#ifndef MIN +#define MIN(A,B) ((A) < (B) ? (A) : (B)) +#endif +#ifndef MAX +#define MAX(A,B) ((A) > (B) ? (A) : (B)) +#endif +#endif /* KERNEL */ + +#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ +#endif /* _KERNEL */ + +#endif /* AFS_PARAM_H */ diff --git a/src/config/param.i386_fbsd_46_usr.h b/src/config/param.i386_fbsd_46_usr.h new file mode 100644 index 0000000..0f78ce8 --- /dev/null +++ b/src/config/param.i386_fbsd_46_usr.h @@ -0,0 +1,63 @@ +#ifndef AFS_PARAM_H +#define AFS_PARAM_H + + +#define UKERNEL 1 /* user space kernel */ +#define AFS_ENV 1 +#define AFS_VFSINCL_ENV 1 +#define AFS_USR_FBSD40_ENV 1 +#define AFS_USR_FBSD42_ENV 1 +#define AFS_USR_FBSD43_ENV 1 +#define AFS_USR_FBSD44_ENV 1 +#define AFS_USR_FBSD45_ENV 1 +#define AFS_USR_FBSD46_ENV 1 +#define AFS_USR_FBSD_ENV 1 +#define AFS_NONFSTRANS 1 + +#define O_SYNC O_FSYNC + +#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ +#define AFS_SYSCALL 210 +#define AFS_NAMEI_ENV 1 /* User space interface to file system */ +#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ +#include + +#define AFS_USERSPACE_IP_ADDR 1 +#define RXK_LISTENER_ENV 1 +#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ + +/* Machine / Operating system information */ +#define SYS_NAME "i386_fbsd_46" +#define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_46 +#define AFSLITTLE_ENDIAN 1 +#define AFS_HAVE_FFS 1 /* Use system's ffs. */ +#define AFS_HAVE_STATVFS 0 /* System doesn't support statvfs */ +#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ + +#define afsio_iov uio_iov +#define afsio_iovcnt uio_iovcnt +#define afsio_offset uio_offset +#define afsio_seg uio_segflg +#define afsio_fmode uio_fmode +#define afsio_resid uio_resid +#define AFS_UIOSYS 1 +#define AFS_UIOUSER UIO_USERSPACE +#define AFS_CLBYTES MCLBYTES +#define AFS_MINCHANGE 2 +#define VATTR_NULL usr_vattr_null + +#define AFS_DIRENT +#ifndef CMSERVERPREF +#define CMSERVERPREF +#endif + +#include +#include +#include +#include +#include +#include +#include +#include + +#endif /* AFS_PARAM_H */ -- 1.9.4