From: Sam Hartman Date: Thu, 5 Jul 2001 00:54:44 +0000 (+0000) Subject: Back out ppc_linux22 patch applied upstream X-Git-Tag: debian/1.0.90.20010704.snapshot-1~8 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=c0c9fc5521f2c3027453a10664f17779d5617167;p=packages%2Fo%2Fopenafs.git Back out ppc_linux22 patch applied upstream and modversions patch also applied upstream --- diff --git a/debian/patch.02_modversions b/debian/patch.02_modversions deleted file mode 100644 index b2d77178b..000000000 --- a/debian/patch.02_modversions +++ /dev/null @@ -1,271 +0,0 @@ -Index: src/config/param.i386_linux22.h -=================================================================== -RCS file: /afs/sipb.mit.edu/project/openafs/debian/cvs/openafs/src/config/param.i386_linux22.h,v -retrieving revision 1.3 -diff -u -r1.3 param.i386_linux22.h ---- src/config/param.i386_linux22.h 23 Jun 2001 16:17:57 -0000 1.3 -+++ src/config/param.i386_linux22.h 23 Jun 2001 16:18:02 -0000 -@@ -27,21 +27,6 @@ - #define AFS_SYSCALL 137 - #define AFS_64BIT_IOPS_ENV 1 - #define AFS_NAMEI_ENV 1 /* User space interface to file system */ --#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_linux22" --#define SYS_NAME_ID SYS_NAME_ID_i386_linux22 --#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 */ -- - #if defined(__KERNEL__) && !defined(KDUMP_KERNEL) - #include - #ifdef CONFIG_SMP -@@ -65,6 +50,21 @@ - #endif - - #endif /* __KERNEL__ && !DUMP_KERNEL*/ -+#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_linux22" -+#define SYS_NAME_ID SYS_NAME_ID_i386_linux22 -+#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 */ -+ - - #ifdef KERNEL - #ifndef MIN -Index: src/config/param.i386_linux24.h -=================================================================== -RCS file: /afs/sipb.mit.edu/project/openafs/debian/cvs/openafs/src/config/param.i386_linux24.h,v -retrieving revision 1.3 -diff -u -r1.3 param.i386_linux24.h ---- src/config/param.i386_linux24.h 23 Jun 2001 16:17:57 -0000 1.3 -+++ src/config/param.i386_linux24.h 23 Jun 2001 16:18:02 -0000 -@@ -20,21 +20,6 @@ - #define AFS_SYSCALL 137 - #define AFS_64BIT_IOPS_ENV 1 - #define AFS_NAMEI_ENV 1 /* User space interface to file system */ --#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_linux24" --#define SYS_NAME_ID SYS_NAME_ID_i386_linux24 --#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 */ -- - #if defined(__KERNEL__) && !defined(KDUMP_KERNEL) - #include - #ifdef CONFIG_SMP -@@ -58,6 +43,21 @@ - #endif - - #endif /* __KERNEL__ && !DUMP_KERNEL*/ -+#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_linux24" -+#define SYS_NAME_ID SYS_NAME_ID_i386_linux24 -+#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 */ -+ - - #ifdef KERNEL - #ifndef MIN -Index: src/config/param.ppc_linux22.h -=================================================================== -RCS file: /afs/sipb.mit.edu/project/openafs/debian/cvs/openafs/src/config/param.ppc_linux22.h,v -retrieving revision 1.3 -diff -u -r1.3 param.ppc_linux22.h ---- src/config/param.ppc_linux22.h 23 Jun 2001 16:17:58 -0000 1.3 -+++ src/config/param.ppc_linux22.h 23 Jun 2001 16:18:02 -0000 -@@ -18,21 +18,6 @@ - #define AFS_SYSCALL 137 - #define AFS_64BIT_IOPS_ENV 1 - #define AFS_NAMEI_ENV 1 /* User space interface to file system */ --#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 "ppc_linux22" --#define SYS_NAME_ID SYS_NAME_ID_ppc_linux22 --#define AFSBIG_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 */ -- - #if defined(__KERNEL__) && !defined(KDUMP_KERNEL) - #include - #ifdef CONFIG_SMP -@@ -47,7 +32,26 @@ - #define AFS_GLOBAL_SUNLOCK - #endif - -+#if defined(MODULE) && defined(CONFIG_MODVERSIONS) -+#define MODVERSIONS -+#include -+#endif - #endif /* __KERNEL__ && !DUMP_KERNEL*/ -+#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 "ppc_linux22" -+#define SYS_NAME_ID SYS_NAME_ID_ppc_linux22 -+#define AFSBIG_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 */ -+ - - #ifdef KERNEL - #ifndef MIN -Index: src/config/param.ppc_linux24.h -=================================================================== -RCS file: /afs/sipb.mit.edu/project/openafs/debian/cvs/openafs/src/config/param.ppc_linux24.h,v -retrieving revision 1.3 -diff -u -r1.3 param.ppc_linux24.h ---- src/config/param.ppc_linux24.h 23 Jun 2001 16:17:59 -0000 1.3 -+++ src/config/param.ppc_linux24.h 23 Jun 2001 16:23:09 -0000 -@@ -20,21 +20,6 @@ - #define AFS_SYSCALL 137 - #define AFS_64BIT_IOPS_ENV 1 - #define AFS_NAMEI_ENV 1 /* User space interface to file system */ --#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 "ppc_linux24" --#define SYS_NAME_ID SYS_NAME_ID_ppc_linux24 --#define AFSBIG_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 */ -- - #if defined(__KERNEL__) && !defined(KDUMP_KERNEL) - #include - #ifdef CONFIG_SMP -@@ -49,7 +34,26 @@ - #define AFS_GLOBAL_SUNLOCK - #endif - -+#if defined(MODULE) && defined(CONFIG_MODVERSIONS) -+#define MODVERSIONS -+#include -+#endif - #endif /* __KERNEL__ && !DUMP_KERNEL*/ -+#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 "ppc_linux24" -+#define SYS_NAME_ID SYS_NAME_ID_ppc_linux24 -+#define AFSBIG_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 */ -+ - - #ifdef KERNEL - #ifndef MIN -Index: src/config/param.sparc_linux22.h -=================================================================== -RCS file: /afs/sipb.mit.edu/project/openafs/debian/cvs/openafs/src/config/param.sparc_linux22.h,v -retrieving revision 1.3 -diff -u -r1.3 param.sparc_linux22.h ---- src/config/param.sparc_linux22.h 23 Jun 2001 16:17:59 -0000 1.3 -+++ src/config/param.sparc_linux22.h 23 Jun 2001 16:18:02 -0000 -@@ -21,21 +21,6 @@ - #define AFS_SYSCALL 227 - #define AFS_64BIT_IOPS_ENV 1 - #define AFS_NAMEI_ENV 1 /* User space interface to file system */ --#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 "sparc_linux22" --#define SYS_NAME_ID SYS_NAME_ID_sparc_linux22 --#define AFSBIG_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 */ -- - #if defined(__KERNEL__) && !defined(KDUMP_KERNEL) - #include - #ifdef CONFIG_SMP -@@ -49,8 +34,27 @@ - #define __SMP__ - #define AFS_GLOBAL_SUNLOCK - #endif -+#if defined(MODULE) && defined(CONFIG_MODVERSIONS) -+#define MODVERSIONS -+#include -+#endif - - #endif /* __KERNEL__ && !DUMP_KERNEL*/ -+#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 "sparc_linux22" -+#define SYS_NAME_ID SYS_NAME_ID_sparc_linux22 -+#define AFSBIG_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 */ -+ - - #ifdef KERNEL - #ifndef MIN diff --git a/debian/patch.ppc_linux22 b/debian/patch.ppc_linux22 deleted file mode 100644 index 6b20f6759..000000000 --- a/debian/patch.ppc_linux22 +++ /dev/null @@ -1,184 +0,0 @@ -diff -Pur /usr/src/modules/openafs/debian/sysname modules/openafs/debian/sysname ---- /usr/src/modules/openafs/debian/sysname Mon Feb 5 14:56:33 2001 -+++ modules/openafs/debian/sysname Wed Feb 7 08:21:35 2001 -@@ -34,7 +34,7 @@ - ppc) - case $KVERS in - 2.2*) -- echo error_not_supported -+ echo ppc_linux22 - ;; - 2.4*) - echo ppc_linux24 -diff -Pur /usr/src/modules/openafs/src/config/Makefile.ppc_linux22 modules/openafs/src/config/Makefile.ppc_linux22 ---- /usr/src/modules/openafs/src/config/Makefile.ppc_linux22 Wed Dec 31 19:00:00 1969 -+++ modules/openafs/src/config/Makefile.ppc_linux22 Wed Feb 7 08:22:03 2001 -@@ -0,0 +1,46 @@ -+# AFS_OSTYPE used to indicate suffixes and os specific subdirectories. -+AFS_OSTYPE = LINUX -+ -+# Base directory for linux kernel source. Actually a prefix which is complete -+# when LINUX_VERS is appended to it. -+LINUX_SRCDIR = $(KSRC) -+# Default list of Linux kernels to build. Build will run only if all -+# can be built. To build a different set, specify LINUX_VERS to make. -+LINUX_VERS = $(KVERS) -+ -+# -+# compilation and link editor flags -+DBG=-g -+OPTMZ=-O2 -+PAM_CFLAGS = -O2 -Dlinux -DLINUX_PAM -fPIC -+# Put -O2 here to _ensure_ all Makefiles pick it up. -+XCFLAGS= -O2 -+MT_CFLAGS=-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS} -+XLDFLAGS= -+SHARE_LDFLAGS = -shared -Xlinker -x -+SHLIB_SUFFIX=so -+SHLIB_CFLAGS= -+# -+# libraries -+MTLIBS=-lpthread -+TXLIBS= /usr/lib/libncurses.so -+XLIBS= -+# -+# programs -+AR=ar -+AS=as -+CP=cp -+INSTALL=install -+LD=ld -+MT_CC=cc -+MV=mv -+RANLIB=ranlib -+RM=rm -+WASHTOOL=${SRCDIR}bin/washtool -+# -+# Other OS specific requirements -+# -+YACC = bison -y -+LEX = flex -l -+# Used in des library. -+CRYPT_OBJ = crypt.o -diff -Pur /usr/src/modules/openafs/src/config/param.ppc_linux22.h modules/openafs/src/config/param.ppc_linux22.h ---- /usr/src/modules/openafs/src/config/param.ppc_linux22.h Wed Dec 31 19:00:00 1969 -+++ modules/openafs/src/config/param.ppc_linux22.h Wed Feb 7 08:25:13 2001 -@@ -0,0 +1,61 @@ -+#ifndef _PARAM_PPC_LINUX22_H_ -+#define _PARAM_PPC_LINUX22_H_ -+ -+/* In user space the AFS_LINUX20_ENV should be sufficient. In the kernel, -+ * it's a judgment call. If something is obviously ppc specific, use that -+ * #define instead. Note that "20" refers to the linux 2.0 kernel. The "2" -+ * in the sysname is the current version of the client. This takes into -+ * account the perferred OS user space configuration as well as the kernel. -+ */ -+ -+#define AFS_LINUX20_ENV 1 -+#define AFS_LINUX22_ENV 1 -+#define AFS_PPC_LINUX20_ENV 1 -+#define AFS_PPC_LINUX22_ENV 1 -+#define AFS_NONFSTRANS 1 -+ -+#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ -+#define AFS_SYSCALL 137 -+#define AFS_64BIT_IOPS_ENV 1 -+#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -+#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 "ppc_linux22" -+#define SYS_NAME_ID SYS_NAME_ID_ppc_linux22 -+#define AFSBIG_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 */ -+ -+#if defined(__KERNEL__) && !defined(KDUMP_KERNEL) -+#include -+#ifdef CONFIG_SMP -+#undef CONFIG_SMP -+#endif -+/* Using "AFS_SMP" to map to however many #define's are required to get -+ * MP to compile for Linux -+ */ -+#ifdef AFS_SMP -+#define CONFIG_SMP -+#define __SMP__ -+#define AFS_GLOBAL_SUNLOCK -+#endif -+ -+#endif /* __KERNEL__ && !DUMP_KERNEL*/ -+ -+#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 /* _PARAM_PPC_LINUX22_H_ */ -diff -Pur /usr/src/modules/openafs/src/config/param.ppc_linux22_usr.h modules/openafs/src/config/param.ppc_linux22_usr.h ---- /usr/src/modules/openafs/src/config/param.ppc_linux22_usr.h Wed Dec 31 19:00:00 1969 -+++ modules/openafs/src/config/param.ppc_linux22_usr.h Wed Feb 7 08:26:44 2001 -@@ -0,0 +1,53 @@ -+#ifndef _PARAM_USR_PPC_LINUX22_H_ -+#define _PARAM_USR_PPC_LINUX22_H_ -+ -+/* In user space the AFS_LINUX20_ENV should be sufficient. In the kernel, -+ * it's a judgment call. If something is obviously ppc specific, use that -+ * #define instead. Note that "20" refers to the linux 2.0 kernel. The "2" -+ * in the sysname is the current version of the client. This takes into -+ * account the perferred OS user space configuration as well as the kernel. -+ */ -+ -+#define UKERNEL 1 /* user space kernel */ -+#define AFS_ENV 1 -+#define AFS_USR_LINUX20_ENV 1 -+#define AFS_USR_LINUX22_ENV 1 -+#define AFS_NONFSTRANS 1 -+ -+#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ -+#define AFS_SYSCALL 137 -+#define AFS_64BIT_IOPS_ENV 1 -+#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -+#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 "ppc_linux22" -+#define SYS_NAME_ID SYS_NAME_ID_ppc_linux22 -+#define AFSBIG_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 -+ -+#endif /* _PARAM_USR_PPC_LINUX22_H_ */ diff --git a/src/config/param.i386_linux22.h b/src/config/param.i386_linux22.h index fa2f99ed6..85506a61c 100644 --- a/src/config/param.i386_linux22.h +++ b/src/config/param.i386_linux22.h @@ -27,6 +27,21 @@ #define AFS_SYSCALL 137 #define AFS_64BIT_IOPS_ENV 1 #define AFS_NAMEI_ENV 1 /* User space interface to file system */ +#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_linux22" +#define SYS_NAME_ID SYS_NAME_ID_i386_linux22 +#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 */ + #if defined(__KERNEL__) && !defined(KDUMP_KERNEL) #include #ifdef CONFIG_SMP @@ -50,21 +65,6 @@ #endif #endif /* __KERNEL__ && !DUMP_KERNEL*/ -#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_linux22" -#define SYS_NAME_ID SYS_NAME_ID_i386_linux22 -#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 */ - #ifdef KERNEL #ifndef MIN diff --git a/src/config/param.i386_linux24.h b/src/config/param.i386_linux24.h index ea36e8121..0e8e95401 100644 --- a/src/config/param.i386_linux24.h +++ b/src/config/param.i386_linux24.h @@ -20,6 +20,21 @@ #define AFS_SYSCALL 137 #define AFS_64BIT_IOPS_ENV 1 #define AFS_NAMEI_ENV 1 /* User space interface to file system */ +#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_linux24" +#define SYS_NAME_ID SYS_NAME_ID_i386_linux24 +#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 */ + #if defined(__KERNEL__) && !defined(KDUMP_KERNEL) #include #ifdef CONFIG_SMP @@ -43,21 +58,6 @@ #endif #endif /* __KERNEL__ && !DUMP_KERNEL*/ -#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_linux24" -#define SYS_NAME_ID SYS_NAME_ID_i386_linux24 -#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 */ - #ifdef KERNEL #ifndef MIN diff --git a/src/config/param.ppc_linux22.h b/src/config/param.ppc_linux22.h deleted file mode 100644 index c28276962..000000000 --- a/src/config/param.ppc_linux22.h +++ /dev/null @@ -1,65 +0,0 @@ -#ifndef _PARAM_PPC_LINUX22_H_ -#define _PARAM_PPC_LINUX22_H_ - -/* In user space the AFS_LINUX20_ENV should be sufficient. In the kernel, - * it's a judgment call. If something is obviously ppc specific, use that - * #define instead. Note that "20" refers to the linux 2.0 kernel. The "2" - * in the sysname is the current version of the client. This takes into - * account the perferred OS user space configuration as well as the kernel. - */ - -#define AFS_LINUX20_ENV 1 -#define AFS_LINUX22_ENV 1 -#define AFS_PPC_LINUX20_ENV 1 -#define AFS_PPC_LINUX22_ENV 1 -#define AFS_NONFSTRANS 1 - -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ -#define AFS_SYSCALL 137 -#define AFS_64BIT_IOPS_ENV 1 -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#if defined(__KERNEL__) && !defined(KDUMP_KERNEL) -#include -#ifdef CONFIG_SMP -#undef CONFIG_SMP -#endif -/* Using "AFS_SMP" to map to however many #define's are required to get - * MP to compile for Linux - */ -#ifdef AFS_SMP -#define CONFIG_SMP -#define __SMP__ -#define AFS_GLOBAL_SUNLOCK -#endif - -#if defined(MODULE) && defined(CONFIG_MODVERSIONS) -#define MODVERSIONS -#include -#endif -#endif /* __KERNEL__ && !DUMP_KERNEL*/ -#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 "ppc_linux22" -#define SYS_NAME_ID SYS_NAME_ID_ppc_linux22 -#define AFSBIG_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 */ - - -#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 /* _PARAM_PPC_LINUX22_H_ */ diff --git a/src/config/param.ppc_linux22_usr.h b/src/config/param.ppc_linux22_usr.h deleted file mode 100644 index 51dc915dd..000000000 --- a/src/config/param.ppc_linux22_usr.h +++ /dev/null @@ -1,53 +0,0 @@ -#ifndef _PARAM_USR_PPC_LINUX22_H_ -#define _PARAM_USR_PPC_LINUX22_H_ - -/* In user space the AFS_LINUX20_ENV should be sufficient. In the kernel, - * it's a judgment call. If something is obviously ppc specific, use that - * #define instead. Note that "20" refers to the linux 2.0 kernel. The "2" - * in the sysname is the current version of the client. This takes into - * account the perferred OS user space configuration as well as the kernel. - */ - -#define UKERNEL 1 /* user space kernel */ -#define AFS_ENV 1 -#define AFS_USR_LINUX20_ENV 1 -#define AFS_USR_LINUX22_ENV 1 -#define AFS_NONFSTRANS 1 - -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ -#define AFS_SYSCALL 137 -#define AFS_64BIT_IOPS_ENV 1 -#define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#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 "ppc_linux22" -#define SYS_NAME_ID SYS_NAME_ID_ppc_linux22 -#define AFSBIG_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 - -#endif /* _PARAM_USR_PPC_LINUX22_H_ */ diff --git a/src/config/param.ppc_linux24.h b/src/config/param.ppc_linux24.h index 1d7055d80..b88c0c01e 100644 --- a/src/config/param.ppc_linux24.h +++ b/src/config/param.ppc_linux24.h @@ -20,25 +20,6 @@ #define AFS_SYSCALL 137 #define AFS_64BIT_IOPS_ENV 1 #define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#if defined(__KERNEL__) && !defined(KDUMP_KERNEL) -#include -#ifdef CONFIG_SMP -#undef CONFIG_SMP -#endif -/* Using "AFS_SMP" to map to however many #define's are required to get - * MP to compile for Linux - */ -#ifdef AFS_SMP -#define CONFIG_SMP -#define __SMP__ -#define AFS_GLOBAL_SUNLOCK -#endif - -#if defined(MODULE) && defined(CONFIG_MODVERSIONS) -#define MODVERSIONS -#include -#endif -#endif /* __KERNEL__ && !DUMP_KERNEL*/ #include #define AFS_USERSPACE_IP_ADDR 1 @@ -54,6 +35,21 @@ #define AFS_HAVE_STATVFS 0 /* System doesn't support statvfs */ #define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ +#if defined(__KERNEL__) && !defined(KDUMP_KERNEL) +#include +#ifdef CONFIG_SMP +#undef CONFIG_SMP +#endif +/* Using "AFS_SMP" to map to however many #define's are required to get + * MP to compile for Linux + */ +#ifdef AFS_SMP +#define CONFIG_SMP +#define __SMP__ +#define AFS_GLOBAL_SUNLOCK +#endif + +#endif /* __KERNEL__ && !DUMP_KERNEL*/ #ifdef KERNEL #ifndef MIN diff --git a/src/config/param.sparc_linux22.h b/src/config/param.sparc_linux22.h index dc72d2624..f0b4214d6 100644 --- a/src/config/param.sparc_linux22.h +++ b/src/config/param.sparc_linux22.h @@ -21,25 +21,6 @@ #define AFS_SYSCALL 227 #define AFS_64BIT_IOPS_ENV 1 #define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#if defined(__KERNEL__) && !defined(KDUMP_KERNEL) -#include -#ifdef CONFIG_SMP -#undef CONFIG_SMP -#endif -/* Using "AFS_SMP" to map to however many #define's are required to get - * MP to compile for Linux - */ -#ifdef AFS_SMP -#define CONFIG_SMP -#define __SMP__ -#define AFS_GLOBAL_SUNLOCK -#endif -#if defined(MODULE) && defined(CONFIG_MODVERSIONS) -#define MODVERSIONS -#include -#endif - -#endif /* __KERNEL__ && !DUMP_KERNEL*/ #include #define AFS_USERSPACE_IP_ADDR 1 @@ -55,6 +36,21 @@ #define AFS_HAVE_STATVFS 0 /* System doesn't support statvfs */ #define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ +#if defined(__KERNEL__) && !defined(KDUMP_KERNEL) +#include +#ifdef CONFIG_SMP +#undef CONFIG_SMP +#endif +/* Using "AFS_SMP" to map to however many #define's are required to get + * MP to compile for Linux + */ +#ifdef AFS_SMP +#define CONFIG_SMP +#define __SMP__ +#define AFS_GLOBAL_SUNLOCK +#endif + +#endif /* __KERNEL__ && !DUMP_KERNEL*/ #ifdef KERNEL #ifndef MIN