OpenBSD: Make OpenBSD 4.7 param headers consistent

OpenBSD follows the policy of using a separate common
param file (post 1.4.x). However, when introducing support
for i386 OpenBSD 4.7, this was not done and a single param
config header file was created instead. This patch changes
the param files for OpenBSD 4.7 so that they are
consistent with the other OpenBSD versions by using a
separate common param header file.

Change-Id: I9d828d2447a2d018eeea0fbe9f4c047ac819d209
Reviewed-on: http://gerrit.openafs.org/3725
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>

diff --git a/acinclude.m4 b/acinclude.m4
index 82e2c7c..0a4ab7a 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -712,6 +712,7 @@ case $AFS_SYSNAME in
     *_obsd44)   AFS_PARAM_COMMON=param.obsd44.h  ;;
     *_obsd45)   AFS_PARAM_COMMON=param.obsd45.h  ;;
     *_obsd46)   AFS_PARAM_COMMON=param.obsd46.h  ;;
+    *_obsd47)   AFS_PARAM_COMMON=param.obsd47.h  ;;
     *_linux22)  AFS_PARAM_COMMON=param.linux22.h ;;
     *_linux24)  AFS_PARAM_COMMON=param.linux24.h ;;
     *_linux26)  AFS_PARAM_COMMON=param.linux26.h ;;

diff --git a/src/config/afs_sysnames.h b/src/config/afs_sysnames.h
index 89021e8..774ae99 100644 (file)
--- a/src/config/afs_sysnames.h
+++ b/src/config/afs_sysnames.h
@@ -317,6 +317,7 @@
 #define SYS_NAME_ID_amd64_obsd44        4013
 #define SYS_NAME_ID_amd64_obsd45        4014
 #define SYS_NAME_ID_amd64_obsd46        4015
+#define SYS_NAME_ID_amd64_obsd47        4016
 
 /*
  * Placeholder to keep system-wide standard flags since this file is included by all

diff --git a/src/config/param.amd64_obsd47.h b/src/config/param.amd64_obsd47.h
new file mode 100644 (file)
index 0000000..7271647
--- /dev/null
+++ b/src/config/param.amd64_obsd47.h
@@ -0,0 +1,19 @@
+/*
+ * Thanks to Jim Rees and University of Michigan CITI, for the initial
+ * OpenBSD porting work.
+ */
+
+#ifndef        AFS_AMD64_PARAM_H
+#define        AFS_AMD64_PARAM_H
+
+#define SYS_NAME               "amd64_obsd47"
+#define SYS_NAME_ID            SYS_NAME_ID_amd64_obsd47
+
+#define AFS_XBSD_ENV           1       /* {Free,Open,Net}BSD */
+#define AFS_X86_XBSD_ENV       1
+#define AFS_X86_ENV            1
+#define AFS_64BITPOINTER_ENV    1
+#define AFS_64BITUSERPOINTER_ENV       1
+#define AFSLITTLE_ENDIAN       1
+
+#endif /* AFS_AMD64_PARAM_H */

diff --git a/src/config/param.i386_obsd47.h b/src/config/param.i386_obsd47.h
index 922aac7..28a24dc 100644 (file)
--- a/src/config/param.i386_obsd47.h
+++ b/src/config/param.i386_obsd47.h
@@ -1,76 +1,16 @@
 /*
- * Jim Rees, University of Michigan CITI
+ * Thanks to Jim Rees and University of Michigan CITI, for the initial
+ * OpenBSD porting work.
  */
 
-#ifndef        AFS_PARAM_H
-#define        AFS_PARAM_H
-
-#ifndef IGNORE_STDS_H
-#include <sys/param.h>
-#endif
+#ifndef        AFS_I386_PARAM_H
+#define        AFS_I386_PARAM_H
 
 #define SYS_NAME               "i386_obsd47"
 #define SYS_NAME_ID            SYS_NAME_ID_i386_obsd47
 
-#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_CLIENT       1
-#define AFS_64BIT_IOPS_ENV     1       /* Needed for NAMEI */
-#define AFS_OBSD_ENV           1
-#define AFS_OBSD34_ENV         1
-#define AFS_OBSD35_ENV         1
-#define AFS_OBSD36_ENV         1
-#define AFS_OBSD37_ENV         1
-#define AFS_OBSD38_ENV         1
-#define AFS_OBSD39_ENV         1
-#define AFS_OBSD40_ENV         1
-#define AFS_OBSD41_ENV         1
-#define AFS_OBSD42_ENV         1
-#define AFS_OBSD43_ENV         1
-#define AFS_OBSD44_ENV         1
-#define AFS_OBSD45_ENV         1
-#define AFS_OBSD46_ENV         1
-#define AFS_OBSD47_ENV         1
-#define AFS_NONFSTRANS         1
-#define AFS_VM_RDWR_ENV                1
-#define AFS_VFS_ENV            1
-#define AFS_VFSINCL_ENV                1
-
-#define FTRUNC O_TRUNC
-
-#define AFS_SYSCALL            208
-#define AFS_MOUNT_AFS          "afs"
-
-#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 AFS_X86_ENV            1
 #define AFSLITTLE_ENDIAN       1
 
-#ifndef IGNORE_STDS_H
-#include <afs/afs_sysnames.h>
-#endif
-
-/* Extra kernel definitions (from kdefs file) */
-#ifdef _KERNEL
-#ifdef MULTIPROCESSOR
-#define AFS_GLOBAL_SUNLOCK     1
-#endif
-#define        AFS_SHORTGID            0       /* are group id's short? */
-
-#if    !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__)
-enum vcexcl { NONEXCL, EXCL };
-
-#ifndef MIN
-#define MIN(A,B) ((A) < (B) ? (A) : (B))
-#endif
-#ifndef MAX
-#define MAX(A,B) ((A) > (B) ? (A) : (B))
-#endif
-
-#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */
-#endif /* _KERNEL */
-
-#endif /* AFS_PARAM_H */
+#endif /* AFS_I386_PARAM_H */

diff --git a/src/config/param.obsd47.h b/src/config/param.obsd47.h
new file mode 100644 (file)
index 0000000..5b8a129
--- /dev/null
+++ b/src/config/param.obsd47.h
@@ -0,0 +1,76 @@
+/*
+ * Thanks to Jim Rees and University of Michigan CITI, for the initial
+ * OpenBSD porting work.
+ */
+
+#ifndef        AFS_PARAM_H
+#define        AFS_PARAM_H
+
+#ifndef IGNORE_STDS_H
+#include <sys/param.h>
+#endif
+
+#define AFS_XBSD_ENV           1       /* {Free,Open,Net}BSD */
+
+#define AFS_NAMEI_ENV          1       /* User space interface to file system */
+#define AFS_64BIT_CLIENT       1
+#define AFS_64BIT_IOPS_ENV     1       /* Needed for NAMEI */
+
+#define AFS_OBSD_ENV           1
+#define        AFS_OBSD31_ENV          1
+#define        AFS_OBSD32_ENV          1
+#define        AFS_OBSD33_ENV          1
+#define AFS_OBSD34_ENV         1
+#define AFS_OBSD35_ENV         1
+#define AFS_OBSD36_ENV         1
+#define AFS_OBSD37_ENV         1
+#define AFS_OBSD38_ENV         1
+#define AFS_OBSD39_ENV         1
+#define AFS_OBSD40_ENV         1
+#define AFS_OBSD41_ENV         1
+#define AFS_OBSD42_ENV         1
+#define AFS_OBSD43_ENV         1
+#define AFS_OBSD44_ENV         1
+#define AFS_OBSD45_ENV         1
+#define AFS_OBSD46_ENV          1
+#define AFS_OBSD47_ENV          1
+#undef  AFS_NONFSTRANS
+#define AFS_NONFSTRANS         1
+#define AFS_VM_RDWR_ENV                1
+#define AFS_VFS_ENV            1
+#define AFS_VFSINCL_ENV                1
+
+#define FTRUNC O_TRUNC
+
+#define AFS_SYSCALL            208
+#define AFS_MOUNT_AFS          "afs"
+
+#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 */
+
+#ifndef IGNORE_STDS_H
+#include <afs/afs_sysnames.h>
+#endif
+
+/* Extra kernel definitions (from kdefs file) */
+#ifdef _KERNEL
+#ifdef MULTIPROCESSOR
+#define AFS_GLOBAL_SUNLOCK     1
+#endif
+#define        AFS_SHORTGID            0       /* are group id's short? */
+
+#if    !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__)
+enum vcexcl { NONEXCL, EXCL };
+
+#ifndef MIN
+#define MIN(A,B) ((A) < (B) ? (A) : (B))
+#endif
+#ifndef MAX
+#define MAX(A,B) ((A) > (B) ? (A) : (B))
+#endif
+
+#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */
+#endif /* _KERNEL */
+
+#endif /* AFS_PARAM_H */