From 85b231c42fd2ef0a581a17a77145312800db7d25 Mon Sep 17 00:00:00 2001 From: adilger Date: Sun, 19 Jun 2005 09:29:55 +0000 Subject: [PATCH] Land b_release_1_4_3 onto b1_4 (20050619_0220) b=6471 : Fix memory overwrite on RHEL4 kernels by selinux. b=6435 : Fix statfs problems for latest RHEL3 2.4.21 kernel. b=1693 : Add rudimentary /proc/fs/lustre/health_check entry. --- lustre/ChangeLog | 16 +- lustre/autoconf/lustre-core.m4 | 13 +- lustre/autoconf/lustre-version.ac | 2 +- lustre/include/lustre/lustre_user.h | 8 + .../kernel-2.4.21-rhel-2.4-i686-smp.config | 3 + .../kernel-2.4.21-rhel-2.4-i686.config | 3 + .../kernel-2.4.21-rhel-2.4-ia64-smp.config | 3 + .../kernel-2.4.21-rhel-2.4-ia64.config | 5 +- .../kernel-2.4.21-rhel-2.4-x86_64-smp.config | 3 + .../kernel-2.4.21-rhel-2.4-x86_64.config | 3 + .../patches/blkdev_tunables-2.4.21-chaos.patch | 33 +- .../patches/nfs_statfs-toomanyfiles-rhel-2.4.patch | 30 + lustre/kernel_patches/patches/qsnet-rhel-2.4.patch | 1952 +++++++++++--------- .../patches/small_scatterlist-2.4.21-rhel.patch | 272 +-- .../patches/statfs64-cast-unsigned-2.4-rhel.patch | 28 + .../patches/vfs_intent-2.4.21-rhel.patch | 226 +-- lustre/kernel_patches/series/rhel-2.4.21 | 7 +- lustre/kernel_patches/targets/rhel-2.4.target.in | 4 +- lustre/lvfs/lvfs_linux.c | 10 + lustre/obdclass/class_obd.c | 40 + lustre/obdfilter/filter.c | 17 +- lustre/obdfilter/filter_internal.h | 2 +- lustre/obdfilter/filter_san.c | 17 +- lustre/tests/test-framework.sh | 29 +- 24 files changed, 1587 insertions(+), 1139 deletions(-) create mode 100644 lustre/kernel_patches/patches/nfs_statfs-toomanyfiles-rhel-2.4.patch create mode 100644 lustre/kernel_patches/patches/statfs64-cast-unsigned-2.4-rhel.patch diff --git a/lustre/ChangeLog b/lustre/ChangeLog index 36809a0..b1918f8 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -28,7 +28,9 @@ Details : While revalidating inodes the VFS looks up inodes with ifind() when it finds an existing inode and then the VFS later attaches this free lsm to a new inode. -tbd Cluster File Systems, Inc. +------------------------------------------------------------------------------ + +2005-06-20 Cluster File Systems, Inc. * version 1.4.3 * bug fixes @@ -38,15 +40,15 @@ Bugzilla : 6172 Description: Client is evicted, gets IO error writing to file Details : lock ordering changes for bug 5492 reintroduced bug 3267 and caused clients to be evicted for AST timeouts. The fixes in - bug 5192 mean we no longer need to have such short AST timeouts - so ldlm_timeout has been increased. + bug 5192 mean we no longer need to have such short AST timeouts + so ldlm_timeout has been increased. Severity : major Frequency : occasional during --force or --failover shutdown under load Bugzilla : 5949, 4834 Description: Server oops/LBUG if stopped with --force or --failover under load Details : a collection of import/export refcount and cleanup ordering - issues fixed for safer force cleanup + issues fixed for safer force cleanup Severity : major Frequency : only filesystems larger than 120 OSTs @@ -115,15 +117,15 @@ Frequency : always when accessing e.g. tty/console device nodes Bugzilla : 3790 Description: tty and some other devices nodes cannot be used on lustre Details : file's private_data field is used by device data and lustre - values in there got lost. New field was added to struct file to - store fs-specific private data. + values in there got lost. New field was added to struct file to + store fs-specific private data. Severity : minor Frequency : when exporting Lustre via NFS Bugzilla : 5275 Description: NFSD failed occasionally when looking up a path component Details : NFSD is looking up ".." which was broken in ext3 directories - that had grown large enough to become hashed. + that had grown large enough to become hashed. ------------------------------------------------------------------------------ diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index a47df45..6d639ec 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 @@ -481,8 +481,17 @@ AC_DEFUN([LC_CONFIGURE], AC_CHECK_HEADERS([asm/page.h sys/user.h stdint.h]) # include/lustre/lustre_user.h -AC_CHECK_TYPES([struct if_dqinfo],[],[],[#include ]) -AC_CHECK_TYPES([struct if_dqblk],[],[],[#include ]) +# See note there re: __ASM_X86_64_PROCESSOR_H + +AC_CHECK_TYPES([struct if_dqinfo],[],[],[ +#define __ASM_X86_64_PROCESSOR_H +#include +]) + +AC_CHECK_TYPES([struct if_dqblk],[],[],[ +#define __ASM_X86_64_PROCESSOR_H +#include +]) # liblustre/llite_lib.h AC_CHECK_HEADERS([xtio.h file.h]) diff --git a/lustre/autoconf/lustre-version.ac b/lustre/autoconf/lustre-version.ac index 7cee564..8ef18db 100644 --- a/lustre/autoconf/lustre-version.ac +++ b/lustre/autoconf/lustre-version.ac @@ -1 +1 @@ -m4_define([LUSTRE_VERSION],[1.4.3.1cvs]) +m4_define([LUSTRE_VERSION],[1.4.3.2cvs]) diff --git a/lustre/include/lustre/lustre_user.h b/lustre/include/lustre/lustre_user.h index c56cb2d..28526dd 100644 --- a/lustre/include/lustre/lustre_user.h +++ b/lustre/include/lustre/lustre_user.h @@ -9,6 +9,14 @@ #ifndef _LUSTRE_USER_H #define _LUSTRE_USER_H #include + +/* + * asm-x86_64/processor.h on some SLES 9 distros seems to use + * kernel-only typedefs. fortunately skipping it altogether is ok + * (for now). + */ +#define __ASM_X86_64_PROCESSOR_H + #include #ifdef __KERNEL__ #include diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-i686-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-i686-smp.config index 94097b7..e8ba99d 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-i686-smp.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-i686-smp.config @@ -588,6 +588,7 @@ CONFIG_SCSI_LOGGING=y # SCSI low-level drivers # CONFIG_BLK_DEV_3W_XXXX_RAID=m +CONFIG_BLK_DEV_3W_9XXX_RAID=m CONFIG_SCSI_7000FASST=m CONFIG_SCSI_ACARD=m CONFIG_SCSI_AHA152X=m @@ -621,6 +622,7 @@ CONFIG_SCSI_AM53C974=m CONFIG_SCSI_MEGARAID=m CONFIG_SCSI_MEGARAID2=m CONFIG_SCSI_SATA=y +CONFIG_SCSI_SATA_AHCI=m CONFIG_SCSI_SATA_SVW=m CONFIG_SCSI_ATA_PIIX=m CONFIG_SCSI_SATA_NV=m @@ -628,6 +630,7 @@ CONFIG_SCSI_SATA_PROMISE=m CONFIG_SCSI_SATA_SX4=m CONFIG_SCSI_SATA_SIL=m CONFIG_SCSI_SATA_SIS=m +CONFIG_SCSI_SATA_ULI=m CONFIG_SCSI_SATA_VIA=m CONFIG_SCSI_SATA_VITESSE=m CONFIG_SCSI_BUSLOGIC=m diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-i686.config b/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-i686.config index 94097b7..e8ba99d 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-i686.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-i686.config @@ -588,6 +588,7 @@ CONFIG_SCSI_LOGGING=y # SCSI low-level drivers # CONFIG_BLK_DEV_3W_XXXX_RAID=m +CONFIG_BLK_DEV_3W_9XXX_RAID=m CONFIG_SCSI_7000FASST=m CONFIG_SCSI_ACARD=m CONFIG_SCSI_AHA152X=m @@ -621,6 +622,7 @@ CONFIG_SCSI_AM53C974=m CONFIG_SCSI_MEGARAID=m CONFIG_SCSI_MEGARAID2=m CONFIG_SCSI_SATA=y +CONFIG_SCSI_SATA_AHCI=m CONFIG_SCSI_SATA_SVW=m CONFIG_SCSI_ATA_PIIX=m CONFIG_SCSI_SATA_NV=m @@ -628,6 +630,7 @@ CONFIG_SCSI_SATA_PROMISE=m CONFIG_SCSI_SATA_SX4=m CONFIG_SCSI_SATA_SIL=m CONFIG_SCSI_SATA_SIS=m +CONFIG_SCSI_SATA_ULI=m CONFIG_SCSI_SATA_VIA=m CONFIG_SCSI_SATA_VITESSE=m CONFIG_SCSI_BUSLOGIC=m diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-ia64-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-ia64-smp.config index 4058f4b..94fca767 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-ia64-smp.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-ia64-smp.config @@ -536,6 +536,7 @@ CONFIG_SCSI_CONSTANTS=y # SCSI low-level drivers # CONFIG_BLK_DEV_3W_XXXX_RAID=m +CONFIG_BLK_DEV_3W_9XXX_RAID=m # CONFIG_SCSI_7000FASST is not set # CONFIG_SCSI_ACARD is not set # CONFIG_SCSI_AHA152X is not set @@ -569,6 +570,7 @@ CONFIG_AIC7XXX_OLD_PROC_STATS=y CONFIG_SCSI_MEGARAID=m CONFIG_SCSI_MEGARAID2=m CONFIG_SCSI_SATA=y +CONFIG_SCSI_SATA_AHCI=m CONFIG_SCSI_SATA_SVW=m CONFIG_SCSI_ATA_PIIX=m CONFIG_SCSI_SATA_NV=m @@ -576,6 +578,7 @@ CONFIG_SCSI_SATA_PROMISE=m CONFIG_SCSI_SATA_SX4=m CONFIG_SCSI_SATA_SIL=m CONFIG_SCSI_SATA_SIS=m +CONFIG_SCSI_SATA_ULI=m CONFIG_SCSI_SATA_VIA=m CONFIG_SCSI_SATA_VITESSE=m # CONFIG_SCSI_BUSLOGIC is not set diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-ia64.config b/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-ia64.config index 7e440cf..94fca767 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-ia64.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-ia64.config @@ -53,7 +53,7 @@ CONFIG_HUGETLB_PAGE_SIZE_256MB=y # CONFIG_HUGETLB_PAGE_SIZE_1MB is not set # CONFIG_HUGETLB_PAGE_SIZE_256KB is not set # CONFIG_IA64_PAL_IDLE is not set -# CONFIG_SMP is not set +CONFIG_SMP=y CONFIG_IA32_SUPPORT=y CONFIG_COMPAT=y CONFIG_PERFMON=y @@ -536,6 +536,7 @@ CONFIG_SCSI_CONSTANTS=y # SCSI low-level drivers # CONFIG_BLK_DEV_3W_XXXX_RAID=m +CONFIG_BLK_DEV_3W_9XXX_RAID=m # CONFIG_SCSI_7000FASST is not set # CONFIG_SCSI_ACARD is not set # CONFIG_SCSI_AHA152X is not set @@ -569,6 +570,7 @@ CONFIG_AIC7XXX_OLD_PROC_STATS=y CONFIG_SCSI_MEGARAID=m CONFIG_SCSI_MEGARAID2=m CONFIG_SCSI_SATA=y +CONFIG_SCSI_SATA_AHCI=m CONFIG_SCSI_SATA_SVW=m CONFIG_SCSI_ATA_PIIX=m CONFIG_SCSI_SATA_NV=m @@ -576,6 +578,7 @@ CONFIG_SCSI_SATA_PROMISE=m CONFIG_SCSI_SATA_SX4=m CONFIG_SCSI_SATA_SIL=m CONFIG_SCSI_SATA_SIS=m +CONFIG_SCSI_SATA_ULI=m CONFIG_SCSI_SATA_VIA=m CONFIG_SCSI_SATA_VITESSE=m # CONFIG_SCSI_BUSLOGIC is not set diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-x86_64-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-x86_64-smp.config index 139c1ce..594b821 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-x86_64-smp.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-x86_64-smp.config @@ -543,6 +543,7 @@ CONFIG_SCSI_LOGGING=y # SCSI low-level drivers # CONFIG_BLK_DEV_3W_XXXX_RAID=m +CONFIG_BLK_DEV_3W_9XXX_RAID=m # CONFIG_SCSI_7000FASST is not set # CONFIG_SCSI_ACARD is not set # CONFIG_SCSI_AHA152X is not set @@ -575,6 +576,7 @@ CONFIG_AIC7XXX_OLD_PROC_STATS=y CONFIG_SCSI_MEGARAID=m CONFIG_SCSI_MEGARAID2=m CONFIG_SCSI_SATA=y +CONFIG_SCSI_SATA_AHCI=m CONFIG_SCSI_SATA_SVW=m CONFIG_SCSI_ATA_PIIX=m CONFIG_SCSI_SATA_NV=m @@ -582,6 +584,7 @@ CONFIG_SCSI_SATA_PROMISE=m CONFIG_SCSI_SATA_SX4=m CONFIG_SCSI_SATA_SIL=m CONFIG_SCSI_SATA_SIS=m +CONFIG_SCSI_SATA_ULI=m CONFIG_SCSI_SATA_VIA=m CONFIG_SCSI_SATA_VITESSE=m # CONFIG_SCSI_BUSLOGIC is not set diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-x86_64.config index 139c1ce..594b821 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-x86_64.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-x86_64.config @@ -543,6 +543,7 @@ CONFIG_SCSI_LOGGING=y # SCSI low-level drivers # CONFIG_BLK_DEV_3W_XXXX_RAID=m +CONFIG_BLK_DEV_3W_9XXX_RAID=m # CONFIG_SCSI_7000FASST is not set # CONFIG_SCSI_ACARD is not set # CONFIG_SCSI_AHA152X is not set @@ -575,6 +576,7 @@ CONFIG_AIC7XXX_OLD_PROC_STATS=y CONFIG_SCSI_MEGARAID=m CONFIG_SCSI_MEGARAID2=m CONFIG_SCSI_SATA=y +CONFIG_SCSI_SATA_AHCI=m CONFIG_SCSI_SATA_SVW=m CONFIG_SCSI_ATA_PIIX=m CONFIG_SCSI_SATA_NV=m @@ -582,6 +584,7 @@ CONFIG_SCSI_SATA_PROMISE=m CONFIG_SCSI_SATA_SX4=m CONFIG_SCSI_SATA_SIL=m CONFIG_SCSI_SATA_SIS=m +CONFIG_SCSI_SATA_ULI=m CONFIG_SCSI_SATA_VIA=m CONFIG_SCSI_SATA_VITESSE=m # CONFIG_SCSI_BUSLOGIC is not set diff --git a/lustre/kernel_patches/patches/blkdev_tunables-2.4.21-chaos.patch b/lustre/kernel_patches/patches/blkdev_tunables-2.4.21-chaos.patch index 9349422..e863bd6 100644 --- a/lustre/kernel_patches/patches/blkdev_tunables-2.4.21-chaos.patch +++ b/lustre/kernel_patches/patches/blkdev_tunables-2.4.21-chaos.patch @@ -1,6 +1,8 @@ ---- ./drivers/addon/qla2200/qla2x00.h 2004-07-26 12:52:08.000000000 +0100 -+++ ./drivers/addon/qla2200/qla2x00.h 2004-07-26 12:58:42.000000000 +0100 -@@ -3208,7 +3208,7 @@ void qla2x00_setup(char *s); +Index: linux-2.4.21/drivers/addon/qla2200/qla2x00.h +=================================================================== +--- linux-2.4.21.orig/drivers/addon/qla2200/qla2x00.h 2005-06-01 22:51:57.000000000 -0400 ++++ linux-2.4.21/drivers/addon/qla2200/qla2x00.h 2005-06-01 23:06:10.592857440 -0400 +@@ -3275,7 +3275,7 @@ /* Kernel version specific template additions */ /* Number of segments 1 - 65535 */ @@ -9,7 +11,7 @@ /* * Scsi_Host_template (see hosts.h) -@@ -3222,7 +3222,7 @@ void qla2x00_setup(char *s); +@@ -3289,7 +3289,7 @@ * */ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,8) @@ -18,23 +20,28 @@ #else #define TEMPLATE_MAX_SECTORS #endif ---- ./include/linux/blkdev.h 2004-07-26 12:53:11.000000000 +0100 -+++ ./include/linux/blkdev.h 2004-07-26 13:12:42.000000000 +0100 -@@ -255,9 +255,9 @@ extern int * max_segments[MAX_BLKDEV]; +Index: linux-2.4.21/include/linux/blkdev.h +=================================================================== +--- linux-2.4.21.orig/include/linux/blkdev.h 2005-06-01 22:51:55.000000000 -0400 ++++ linux-2.4.21/include/linux/blkdev.h 2005-06-01 23:07:26.186365480 -0400 +@@ -262,10 +262,10 @@ extern char * blkdev_varyio[MAX_BLKDEV]; -#define MAX_SEGMENTS 128 +#define MAX_SEGMENTS 256 #define MAX_SECTORS 255 + /* General-case limit for superbh size: */ -#define MAX_SUPERBH 32768 /* must fit info ->b_size right now */ -+#define MAX_SUPERBH (1<<20) ++#define MAX_SUPERBH (1<<20) /* must fit info ->b_size right now */ - /* - * bh abuse :/ ---- ./mm/highmem.c.orig 2004-09-11 08:16:19.000000000 -0600 -+++ ./mm/highmem.c 2004-10-06 11:52:34.000000000 -0600 -@@ -465,7 +465,7 @@ struct buffer_head * create_bounce(int r + /* Limit for superbh when we're certain it cannot be bounce-buffered: */ + #define MAX_SUPERBH_NOBOUNCE (1024*1024) /* must fit info ->b_size right now */ +Index: linux-2.4.21/mm/highmem.c +=================================================================== +--- linux-2.4.21.orig/mm/highmem.c 2005-06-01 22:51:50.000000000 -0400 ++++ linux-2.4.21/mm/highmem.c 2005-06-01 23:06:10.594857136 -0400 +@@ -474,7 +474,7 @@ /* * FIXME: assuming PAGE_SIZE buffer_heads */ diff --git a/lustre/kernel_patches/patches/nfs_statfs-toomanyfiles-rhel-2.4.patch b/lustre/kernel_patches/patches/nfs_statfs-toomanyfiles-rhel-2.4.patch new file mode 100644 index 0000000..4bb8892 --- /dev/null +++ b/lustre/kernel_patches/patches/nfs_statfs-toomanyfiles-rhel-2.4.patch @@ -0,0 +1,30 @@ +Index: linux-2.4.21/fs/nfs/inode.c +=================================================================== +--- linux-2.4.21.orig/fs/nfs/inode.c 2005-06-01 22:51:55.000000000 -0400 ++++ linux-2.4.21/fs/nfs/inode.c 2005-06-01 23:38:54.883239912 -0400 +@@ -679,14 +679,21 @@ + goto too_big; + if (TOOBIG(((res.abytes + blockres) >> blockbits))) + goto too_big; +- if (TOOBIG(res.tfiles) || TOOBIG(res.afiles)) +- goto too_big; + + buf->f_blocks = (res.tbytes + blockres) >> blockbits; + buf->f_bfree = (res.fbytes + blockres) >> blockbits; + buf->f_bavail = (res.abytes + blockres) >> blockbits; +- buf->f_files = res.tfiles; +- buf->f_ffree = res.afiles; ++ ++ if (TOOBIG(res.tfiles)) ++ buf->f_files = -1; ++ else ++ buf->f_files = res.tfiles; ++ ++ if (TOOBIG(res.afiles)) ++ buf->f_ffree = -1; ++ else ++ buf->f_ffree = res.afiles; ++ + return 0; + + too_big: diff --git a/lustre/kernel_patches/patches/qsnet-rhel-2.4.patch b/lustre/kernel_patches/patches/qsnet-rhel-2.4.patch index d54d999..40b7c82 100644 --- a/lustre/kernel_patches/patches/qsnet-rhel-2.4.patch +++ b/lustre/kernel_patches/patches/qsnet-rhel-2.4.patch @@ -1,7 +1,8 @@ -diff -urNp linux-2.4.21.orig/arch/i386/kernel/i386_ksyms.c linux-2.4.21/arch/i386/kernel/i386_ksyms.c ---- linux-2.4.21.orig/arch/i386/kernel/i386_ksyms.c 2005-05-04 15:31:09.000000000 -0400 -+++ linux-2.4.21/arch/i386/kernel/i386_ksyms.c 2005-05-04 18:24:22.478073336 -0400 -@@ -217,3 +217,12 @@ extern unsigned long long __PAGE_KERNEL; +Index: linux-2.4.21/arch/i386/kernel/i386_ksyms.c +=================================================================== +--- linux-2.4.21.orig/arch/i386/kernel/i386_ksyms.c 2005-06-01 22:51:51.000000000 -0400 ++++ linux-2.4.21/arch/i386/kernel/i386_ksyms.c 2005-06-01 23:12:54.521450960 -0400 +@@ -220,3 +220,12 @@ EXPORT_SYMBOL_GPL(__PAGE_KERNEL); extern unsigned long long __supported_pte_mask; EXPORT_SYMBOL_GPL(__supported_pte_mask); @@ -14,13 +15,14 @@ diff -urNp linux-2.4.21.orig/arch/i386/kernel/i386_ksyms.c linux-2.4.21/arch/i38 +EXPORT_SYMBOL(sys_poll); +extern asmlinkage long sys_kill(int, int); +EXPORT_SYMBOL(sys_kill); -diff -urNp linux-2.4.21.orig/arch/ia64/kernel/ia64_ksyms.c linux-2.4.21/arch/ia64/kernel/ia64_ksyms.c ---- linux-2.4.21.orig/arch/ia64/kernel/ia64_ksyms.c 2005-05-04 15:31:23.000000000 -0400 -+++ linux-2.4.21/arch/ia64/kernel/ia64_ksyms.c 2005-05-04 18:24:22.478073336 -0400 -@@ -198,3 +198,13 @@ EXPORT_SYMBOL(unw_init_running); - - extern int init_dump; - EXPORT_SYMBOL(init_dump); +Index: linux-2.4.21/arch/ia64/kernel/ia64_ksyms.c +=================================================================== +--- linux-2.4.21.orig/arch/ia64/kernel/ia64_ksyms.c 2005-06-01 22:51:59.000000000 -0400 ++++ linux-2.4.21/arch/ia64/kernel/ia64_ksyms.c 2005-06-01 23:14:43.773842072 -0400 +@@ -207,3 +207,13 @@ + EXPORT_SYMBOL_GPL(show_mem); + EXPORT_SYMBOL_GPL(show_state); + EXPORT_SYMBOL_GPL(show_regs); + +#define __KERNEL_SYSCALLS__ 1 +#include @@ -31,10 +33,11 @@ diff -urNp linux-2.4.21.orig/arch/ia64/kernel/ia64_ksyms.c linux-2.4.21/arch/ia6 +EXPORT_SYMBOL(sys_poll); +extern asmlinkage long sys_kill(int, int); +EXPORT_SYMBOL(sys_kill); -diff -urNp linux-2.4.21.orig/arch/x86_64/kernel/x8664_ksyms.c linux-2.4.21/arch/x86_64/kernel/x8664_ksyms.c ---- linux-2.4.21.orig/arch/x86_64/kernel/x8664_ksyms.c 2005-05-04 15:31:09.000000000 -0400 -+++ linux-2.4.21/arch/x86_64/kernel/x8664_ksyms.c 2005-05-04 18:24:22.479073184 -0400 -@@ -214,6 +214,10 @@ EXPORT_SYMBOL(copy_user_generic); +Index: linux-2.4.21/arch/x86_64/kernel/x8664_ksyms.c +=================================================================== +--- linux-2.4.21.orig/arch/x86_64/kernel/x8664_ksyms.c 2005-06-01 22:51:51.000000000 -0400 ++++ linux-2.4.21/arch/x86_64/kernel/x8664_ksyms.c 2005-06-01 23:12:54.522450808 -0400 +@@ -215,6 +215,10 @@ EXPORT_SYMBOL(sys_exit); EXPORT_SYMBOL(sys_open); EXPORT_SYMBOL(sys_lseek); @@ -45,10 +48,11 @@ diff -urNp linux-2.4.21.orig/arch/x86_64/kernel/x8664_ksyms.c linux-2.4.21/arch/ EXPORT_SYMBOL(sys_delete_module); EXPORT_SYMBOL(sys_sync); EXPORT_SYMBOL(sys_pause); -diff -urNp linux-2.4.21.orig/Documentation/Configure.help linux-2.4.21/Documentation/Configure.help ---- linux-2.4.21.orig/Documentation/Configure.help 2005-05-04 15:31:24.000000000 -0400 -+++ linux-2.4.21/Documentation/Configure.help 2005-05-04 18:24:22.707038528 -0400 -@@ -27959,6 +27959,54 @@ CONFIG_CRC32 +Index: linux-2.4.21/Documentation/Configure.help +=================================================================== +--- linux-2.4.21.orig/Documentation/Configure.help 2005-06-01 23:12:39.856680344 -0400 ++++ linux-2.4.21/Documentation/Configure.help 2005-06-01 23:12:54.547447008 -0400 +@@ -28030,6 +28030,54 @@ kernel tree does. Such modules that use library CRC32 functions require M here. @@ -103,10 +107,11 @@ diff -urNp linux-2.4.21.orig/Documentation/Configure.help linux-2.4.21/Documenta # # A couple of things I keep forgetting: # capitalize: AppleTalk, Ethernet, DOS, DMA, FAT, FTP, Internet, -diff -urNp linux-2.4.21.orig/drivers/net/Config.in linux-2.4.21/drivers/net/Config.in ---- linux-2.4.21.orig/drivers/net/Config.in 2005-05-04 15:31:24.000000000 -0400 -+++ linux-2.4.21/drivers/net/Config.in 2005-05-04 18:24:22.709038224 -0400 -@@ -272,6 +272,9 @@ dep_tristate 'Broadcom Tigon3 support' C +Index: linux-2.4.21/drivers/net/Config.in +=================================================================== +--- linux-2.4.21.orig/drivers/net/Config.in 2005-06-01 22:52:03.000000000 -0400 ++++ linux-2.4.21/drivers/net/Config.in 2005-06-01 23:12:54.549446704 -0400 +@@ -272,6 +272,9 @@ endmenu @@ -116,10 +121,11 @@ diff -urNp linux-2.4.21.orig/drivers/net/Config.in linux-2.4.21/drivers/net/Conf if [ "$CONFIG_PPC_ISERIES" = "y" ]; then dep_tristate 'iSeries Virtual Ethernet driver support' CONFIG_VETH $CONFIG_PPC_ISERIES fi -diff -urNp linux-2.4.21.orig/drivers/net/Makefile linux-2.4.21/drivers/net/Makefile ---- linux-2.4.21.orig/drivers/net/Makefile 2005-05-04 15:31:24.000000000 -0400 -+++ linux-2.4.21/drivers/net/Makefile 2005-05-04 18:24:22.709038224 -0400 -@@ -8,7 +8,7 @@ obj-m := +Index: linux-2.4.21/drivers/net/Makefile +=================================================================== +--- linux-2.4.21.orig/drivers/net/Makefile 2005-06-01 22:52:03.000000000 -0400 ++++ linux-2.4.21/drivers/net/Makefile 2005-06-01 23:12:54.550446552 -0400 +@@ -8,7 +8,7 @@ obj-n := obj- := @@ -128,17 +134,18 @@ diff -urNp linux-2.4.21.orig/drivers/net/Makefile linux-2.4.21/drivers/net/Makef O_TARGET := net.o -@@ -48,6 +48,7 @@ subdir-$(CONFIG_ARCNET) += arcnet +@@ -48,6 +48,7 @@ subdir-$(CONFIG_DEV_APPLETALK) += appletalk subdir-$(CONFIG_SK98LIN) += sk98lin subdir-$(CONFIG_SKFP) += skfp +subdir-$(CONFIG_QSNET) += qsnet subdir-$(CONFIG_E100) += e100 - subdir-$(CONFIG_E100) += e100_3027k2 subdir-$(CONFIG_E1000) += e1000 -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/Config.in linux-2.4.21/drivers/net/qsnet/Config.in ---- linux-2.4.21.orig/drivers/net/qsnet/Config.in 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/Config.in 2005-05-04 18:24:24.108825424 -0400 + subdir-$(CONFIG_BONDING) += bonding +Index: linux-2.4.21/drivers/net/qsnet/Config.in +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/Config.in 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/Config.in 2005-06-01 23:12:54.550446552 -0400 @@ -0,0 +1,25 @@ +# +# Config.in for Quadrics QsNet @@ -165,9 +172,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/Config.in linux-2.4.21/drivers/ne +dep_tristate "Switch monitoring" CONFIG_JTAG $CONFIG_QSNET + +endmenu -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/eip/eip_linux.c linux-2.4.21/drivers/net/qsnet/eip/eip_linux.c ---- linux-2.4.21.orig/drivers/net/qsnet/eip/eip_linux.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/eip/eip_linux.c 2004-12-20 11:54:05.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/eip/eip_linux.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/eip/eip_linux.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/eip/eip_linux.c 2005-06-01 23:12:54.553446096 -0400 @@ -0,0 +1,1565 @@ +/* + * Copyright (c) 2003 by Quadrics Ltd. @@ -1734,9 +1742,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/eip/eip_linux.c linux-2.4.21/driv + * c-file-style: "linux" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/eip/eip_linux.h linux-2.4.21/drivers/net/qsnet/eip/eip_linux.h ---- linux-2.4.21.orig/drivers/net/qsnet/eip/eip_linux.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/eip/eip_linux.h 2004-10-01 06:49:38.000000000 -0400 +Index: linux-2.4.21/drivers/net/qsnet/eip/eip_linux.h +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/eip/eip_linux.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/eip/eip_linux.h 2005-06-01 23:12:54.554445944 -0400 @@ -0,0 +1,399 @@ +/* + * Copyright (c) 2003 by Quadrics Ltd. @@ -2137,9 +2146,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/eip/eip_linux.h linux-2.4.21/driv + * c-file-style: "linux" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/eip/eip_stats.c linux-2.4.21/drivers/net/qsnet/eip/eip_stats.c ---- linux-2.4.21.orig/drivers/net/qsnet/eip/eip_stats.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/eip/eip_stats.c 2005-01-26 09:31:56.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/eip/eip_stats.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/eip/eip_stats.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/eip/eip_stats.c 2005-06-01 23:12:54.555445792 -0400 @@ -0,0 +1,374 @@ +/* + * Copyright (c) 2003 by Quadrics Ltd. @@ -2515,9 +2525,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/eip/eip_stats.c linux-2.4.21/driv + * c-file-style: "linux" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/eip/eip_stats.h linux-2.4.21/drivers/net/qsnet/eip/eip_stats.h ---- linux-2.4.21.orig/drivers/net/qsnet/eip/eip_stats.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/eip/eip_stats.h 2004-05-10 10:47:47.000000000 -0400 +Index: linux-2.4.21/drivers/net/qsnet/eip/eip_stats.h +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/eip/eip_stats.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/eip/eip_stats.h 2005-06-01 23:12:54.555445792 -0400 @@ -0,0 +1,22 @@ +/* + * Copyright (c) 2003 by Quadrics Ltd. @@ -2541,9 +2552,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/eip/eip_stats.h linux-2.4.21/driv +void eip_stats_dump(void); + +#endif /* __EIP_STATS_H */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/eip/Makefile linux-2.4.21/drivers/net/qsnet/eip/Makefile ---- linux-2.4.21.orig/drivers/net/qsnet/eip/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/eip/Makefile 2005-05-04 18:24:24.616748208 -0400 +Index: linux-2.4.21/drivers/net/qsnet/eip/Makefile +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/eip/Makefile 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/eip/Makefile 2005-06-01 23:12:54.555445792 -0400 @@ -0,0 +1,31 @@ +# +# Makefile for Quadrics QsNet @@ -2576,9 +2588,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/eip/Makefile linux-2.4.21/drivers + +include $(TOPDIR)/Rules.make + -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/eip/Makefile.conf linux-2.4.21/drivers/net/qsnet/eip/Makefile.conf ---- linux-2.4.21.orig/drivers/net/qsnet/eip/Makefile.conf 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/eip/Makefile.conf 2005-03-02 10:40:59.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/eip/Makefile.conf +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/eip/Makefile.conf 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/eip/Makefile.conf 2005-06-01 23:12:54.555445792 -0400 @@ -0,0 +1,10 @@ +# Flags for generating QsNet Linux Kernel Makefiles +MODNAME = eip.o @@ -2590,14 +2603,16 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/eip/Makefile.conf linux-2.4.21/dr +# EXTRALINES START + +# EXTRALINES END -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/eip/quadrics_version.h linux-2.4.21/drivers/net/qsnet/eip/quadrics_version.h ---- linux-2.4.21.orig/drivers/net/qsnet/eip/quadrics_version.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/eip/quadrics_version.h 2005-03-02 10:41:01.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/eip/quadrics_version.h +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/eip/quadrics_version.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/eip/quadrics_version.h 2005-06-01 23:12:54.556445640 -0400 @@ -0,0 +1 @@ +#define QUADRICS_VERSION "4.30qsnet" -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan/bitmap.c linux-2.4.21/drivers/net/qsnet/elan/bitmap.c ---- linux-2.4.21.orig/drivers/net/qsnet/elan/bitmap.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/elan/bitmap.c 2004-01-20 12:32:17.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/elan/bitmap.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/elan/bitmap.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/elan/bitmap.c 2005-06-01 23:12:54.556445640 -0400 @@ -0,0 +1,287 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -2886,9 +2901,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan/bitmap.c linux-2.4.21/driver + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan/capability.c linux-2.4.21/drivers/net/qsnet/elan/capability.c ---- linux-2.4.21.orig/drivers/net/qsnet/elan/capability.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/elan/capability.c 2004-07-20 06:15:33.000000000 -0400 +Index: linux-2.4.21/drivers/net/qsnet/elan/capability.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/elan/capability.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/elan/capability.c 2005-06-01 23:12:54.557445488 -0400 @@ -0,0 +1,628 @@ +/* + * Copyright (c) 2003 by Quadrics Ltd. @@ -3518,9 +3534,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan/capability.c linux-2.4.21/dr + * c-file-style: "linux" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan/capability_general.c linux-2.4.21/drivers/net/qsnet/elan/capability_general.c ---- linux-2.4.21.orig/drivers/net/qsnet/elan/capability_general.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/elan/capability_general.c 2004-02-25 08:47:59.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/elan/capability_general.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/elan/capability_general.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/elan/capability_general.c 2005-06-01 23:12:54.558445336 -0400 @@ -0,0 +1,446 @@ +/* + * Copyright (c) 2003 by Quadrics Ltd. @@ -3968,9 +3985,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan/capability_general.c linux-2 + * c-file-style: "linux" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan/device.c linux-2.4.21/drivers/net/qsnet/elan/device.c ---- linux-2.4.21.orig/drivers/net/qsnet/elan/device.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/elan/device.c 2003-09-24 09:55:37.000000000 -0400 +Index: linux-2.4.21/drivers/net/qsnet/elan/device.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/elan/device.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/elan/device.c 2005-06-01 23:12:54.559445184 -0400 @@ -0,0 +1,147 @@ +/* + * Copyright (c) 2003 by Quadrics Ltd. @@ -4119,9 +4137,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan/device.c linux-2.4.21/driver + * c-file-style: "linux" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan/devinfo.c linux-2.4.21/drivers/net/qsnet/elan/devinfo.c ---- linux-2.4.21.orig/drivers/net/qsnet/elan/devinfo.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/elan/devinfo.c 2003-09-24 09:55:37.000000000 -0400 +Index: linux-2.4.21/drivers/net/qsnet/elan/devinfo.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/elan/devinfo.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/elan/devinfo.c 2005-06-01 23:12:54.559445184 -0400 @@ -0,0 +1,78 @@ +/* + * Copyright (c) 2003 by Quadrics Ltd. @@ -4201,9 +4220,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan/devinfo.c linux-2.4.21/drive + * c-file-style: "linux" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan/elanmod.c linux-2.4.21/drivers/net/qsnet/elan/elanmod.c ---- linux-2.4.21.orig/drivers/net/qsnet/elan/elanmod.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/elan/elanmod.c 2004-06-18 05:28:16.000000000 -0400 +Index: linux-2.4.21/drivers/net/qsnet/elan/elanmod.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/elan/elanmod.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/elan/elanmod.c 2005-06-01 23:12:54.559445184 -0400 @@ -0,0 +1,149 @@ +/* + * Copyright (c) 2003 by Quadrics Ltd. @@ -4354,9 +4374,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan/elanmod.c linux-2.4.21/drive + * c-file-style: "linux" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan/elanmod_linux.c linux-2.4.21/drivers/net/qsnet/elan/elanmod_linux.c ---- linux-2.4.21.orig/drivers/net/qsnet/elan/elanmod_linux.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/elan/elanmod_linux.c 2004-06-14 11:45:37.000000000 -0400 +Index: linux-2.4.21/drivers/net/qsnet/elan/elanmod_linux.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/elan/elanmod_linux.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/elan/elanmod_linux.c 2005-06-01 23:12:54.560445032 -0400 @@ -0,0 +1,410 @@ +/* + * Copyright (c) 2003 by Quadrics Ltd. @@ -4768,9 +4789,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan/elanmod_linux.c linux-2.4.21 + * c-file-style: "linux" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan/Makefile linux-2.4.21/drivers/net/qsnet/elan/Makefile ---- linux-2.4.21.orig/drivers/net/qsnet/elan/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/elan/Makefile 2005-05-04 18:24:25.022686496 -0400 +Index: linux-2.4.21/drivers/net/qsnet/elan/Makefile +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/elan/Makefile 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/elan/Makefile 2005-06-01 23:12:54.560445032 -0400 @@ -0,0 +1,31 @@ +# +# Makefile for Quadrics QsNet @@ -4803,9 +4825,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan/Makefile linux-2.4.21/driver + +include $(TOPDIR)/Rules.make + -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan/Makefile.conf linux-2.4.21/drivers/net/qsnet/elan/Makefile.conf ---- linux-2.4.21.orig/drivers/net/qsnet/elan/Makefile.conf 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/elan/Makefile.conf 2005-03-02 10:40:50.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/elan/Makefile.conf +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/elan/Makefile.conf 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/elan/Makefile.conf 2005-06-01 23:12:54.561444880 -0400 @@ -0,0 +1,10 @@ +# Flags for generating QsNet Linux Kernel Makefiles +MODNAME = elan.o @@ -4817,14 +4840,16 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan/Makefile.conf linux-2.4.21/d +# EXTRALINES START + +# EXTRALINES END -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan/quadrics_version.h linux-2.4.21/drivers/net/qsnet/elan/quadrics_version.h ---- linux-2.4.21.orig/drivers/net/qsnet/elan/quadrics_version.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/elan/quadrics_version.h 2005-03-02 10:41:01.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/elan/quadrics_version.h +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/elan/quadrics_version.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/elan/quadrics_version.h 2005-06-01 23:12:54.561444880 -0400 @@ -0,0 +1 @@ +#define QUADRICS_VERSION "4.30qsnet" -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan/stats.c linux-2.4.21/drivers/net/qsnet/elan/stats.c ---- linux-2.4.21.orig/drivers/net/qsnet/elan/stats.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/elan/stats.c 2003-09-24 09:55:37.000000000 -0400 +Index: linux-2.4.21/drivers/net/qsnet/elan/stats.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/elan/stats.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/elan/stats.c 2005-06-01 23:12:54.562444728 -0400 @@ -0,0 +1,277 @@ +/* + * Copyright (c) 2003 by Quadrics Ltd. @@ -5103,9 +5128,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan/stats.c linux-2.4.21/drivers + * c-file-style: "linux" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan3/context.c linux-2.4.21/drivers/net/qsnet/elan3/context.c ---- linux-2.4.21.orig/drivers/net/qsnet/elan3/context.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/elan3/context.c 2004-11-12 09:24:18.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/elan3/context.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/elan3/context.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/elan3/context.c 2005-06-01 23:12:54.565444272 -0400 @@ -0,0 +1,2101 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -7208,9 +7234,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan3/context.c linux-2.4.21/driv + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan3/context_linux.c linux-2.4.21/drivers/net/qsnet/elan3/context_linux.c ---- linux-2.4.21.orig/drivers/net/qsnet/elan3/context_linux.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/elan3/context_linux.c 2004-10-28 07:54:56.000000000 -0400 +Index: linux-2.4.21/drivers/net/qsnet/elan3/context_linux.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/elan3/context_linux.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/elan3/context_linux.c 2005-06-01 23:12:54.566444120 -0400 @@ -0,0 +1,228 @@ +/* + * Copyright (c) 2003 by Quadrics Limited. @@ -7440,9 +7467,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan3/context_linux.c linux-2.4.2 + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan3/cproc.c linux-2.4.21/drivers/net/qsnet/elan3/cproc.c ---- linux-2.4.21.orig/drivers/net/qsnet/elan3/cproc.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/elan3/cproc.c 2004-02-10 10:05:10.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/elan3/cproc.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/elan3/cproc.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/elan3/cproc.c 2005-06-01 23:12:54.567443968 -0400 @@ -0,0 +1,539 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -7983,9 +8011,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan3/cproc.c linux-2.4.21/driver + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan3/dproc.c linux-2.4.21/drivers/net/qsnet/elan3/dproc.c ---- linux-2.4.21.orig/drivers/net/qsnet/elan3/dproc.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/elan3/dproc.c 2003-09-24 09:57:25.000000000 -0400 +Index: linux-2.4.21/drivers/net/qsnet/elan3/dproc.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/elan3/dproc.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/elan3/dproc.c 2005-06-01 23:12:54.568443816 -0400 @@ -0,0 +1,553 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -8540,9 +8569,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan3/dproc.c linux-2.4.21/driver + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan3/elan3mmu_generic.c linux-2.4.21/drivers/net/qsnet/elan3/elan3mmu_generic.c ---- linux-2.4.21.orig/drivers/net/qsnet/elan3/elan3mmu_generic.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/elan3/elan3mmu_generic.c 2004-12-14 05:19:51.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/elan3/elan3mmu_generic.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/elan3/elan3mmu_generic.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/elan3/elan3mmu_generic.c 2005-06-01 23:12:54.573443056 -0400 @@ -0,0 +1,3255 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -11799,9 +11829,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan3/elan3mmu_generic.c linux-2. + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan3/elan3mmu_linux.c linux-2.4.21/drivers/net/qsnet/elan3/elan3mmu_linux.c ---- linux-2.4.21.orig/drivers/net/qsnet/elan3/elan3mmu_linux.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/elan3/elan3mmu_linux.c 2004-12-14 05:19:51.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/elan3/elan3mmu_linux.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/elan3/elan3mmu_linux.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/elan3/elan3mmu_linux.c 2005-06-01 23:12:54.574442904 -0400 @@ -0,0 +1,284 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -12087,9 +12118,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan3/elan3mmu_linux.c linux-2.4. + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan3/elan3ops.c linux-2.4.21/drivers/net/qsnet/elan3/elan3ops.c ---- linux-2.4.21.orig/drivers/net/qsnet/elan3/elan3ops.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/elan3/elan3ops.c 2003-09-24 09:57:25.000000000 -0400 +Index: linux-2.4.21/drivers/net/qsnet/elan3/elan3ops.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/elan3/elan3ops.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/elan3/elan3ops.c 2005-06-01 23:12:54.575442752 -0400 @@ -0,0 +1,170 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -12261,9 +12293,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan3/elan3ops.c linux-2.4.21/dri + * c-file-style: "linux" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan3/elandebug.c linux-2.4.21/drivers/net/qsnet/elan3/elandebug.c ---- linux-2.4.21.orig/drivers/net/qsnet/elan3/elandebug.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/elan3/elandebug.c 2003-09-24 09:57:25.000000000 -0400 +Index: linux-2.4.21/drivers/net/qsnet/elan3/elandebug.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/elan3/elandebug.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/elan3/elandebug.c 2005-06-01 23:12:54.575442752 -0400 @@ -0,0 +1,151 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -12416,9 +12449,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan3/elandebug.c linux-2.4.21/dr + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan3/elandev_generic.c linux-2.4.21/drivers/net/qsnet/elan3/elandev_generic.c ---- linux-2.4.21.orig/drivers/net/qsnet/elan3/elandev_generic.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/elan3/elandev_generic.c 2004-11-15 06:12:36.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/elan3/elandev_generic.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/elan3/elandev_generic.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/elan3/elandev_generic.c 2005-06-01 23:12:54.578442296 -0400 @@ -0,0 +1,1862 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -14282,9 +14316,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan3/elandev_generic.c linux-2.4 + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan3/elandev_linux.c linux-2.4.21/drivers/net/qsnet/elan3/elandev_linux.c ---- linux-2.4.21.orig/drivers/net/qsnet/elan3/elandev_linux.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/elan3/elandev_linux.c 2004-12-20 11:55:17.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/elan3/elandev_linux.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/elan3/elandev_linux.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/elan3/elandev_linux.c 2005-06-01 23:12:54.582441688 -0400 @@ -0,0 +1,2302 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -16588,9 +16623,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan3/elandev_linux.c linux-2.4.2 + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan3/elansyscall.c linux-2.4.21/drivers/net/qsnet/elan3/elansyscall.c ---- linux-2.4.21.orig/drivers/net/qsnet/elan3/elansyscall.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/elan3/elansyscall.c 2004-10-28 13:08:56.000000000 -0400 +Index: linux-2.4.21/drivers/net/qsnet/elan3/elansyscall.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/elan3/elansyscall.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/elan3/elansyscall.c 2005-06-01 23:12:54.584441384 -0400 @@ -0,0 +1,1230 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -17822,9 +17858,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan3/elansyscall.c linux-2.4.21/ + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan3/eventcookie.c linux-2.4.21/drivers/net/qsnet/elan3/eventcookie.c ---- linux-2.4.21.orig/drivers/net/qsnet/elan3/eventcookie.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/elan3/eventcookie.c 2003-08-13 06:03:03.000000000 -0400 +Index: linux-2.4.21/drivers/net/qsnet/elan3/eventcookie.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/elan3/eventcookie.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/elan3/eventcookie.c 2005-06-01 23:12:54.585441232 -0400 @@ -0,0 +1,324 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -18150,9 +18187,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan3/eventcookie.c linux-2.4.21/ + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan3/iproc.c linux-2.4.21/drivers/net/qsnet/elan3/iproc.c ---- linux-2.4.21.orig/drivers/net/qsnet/elan3/iproc.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/elan3/iproc.c 2003-09-24 09:57:25.000000000 -0400 +Index: linux-2.4.21/drivers/net/qsnet/elan3/iproc.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/elan3/iproc.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/elan3/iproc.c 2005-06-01 23:12:54.586441080 -0400 @@ -0,0 +1,925 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -19079,9 +19117,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan3/iproc.c linux-2.4.21/driver + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan3/Makefile linux-2.4.21/drivers/net/qsnet/elan3/Makefile ---- linux-2.4.21.orig/drivers/net/qsnet/elan3/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/elan3/Makefile 2005-05-04 18:24:25.419626152 -0400 +Index: linux-2.4.21/drivers/net/qsnet/elan3/Makefile +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/elan3/Makefile 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/elan3/Makefile 2005-06-01 23:12:54.587440928 -0400 @@ -0,0 +1,31 @@ +# +# Makefile for Quadrics QsNet @@ -19114,9 +19153,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan3/Makefile linux-2.4.21/drive + +include $(TOPDIR)/Rules.make + -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan3/Makefile.conf linux-2.4.21/drivers/net/qsnet/elan3/Makefile.conf ---- linux-2.4.21.orig/drivers/net/qsnet/elan3/Makefile.conf 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/elan3/Makefile.conf 2005-03-02 10:40:51.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/elan3/Makefile.conf +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/elan3/Makefile.conf 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/elan3/Makefile.conf 2005-06-01 23:12:54.587440928 -0400 @@ -0,0 +1,10 @@ +# Flags for generating QsNet Linux Kernel Makefiles +MODNAME = elan3.o @@ -19128,9 +19168,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan3/Makefile.conf linux-2.4.21/ +# EXTRALINES START + +# EXTRALINES END -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan3/minames.c linux-2.4.21/drivers/net/qsnet/elan3/minames.c ---- linux-2.4.21.orig/drivers/net/qsnet/elan3/minames.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/elan3/minames.c 2003-06-07 11:57:49.000000000 -0400 +Index: linux-2.4.21/drivers/net/qsnet/elan3/minames.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/elan3/minames.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/elan3/minames.c 2005-06-01 23:12:54.587440928 -0400 @@ -0,0 +1,38 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -19170,9 +19211,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan3/minames.c linux-2.4.21/driv + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan3/network_error.c linux-2.4.21/drivers/net/qsnet/elan3/network_error.c ---- linux-2.4.21.orig/drivers/net/qsnet/elan3/network_error.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/elan3/network_error.c 2004-10-28 07:54:57.000000000 -0400 +Index: linux-2.4.21/drivers/net/qsnet/elan3/network_error.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/elan3/network_error.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/elan3/network_error.c 2005-06-01 23:12:54.589440624 -0400 @@ -0,0 +1,777 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -19951,9 +19993,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan3/network_error.c linux-2.4.2 + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan3/procfs_linux.c linux-2.4.21/drivers/net/qsnet/elan3/procfs_linux.c ---- linux-2.4.21.orig/drivers/net/qsnet/elan3/procfs_linux.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/elan3/procfs_linux.c 2003-09-24 09:57:25.000000000 -0400 +Index: linux-2.4.21/drivers/net/qsnet/elan3/procfs_linux.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/elan3/procfs_linux.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/elan3/procfs_linux.c 2005-06-01 23:12:54.589440624 -0400 @@ -0,0 +1,195 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -20150,14 +20193,16 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan3/procfs_linux.c linux-2.4.21 + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan3/quadrics_version.h linux-2.4.21/drivers/net/qsnet/elan3/quadrics_version.h ---- linux-2.4.21.orig/drivers/net/qsnet/elan3/quadrics_version.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/elan3/quadrics_version.h 2005-03-02 10:41:01.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/elan3/quadrics_version.h +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/elan3/quadrics_version.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/elan3/quadrics_version.h 2005-06-01 23:12:54.589440624 -0400 @@ -0,0 +1 @@ +#define QUADRICS_VERSION "4.30qsnet" -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan3/routecheck.c linux-2.4.21/drivers/net/qsnet/elan3/routecheck.c ---- linux-2.4.21.orig/drivers/net/qsnet/elan3/routecheck.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/elan3/routecheck.c 2003-09-24 09:57:25.000000000 -0400 +Index: linux-2.4.21/drivers/net/qsnet/elan3/routecheck.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/elan3/routecheck.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/elan3/routecheck.c 2005-06-01 23:12:54.590440472 -0400 @@ -0,0 +1,313 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -20472,9 +20517,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan3/routecheck.c linux-2.4.21/d + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan3/route_table.c linux-2.4.21/drivers/net/qsnet/elan3/route_table.c ---- linux-2.4.21.orig/drivers/net/qsnet/elan3/route_table.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/elan3/route_table.c 2003-09-24 09:57:25.000000000 -0400 +Index: linux-2.4.21/drivers/net/qsnet/elan3/route_table.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/elan3/route_table.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/elan3/route_table.c 2005-06-01 23:12:54.591440320 -0400 @@ -0,0 +1,560 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -21036,9 +21082,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan3/route_table.c linux-2.4.21/ + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan3/sdram.c linux-2.4.21/drivers/net/qsnet/elan3/sdram.c ---- linux-2.4.21.orig/drivers/net/qsnet/elan3/sdram.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/elan3/sdram.c 2003-09-24 09:57:25.000000000 -0400 +Index: linux-2.4.21/drivers/net/qsnet/elan3/sdram.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/elan3/sdram.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/elan3/sdram.c 2005-06-01 23:12:54.593440016 -0400 @@ -0,0 +1,807 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -21847,9 +21894,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan3/sdram.c linux-2.4.21/driver + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan3/tproc.c linux-2.4.21/drivers/net/qsnet/elan3/tproc.c ---- linux-2.4.21.orig/drivers/net/qsnet/elan3/tproc.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/elan3/tproc.c 2004-11-15 06:12:36.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/elan3/tproc.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/elan3/tproc.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/elan3/tproc.c 2005-06-01 23:12:54.594439864 -0400 @@ -0,0 +1,778 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -22629,9 +22677,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan3/tproc.c linux-2.4.21/driver + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan3/tprocinsts.c linux-2.4.21/drivers/net/qsnet/elan3/tprocinsts.c ---- linux-2.4.21.orig/drivers/net/qsnet/elan3/tprocinsts.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/elan3/tprocinsts.c 2003-09-24 09:57:25.000000000 -0400 +Index: linux-2.4.21/drivers/net/qsnet/elan3/tprocinsts.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/elan3/tprocinsts.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/elan3/tprocinsts.c 2005-06-01 23:12:54.595439712 -0400 @@ -0,0 +1,401 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -23034,9 +23083,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan3/tprocinsts.c linux-2.4.21/d + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan3/tproc_linux.c linux-2.4.21/drivers/net/qsnet/elan3/tproc_linux.c ---- linux-2.4.21.orig/drivers/net/qsnet/elan3/tproc_linux.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/elan3/tproc_linux.c 2004-10-28 13:08:56.000000000 -0400 +Index: linux-2.4.21/drivers/net/qsnet/elan3/tproc_linux.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/elan3/tproc_linux.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/elan3/tproc_linux.c 2005-06-01 23:12:54.596439560 -0400 @@ -0,0 +1,215 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -23253,9 +23303,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan3/tproc_linux.c linux-2.4.21/ + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan3/virtual_process.c linux-2.4.21/drivers/net/qsnet/elan3/virtual_process.c ---- linux-2.4.21.orig/drivers/net/qsnet/elan3/virtual_process.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/elan3/virtual_process.c 2004-06-07 09:50:10.000000000 -0400 +Index: linux-2.4.21/drivers/net/qsnet/elan3/virtual_process.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/elan3/virtual_process.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/elan3/virtual_process.c 2005-06-01 23:12:54.597439408 -0400 @@ -0,0 +1,884 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -24141,9 +24192,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan3/virtual_process.c linux-2.4 + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan4/debug.c linux-2.4.21/drivers/net/qsnet/elan4/debug.c ---- linux-2.4.21.orig/drivers/net/qsnet/elan4/debug.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/elan4/debug.c 2004-07-07 07:22:33.000000000 -0400 +Index: linux-2.4.21/drivers/net/qsnet/elan4/debug.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/elan4/debug.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/elan4/debug.c 2005-06-01 23:12:54.597439408 -0400 @@ -0,0 +1,94 @@ +/* + * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd. @@ -24239,9 +24291,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan4/debug.c linux-2.4.21/driver + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan4/device.c linux-2.4.21/drivers/net/qsnet/elan4/device.c ---- linux-2.4.21.orig/drivers/net/qsnet/elan4/device.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/elan4/device.c 2005-01-18 09:25:35.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/elan4/device.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/elan4/device.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/elan4/device.c 2005-06-01 23:12:54.602438648 -0400 @@ -0,0 +1,2805 @@ +/* + * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd. @@ -27048,9 +27101,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan4/device.c linux-2.4.21/drive + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan4/device_Linux.c linux-2.4.21/drivers/net/qsnet/elan4/device_Linux.c ---- linux-2.4.21.orig/drivers/net/qsnet/elan4/device_Linux.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/elan4/device_Linux.c 2005-01-18 09:44:11.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/elan4/device_Linux.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/elan4/device_Linux.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/elan4/device_Linux.c 2005-06-01 23:12:54.606438040 -0400 @@ -0,0 +1,2625 @@ +/* + * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd. @@ -29677,9 +29731,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan4/device_Linux.c linux-2.4.21 + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan4/i2c.c linux-2.4.21/drivers/net/qsnet/elan4/i2c.c ---- linux-2.4.21.orig/drivers/net/qsnet/elan4/i2c.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/elan4/i2c.c 2004-01-07 08:37:45.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/elan4/i2c.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/elan4/i2c.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/elan4/i2c.c 2005-06-01 23:12:54.607437888 -0400 @@ -0,0 +1,248 @@ +/* + * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd. @@ -29929,9 +29984,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan4/i2c.c linux-2.4.21/drivers/ + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan4/intcookie.c linux-2.4.21/drivers/net/qsnet/elan4/intcookie.c ---- linux-2.4.21.orig/drivers/net/qsnet/elan4/intcookie.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/elan4/intcookie.c 2004-08-09 10:02:37.000000000 -0400 +Index: linux-2.4.21/drivers/net/qsnet/elan4/intcookie.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/elan4/intcookie.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/elan4/intcookie.c 2005-06-01 23:12:54.608437736 -0400 @@ -0,0 +1,371 @@ +/* + * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd. @@ -30304,9 +30360,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan4/intcookie.c linux-2.4.21/dr + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan4/Makefile linux-2.4.21/drivers/net/qsnet/elan4/Makefile ---- linux-2.4.21.orig/drivers/net/qsnet/elan4/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/elan4/Makefile 2005-05-04 18:24:25.813566264 -0400 +Index: linux-2.4.21/drivers/net/qsnet/elan4/Makefile +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/elan4/Makefile 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/elan4/Makefile 2005-06-01 23:12:54.608437736 -0400 @@ -0,0 +1,31 @@ +# +# Makefile for Quadrics QsNet @@ -30339,9 +30396,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan4/Makefile linux-2.4.21/drive + +include $(TOPDIR)/Rules.make + -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan4/Makefile.conf linux-2.4.21/drivers/net/qsnet/elan4/Makefile.conf ---- linux-2.4.21.orig/drivers/net/qsnet/elan4/Makefile.conf 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/elan4/Makefile.conf 2005-03-02 10:40:54.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/elan4/Makefile.conf +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/elan4/Makefile.conf 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/elan4/Makefile.conf 2005-06-01 23:12:54.608437736 -0400 @@ -0,0 +1,10 @@ +# Flags for generating QsNet Linux Kernel Makefiles +MODNAME = elan4.o @@ -30353,9 +30411,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan4/Makefile.conf linux-2.4.21/ +# EXTRALINES START + +# EXTRALINES END -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan4/mmu.c linux-2.4.21/drivers/net/qsnet/elan4/mmu.c ---- linux-2.4.21.orig/drivers/net/qsnet/elan4/mmu.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/elan4/mmu.c 2005-01-18 11:58:12.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/elan4/mmu.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/elan4/mmu.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/elan4/mmu.c 2005-06-01 23:12:54.610437432 -0400 @@ -0,0 +1,854 @@ +/* + * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd. @@ -31211,9 +31270,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan4/mmu.c linux-2.4.21/drivers/ + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan4/mmu_Linux.c linux-2.4.21/drivers/net/qsnet/elan4/mmu_Linux.c ---- linux-2.4.21.orig/drivers/net/qsnet/elan4/mmu_Linux.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/elan4/mmu_Linux.c 2004-05-10 10:10:46.000000000 -0400 +Index: linux-2.4.21/drivers/net/qsnet/elan4/mmu_Linux.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/elan4/mmu_Linux.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/elan4/mmu_Linux.c 2005-06-01 23:12:54.611437280 -0400 @@ -0,0 +1,265 @@ +/* + * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd. @@ -31480,9 +31540,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan4/mmu_Linux.c linux-2.4.21/dr + +EXPORT_SYMBOL(elan4mmu_phys2pte); +EXPORT_SYMBOL(elan4mmu_pte2phys); -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan4/neterr.c linux-2.4.21/drivers/net/qsnet/elan4/neterr.c ---- linux-2.4.21.orig/drivers/net/qsnet/elan4/neterr.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/elan4/neterr.c 2004-11-05 08:11:17.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/elan4/neterr.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/elan4/neterr.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/elan4/neterr.c 2005-06-01 23:12:54.612437128 -0400 @@ -0,0 +1,270 @@ +/* + * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd. @@ -31754,9 +31815,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan4/neterr.c linux-2.4.21/drive + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan4/procfs_Linux.c linux-2.4.21/drivers/net/qsnet/elan4/procfs_Linux.c ---- linux-2.4.21.orig/drivers/net/qsnet/elan4/procfs_Linux.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/elan4/procfs_Linux.c 2005-01-18 09:36:17.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/elan4/procfs_Linux.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/elan4/procfs_Linux.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/elan4/procfs_Linux.c 2005-06-01 23:12:54.613436976 -0400 @@ -0,0 +1,1041 @@ +/* + * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd. @@ -32799,14 +32861,16 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan4/procfs_Linux.c linux-2.4.21 + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan4/quadrics_version.h linux-2.4.21/drivers/net/qsnet/elan4/quadrics_version.h ---- linux-2.4.21.orig/drivers/net/qsnet/elan4/quadrics_version.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/elan4/quadrics_version.h 2005-03-02 10:41:01.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/elan4/quadrics_version.h +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/elan4/quadrics_version.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/elan4/quadrics_version.h 2005-06-01 23:12:54.614436824 -0400 @@ -0,0 +1 @@ +#define QUADRICS_VERSION "4.30qsnet" -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan4/regions.c linux-2.4.21/drivers/net/qsnet/elan4/regions.c ---- linux-2.4.21.orig/drivers/net/qsnet/elan4/regions.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/elan4/regions.c 2004-11-18 06:31:08.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/elan4/regions.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/elan4/regions.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/elan4/regions.c 2005-06-01 23:12:54.615436672 -0400 @@ -0,0 +1,609 @@ +/* + * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd. @@ -33417,9 +33481,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan4/regions.c linux-2.4.21/driv + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan4/routetable.c linux-2.4.21/drivers/net/qsnet/elan4/routetable.c ---- linux-2.4.21.orig/drivers/net/qsnet/elan4/routetable.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/elan4/routetable.c 2004-07-20 05:29:40.000000000 -0400 +Index: linux-2.4.21/drivers/net/qsnet/elan4/routetable.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/elan4/routetable.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/elan4/routetable.c 2005-06-01 23:12:54.615436672 -0400 @@ -0,0 +1,249 @@ +/* + * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd. @@ -33670,9 +33735,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan4/routetable.c linux-2.4.21/d + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan4/sdram.c linux-2.4.21/drivers/net/qsnet/elan4/sdram.c ---- linux-2.4.21.orig/drivers/net/qsnet/elan4/sdram.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/elan4/sdram.c 2004-11-29 06:39:13.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/elan4/sdram.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/elan4/sdram.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/elan4/sdram.c 2005-06-01 23:12:54.617436368 -0400 @@ -0,0 +1,1034 @@ +/* + * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd. @@ -34708,9 +34774,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan4/sdram.c linux-2.4.21/driver + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan4/trap.c linux-2.4.21/drivers/net/qsnet/elan4/trap.c ---- linux-2.4.21.orig/drivers/net/qsnet/elan4/trap.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/elan4/trap.c 2004-11-03 09:24:32.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/elan4/trap.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/elan4/trap.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/elan4/trap.c 2005-06-01 23:12:54.619436064 -0400 @@ -0,0 +1,778 @@ +/* + * Copyright (c) 2002-2003 by Quadrics Ltd. @@ -35490,9 +35557,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan4/trap.c linux-2.4.21/drivers + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan4/user.c linux-2.4.21/drivers/net/qsnet/elan4/user.c ---- linux-2.4.21.orig/drivers/net/qsnet/elan4/user.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/elan4/user.c 2004-12-20 11:56:51.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/elan4/user.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/elan4/user.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/elan4/user.c 2005-06-01 23:12:54.624435304 -0400 @@ -0,0 +1,3352 @@ +/* + * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd. @@ -38846,9 +38914,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan4/user.c linux-2.4.21/drivers + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan4/user_ddcq.c linux-2.4.21/drivers/net/qsnet/elan4/user_ddcq.c ---- linux-2.4.21.orig/drivers/net/qsnet/elan4/user_ddcq.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/elan4/user_ddcq.c 2004-06-23 07:06:05.000000000 -0400 +Index: linux-2.4.21/drivers/net/qsnet/elan4/user_ddcq.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/elan4/user_ddcq.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/elan4/user_ddcq.c 2005-06-01 23:12:54.625435152 -0400 @@ -0,0 +1,226 @@ +/* + * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd. @@ -39076,9 +39145,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan4/user_ddcq.c linux-2.4.21/dr + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan4/user_Linux.c linux-2.4.21/drivers/net/qsnet/elan4/user_Linux.c ---- linux-2.4.21.orig/drivers/net/qsnet/elan4/user_Linux.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/elan4/user_Linux.c 2005-01-18 09:36:10.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/elan4/user_Linux.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/elan4/user_Linux.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/elan4/user_Linux.c 2005-06-01 23:12:54.626435000 -0400 @@ -0,0 +1,377 @@ +/* + * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd. @@ -39457,9 +39527,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/elan4/user_Linux.c linux-2.4.21/d + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/asm_elan4_thread.S linux-2.4.21/drivers/net/qsnet/ep/asm_elan4_thread.S ---- linux-2.4.21.orig/drivers/net/qsnet/ep/asm_elan4_thread.S 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/asm_elan4_thread.S 2003-09-23 09:55:11.000000000 -0400 +Index: linux-2.4.21/drivers/net/qsnet/ep/asm_elan4_thread.S +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/asm_elan4_thread.S 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/asm_elan4_thread.S 2005-06-01 23:12:54.626435000 -0400 @@ -0,0 +1,78 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -39539,9 +39610,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/asm_elan4_thread.S linux-2.4.2 + jmpl %r2+8, %r0 // and return + add %sp, 192, %sp + -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/assym_elan4.h linux-2.4.21/drivers/net/qsnet/ep/assym_elan4.h ---- linux-2.4.21.orig/drivers/net/qsnet/ep/assym_elan4.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/assym_elan4.h 2005-03-02 10:40:56.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/ep/assym_elan4.h +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/assym_elan4.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/assym_elan4.h 2005-06-01 23:12:54.627434848 -0400 @@ -0,0 +1,20 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -39563,9 +39635,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/assym_elan4.h linux-2.4.21/dri +#define EP4_RXD_NEXT 664 +#define EP4_RXD_QUEUED 728 +#define EP4_RXD_DEBUG 944 -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/cm.c linux-2.4.21/drivers/net/qsnet/ep/cm.c ---- linux-2.4.21.orig/drivers/net/qsnet/ep/cm.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/cm.c 2005-01-13 07:37:57.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/ep/cm.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/cm.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/cm.c 2005-06-01 23:12:54.632434088 -0400 @@ -0,0 +1,3000 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -42567,9 +42640,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/cm.c linux-2.4.21/drivers/net/ + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/cm.h linux-2.4.21/drivers/net/qsnet/ep/cm.h ---- linux-2.4.21.orig/drivers/net/qsnet/ep/cm.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/cm.h 2004-11-12 05:54:50.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/ep/cm.h +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/cm.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/cm.h 2005-06-01 23:12:54.633433936 -0400 @@ -0,0 +1,412 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -42983,9 +43057,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/cm.h linux-2.4.21/drivers/net/ + */ +#endif /* __ELAN_CM_H */ + -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/cm_procfs.c linux-2.4.21/drivers/net/qsnet/ep/cm_procfs.c ---- linux-2.4.21.orig/drivers/net/qsnet/ep/cm_procfs.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/cm_procfs.c 2004-05-14 05:23:13.000000000 -0400 +Index: linux-2.4.21/drivers/net/qsnet/ep/cm_procfs.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/cm_procfs.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/cm_procfs.c 2005-06-01 23:12:54.633433936 -0400 @@ -0,0 +1,254 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -43241,9 +43316,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/cm_procfs.c linux-2.4.21/drive + + remove_proc_entry ("machine_id", ep_config_root); +} -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/commands_elan4.c linux-2.4.21/drivers/net/qsnet/ep/commands_elan4.c ---- linux-2.4.21.orig/drivers/net/qsnet/ep/commands_elan4.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/commands_elan4.c 2003-10-23 11:07:53.000000000 -0400 +Index: linux-2.4.21/drivers/net/qsnet/ep/commands_elan4.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/commands_elan4.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/commands_elan4.c 2005-06-01 23:12:54.634433784 -0400 @@ -0,0 +1,173 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -43418,9 +43494,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/commands_elan4.c linux-2.4.21/ + elan4_command_write (cq, *ptr++, i); +} + -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/conf_linux.c linux-2.4.21/drivers/net/qsnet/ep/conf_linux.c ---- linux-2.4.21.orig/drivers/net/qsnet/ep/conf_linux.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/conf_linux.c 2005-01-18 09:47:35.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/ep/conf_linux.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/conf_linux.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/conf_linux.c 2005-06-01 23:12:54.635433632 -0400 @@ -0,0 +1,309 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -43731,9 +43808,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/conf_linux.c linux-2.4.21/driv + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/conf_linux.h linux-2.4.21/drivers/net/qsnet/ep/conf_linux.h ---- linux-2.4.21.orig/drivers/net/qsnet/ep/conf_linux.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/conf_linux.h 2003-10-02 10:16:07.000000000 -0400 +Index: linux-2.4.21/drivers/net/qsnet/ep/conf_linux.h +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/conf_linux.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/conf_linux.h 2005-06-01 23:12:54.635433632 -0400 @@ -0,0 +1,29 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -43764,9 +43842,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/conf_linux.h linux-2.4.21/driv + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/debug.c linux-2.4.21/drivers/net/qsnet/ep/debug.c ---- linux-2.4.21.orig/drivers/net/qsnet/ep/debug.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/debug.c 2004-11-12 05:54:50.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/ep/debug.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/debug.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/debug.c 2005-06-01 23:12:54.635433632 -0400 @@ -0,0 +1,145 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -43913,9 +43992,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/debug.c linux-2.4.21/drivers/n + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/debug_elan4.c linux-2.4.21/drivers/net/qsnet/ep/debug_elan4.c ---- linux-2.4.21.orig/drivers/net/qsnet/ep/debug_elan4.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/debug_elan4.c 2004-05-19 06:21:04.000000000 -0400 +Index: linux-2.4.21/drivers/net/qsnet/ep/debug_elan4.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/debug_elan4.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/debug_elan4.c 2005-06-01 23:12:54.636433480 -0400 @@ -0,0 +1,59 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -43976,9 +44056,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/debug_elan4.c linux-2.4.21/dri + ep_display_rmap (rail->r_generic.ElanAllocator.ResourceMap); +} + -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/debug.h linux-2.4.21/drivers/net/qsnet/ep/debug.h ---- linux-2.4.21.orig/drivers/net/qsnet/ep/debug.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/debug.h 2004-11-12 05:54:50.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/ep/debug.h +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/debug.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/debug.h 2005-06-01 23:12:54.636433480 -0400 @@ -0,0 +1,109 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -44089,9 +44170,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/debug.h linux-2.4.21/drivers/n + */ +#endif /* _ELAN3_EPDEBUG_H */ + -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/epcomms_asm_elan4_thread.S linux-2.4.21/drivers/net/qsnet/ep/epcomms_asm_elan4_thread.S ---- linux-2.4.21.orig/drivers/net/qsnet/ep/epcomms_asm_elan4_thread.S 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/epcomms_asm_elan4_thread.S 2004-04-25 07:25:43.000000000 -0400 +Index: linux-2.4.21/drivers/net/qsnet/ep/epcomms_asm_elan4_thread.S +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/epcomms_asm_elan4_thread.S 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/epcomms_asm_elan4_thread.S 2005-06-01 23:12:54.637433328 -0400 @@ -0,0 +1,133 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -44226,9 +44308,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/epcomms_asm_elan4_thread.S lin + jmpl %r7+8, %r0 // and return + add %sp, 192, %sp + -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/epcomms.c linux-2.4.21/drivers/net/qsnet/ep/epcomms.c ---- linux-2.4.21.orig/drivers/net/qsnet/ep/epcomms.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/epcomms.c 2004-11-30 07:02:16.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/ep/epcomms.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/epcomms.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/epcomms.c 2005-06-01 23:12:54.637433328 -0400 @@ -0,0 +1,484 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -44714,9 +44797,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/epcomms.c linux-2.4.21/drivers + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/epcomms_elan3.c linux-2.4.21/drivers/net/qsnet/ep/epcomms_elan3.c ---- linux-2.4.21.orig/drivers/net/qsnet/ep/epcomms_elan3.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/epcomms_elan3.c 2004-08-03 07:34:34.000000000 -0400 +Index: linux-2.4.21/drivers/net/qsnet/ep/epcomms_elan3.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/epcomms_elan3.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/epcomms_elan3.c 2005-06-01 23:12:54.638433176 -0400 @@ -0,0 +1,191 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -44909,9 +44993,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/epcomms_elan3.c linux-2.4.21/d + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/epcomms_elan3.h linux-2.4.21/drivers/net/qsnet/ep/epcomms_elan3.h ---- linux-2.4.21.orig/drivers/net/qsnet/ep/epcomms_elan3.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/epcomms_elan3.h 2004-11-12 05:54:51.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/ep/epcomms_elan3.h +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/epcomms_elan3.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/epcomms_elan3.h 2005-06-01 23:12:54.639433024 -0400 @@ -0,0 +1,330 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -45243,9 +45328,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/epcomms_elan3.h linux-2.4.21/d + * End: + */ +#endif /* __EPCOMMS_ELAN3_H */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/epcomms_elan3_thread.c linux-2.4.21/drivers/net/qsnet/ep/epcomms_elan3_thread.c ---- linux-2.4.21.orig/drivers/net/qsnet/ep/epcomms_elan3_thread.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/epcomms_elan3_thread.c 2004-01-20 06:03:15.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/ep/epcomms_elan3_thread.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/epcomms_elan3_thread.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/epcomms_elan3_thread.c 2005-06-01 23:12:54.640432872 -0400 @@ -0,0 +1,296 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -45543,9 +45629,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/epcomms_elan3_thread.c linux-2 + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/epcomms_elan4.c linux-2.4.21/drivers/net/qsnet/ep/epcomms_elan4.c ---- linux-2.4.21.orig/drivers/net/qsnet/ep/epcomms_elan4.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/epcomms_elan4.c 2004-10-28 07:53:28.000000000 -0400 +Index: linux-2.4.21/drivers/net/qsnet/ep/epcomms_elan4.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/epcomms_elan4.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/epcomms_elan4.c 2005-06-01 23:12:54.640432872 -0400 @@ -0,0 +1,392 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -45939,9 +46026,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/epcomms_elan4.c linux-2.4.21/d + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/epcomms_elan4.h linux-2.4.21/drivers/net/qsnet/ep/epcomms_elan4.h ---- linux-2.4.21.orig/drivers/net/qsnet/ep/epcomms_elan4.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/epcomms_elan4.h 2004-11-12 05:54:51.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/ep/epcomms_elan4.h +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/epcomms_elan4.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/epcomms_elan4.h 2005-06-01 23:12:54.641432720 -0400 @@ -0,0 +1,470 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -46413,9 +46501,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/epcomms_elan4.h linux-2.4.21/d + * End: + */ +#endif /* __EPCOMMS_ELAN4_H */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/epcomms_elan4_thread.c linux-2.4.21/drivers/net/qsnet/ep/epcomms_elan4_thread.c ---- linux-2.4.21.orig/drivers/net/qsnet/ep/epcomms_elan4_thread.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/epcomms_elan4_thread.c 2004-09-28 06:36:51.000000000 -0400 +Index: linux-2.4.21/drivers/net/qsnet/ep/epcomms_elan4_thread.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/epcomms_elan4_thread.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/epcomms_elan4_thread.c 2005-06-01 23:12:54.642432568 -0400 @@ -0,0 +1,346 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -46763,9 +46852,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/epcomms_elan4_thread.c linux-2 + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/epcommsFwd.c linux-2.4.21/drivers/net/qsnet/ep/epcommsFwd.c ---- linux-2.4.21.orig/drivers/net/qsnet/ep/epcommsFwd.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/epcommsFwd.c 2004-08-16 08:21:15.000000000 -0400 +Index: linux-2.4.21/drivers/net/qsnet/ep/epcommsFwd.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/epcommsFwd.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/epcommsFwd.c 2005-06-01 23:12:54.643432416 -0400 @@ -0,0 +1,310 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -47077,9 +47167,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/epcommsFwd.c linux-2.4.21/driv + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/epcommsRx.c linux-2.4.21/drivers/net/qsnet/ep/epcommsRx.c ---- linux-2.4.21.orig/drivers/net/qsnet/ep/epcommsRx.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/epcommsRx.c 2004-11-30 07:02:16.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/ep/epcommsRx.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/epcommsRx.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/epcommsRx.c 2005-06-01 23:12:54.645432112 -0400 @@ -0,0 +1,1205 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -48286,9 +48377,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/epcommsRx.c linux-2.4.21/drive + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/epcommsRx_elan3.c linux-2.4.21/drivers/net/qsnet/ep/epcommsRx_elan3.c ---- linux-2.4.21.orig/drivers/net/qsnet/ep/epcommsRx_elan3.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/epcommsRx_elan3.c 2004-11-15 06:05:49.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/ep/epcommsRx_elan3.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/epcommsRx_elan3.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/epcommsRx_elan3.c 2005-06-01 23:12:54.649431504 -0400 @@ -0,0 +1,1776 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -50066,9 +50158,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/epcommsRx_elan3.c linux-2.4.21 + /* EP3_RCVR_RAIL * ep4rcvr_rail = (EP3_RCVR_RAIL *) rcvr_rail; */ +} + -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/epcommsRx_elan4.c linux-2.4.21/drivers/net/qsnet/ep/epcommsRx_elan4.c ---- linux-2.4.21.orig/drivers/net/qsnet/ep/epcommsRx_elan4.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/epcommsRx_elan4.c 2004-11-12 05:54:51.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/ep/epcommsRx_elan4.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/epcommsRx_elan4.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/epcommsRx_elan4.c 2005-06-01 23:12:54.653430896 -0400 @@ -0,0 +1,1758 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -51828,9 +51921,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/epcommsRx_elan4.c linux-2.4.21 + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/epcommsTx.c linux-2.4.21/drivers/net/qsnet/ep/epcommsTx.c ---- linux-2.4.21.orig/drivers/net/qsnet/ep/epcommsTx.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/epcommsTx.c 2004-12-09 05:02:42.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/ep/epcommsTx.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/epcommsTx.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/epcommsTx.c 2005-06-01 23:12:54.654430744 -0400 @@ -0,0 +1,919 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -52751,9 +52845,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/epcommsTx.c linux-2.4.21/drive + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/epcommsTx_elan3.c linux-2.4.21/drivers/net/qsnet/ep/epcommsTx_elan3.c ---- linux-2.4.21.orig/drivers/net/qsnet/ep/epcommsTx_elan3.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/epcommsTx_elan3.c 2004-11-12 05:54:51.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/ep/epcommsTx_elan3.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/epcommsTx_elan3.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/epcommsTx_elan3.c 2005-06-01 23:12:54.657430288 -0400 @@ -0,0 +1,1173 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -53928,9 +54023,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/epcommsTx_elan3.c linux-2.4.21 + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/epcommsTx_elan4.c linux-2.4.21/drivers/net/qsnet/ep/epcommsTx_elan4.c ---- linux-2.4.21.orig/drivers/net/qsnet/ep/epcommsTx_elan4.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/epcommsTx_elan4.c 2004-11-12 05:54:51.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/ep/epcommsTx_elan4.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/epcommsTx_elan4.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/epcommsTx_elan4.c 2005-06-01 23:12:54.659429984 -0400 @@ -0,0 +1,1389 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -55321,9 +55417,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/epcommsTx_elan4.c linux-2.4.21 + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/ep_procfs.c linux-2.4.21/drivers/net/qsnet/ep/ep_procfs.c ---- linux-2.4.21.orig/drivers/net/qsnet/ep/ep_procfs.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/ep_procfs.c 2004-11-30 05:10:57.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/ep/ep_procfs.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/ep_procfs.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/ep_procfs.c 2005-06-01 23:12:54.660429832 -0400 @@ -0,0 +1,331 @@ + +/* @@ -55656,9 +55753,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/ep_procfs.c linux-2.4.21/drive + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/kalloc.c linux-2.4.21/drivers/net/qsnet/ep/kalloc.c ---- linux-2.4.21.orig/drivers/net/qsnet/ep/kalloc.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/kalloc.c 2004-12-14 05:19:14.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/ep/kalloc.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/kalloc.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/kalloc.c 2005-06-01 23:12:54.661429680 -0400 @@ -0,0 +1,677 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -56337,9 +56435,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/kalloc.c linux-2.4.21/drivers/ + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/kcomm.c linux-2.4.21/drivers/net/qsnet/ep/kcomm.c ---- linux-2.4.21.orig/drivers/net/qsnet/ep/kcomm.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/kcomm.c 2004-12-09 05:02:42.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/ep/kcomm.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/kcomm.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/kcomm.c 2005-06-01 23:12:54.664429224 -0400 @@ -0,0 +1,1448 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -57789,9 +57888,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/kcomm.c linux-2.4.21/drivers/n + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/kcomm_elan3.c linux-2.4.21/drivers/net/qsnet/ep/kcomm_elan3.c ---- linux-2.4.21.orig/drivers/net/qsnet/ep/kcomm_elan3.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/kcomm_elan3.c 2004-11-30 07:02:17.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/ep/kcomm_elan3.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/kcomm_elan3.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/kcomm_elan3.c 2005-06-01 23:12:54.665429072 -0400 @@ -0,0 +1,504 @@ + +/* @@ -58297,9 +58397,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/kcomm_elan3.c linux-2.4.21/dri + /* no stats here yet */ + /* EP3_RAIL *ep3rail = (EP3_RAIL *)r; */ +} -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/kcomm_elan3.h linux-2.4.21/drivers/net/qsnet/ep/kcomm_elan3.h ---- linux-2.4.21.orig/drivers/net/qsnet/ep/kcomm_elan3.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/kcomm_elan3.h 2004-12-14 05:19:14.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/ep/kcomm_elan3.h +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/kcomm_elan3.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/kcomm_elan3.h 2005-06-01 23:12:54.666428920 -0400 @@ -0,0 +1,431 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -58732,9 +58833,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/kcomm_elan3.h linux-2.4.21/dri +#endif /* !defined(__ELAN3__) */ + +#endif /* __EP_KCOMM_ELAN3_H */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/kcomm_elan4.c linux-2.4.21/drivers/net/qsnet/ep/kcomm_elan4.c ---- linux-2.4.21.orig/drivers/net/qsnet/ep/kcomm_elan4.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/kcomm_elan4.c 2004-11-30 07:02:17.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/ep/kcomm_elan4.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/kcomm_elan4.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/kcomm_elan4.c 2005-06-01 23:12:54.667428768 -0400 @@ -0,0 +1,526 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -59262,9 +59364,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/kcomm_elan4.c linux-2.4.21/dri + /* no stats here yet */ + /* EP4_RAIL *ep4rail = (EP4_RAIL *)r; */ +} -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/kcomm_elan4.h linux-2.4.21/drivers/net/qsnet/ep/kcomm_elan4.h ---- linux-2.4.21.orig/drivers/net/qsnet/ep/kcomm_elan4.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/kcomm_elan4.h 2004-12-14 05:19:14.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/ep/kcomm_elan4.h +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/kcomm_elan4.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/kcomm_elan4.h 2005-06-01 23:12:54.668428616 -0400 @@ -0,0 +1,443 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -59709,9 +59812,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/kcomm_elan4.h linux-2.4.21/dri +#endif /* ! defined(__elan4__) */ + +#endif /* __EP_KCOMM_ELAN4_H */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/kcomm_vp.h linux-2.4.21/drivers/net/qsnet/ep/kcomm_vp.h ---- linux-2.4.21.orig/drivers/net/qsnet/ep/kcomm_vp.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/kcomm_vp.h 2004-03-24 06:32:56.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/ep/kcomm_vp.h +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/kcomm_vp.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/kcomm_vp.h 2005-06-01 23:12:54.668428616 -0400 @@ -0,0 +1,36 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -59749,9 +59853,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/kcomm_vp.h linux-2.4.21/driver +#endif /* __EP_KCOMM_VP_H */ + + -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/kmap.c linux-2.4.21/drivers/net/qsnet/ep/kmap.c ---- linux-2.4.21.orig/drivers/net/qsnet/ep/kmap.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/kmap.c 2004-12-14 05:19:14.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/ep/kmap.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/kmap.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/kmap.c 2005-06-01 23:12:54.669428464 -0400 @@ -0,0 +1,561 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -60314,9 +60419,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/kmap.c linux-2.4.21/drivers/ne + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/kmap_elan3.c linux-2.4.21/drivers/net/qsnet/ep/kmap_elan3.c ---- linux-2.4.21.orig/drivers/net/qsnet/ep/kmap_elan3.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/kmap_elan3.c 2004-12-14 05:19:14.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/ep/kmap_elan3.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/kmap_elan3.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/kmap_elan3.c 2005-06-01 23:12:54.670428312 -0400 @@ -0,0 +1,209 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -60527,9 +60633,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/kmap_elan3.c linux-2.4.21/driv + for (i = (npages * ELAN3_PTES_PER_PAGE) - 1; i >= 0; i--) + elan3_writepte (rail->Device, ptep[i], tpte); +} -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/kmap_elan4.c linux-2.4.21/drivers/net/qsnet/ep/kmap_elan4.c ---- linux-2.4.21.orig/drivers/net/qsnet/ep/kmap_elan4.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/kmap_elan4.c 2004-12-14 05:19:14.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/ep/kmap_elan4.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/kmap_elan4.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/kmap_elan4.c 2005-06-01 23:12:54.670428312 -0400 @@ -0,0 +1,226 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -60757,9 +60864,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/kmap_elan4.c linux-2.4.21/driv + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/kmsg_elan3.c linux-2.4.21/drivers/net/qsnet/ep/kmsg_elan3.c ---- linux-2.4.21.orig/drivers/net/qsnet/ep/kmsg_elan3.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/kmsg_elan3.c 2004-09-30 05:52:37.000000000 -0400 +Index: linux-2.4.21/drivers/net/qsnet/ep/kmsg_elan3.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/kmsg_elan3.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/kmsg_elan3.c 2005-06-01 23:12:54.671428160 -0400 @@ -0,0 +1,345 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -61106,9 +61214,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/kmsg_elan3.c linux-2.4.21/driv + + return TRUE; +} -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/kmsg_elan4.c linux-2.4.21/drivers/net/qsnet/ep/kmsg_elan4.c ---- linux-2.4.21.orig/drivers/net/qsnet/ep/kmsg_elan4.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/kmsg_elan4.c 2004-09-30 05:52:37.000000000 -0400 +Index: linux-2.4.21/drivers/net/qsnet/ep/kmsg_elan4.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/kmsg_elan4.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/kmsg_elan4.c 2005-06-01 23:12:54.672428008 -0400 @@ -0,0 +1,416 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -61526,9 +61635,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/kmsg_elan4.c linux-2.4.21/driv + + return 1; +} -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/kthread.c linux-2.4.21/drivers/net/qsnet/ep/kthread.c ---- linux-2.4.21.orig/drivers/net/qsnet/ep/kthread.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/kthread.c 2004-05-19 04:54:57.000000000 -0400 +Index: linux-2.4.21/drivers/net/qsnet/ep/kthread.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/kthread.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/kthread.c 2005-06-01 23:12:54.672428008 -0400 @@ -0,0 +1,186 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -61716,9 +61826,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/kthread.c linux-2.4.21/drivers + * c-file-style: "linux" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/kthread.h linux-2.4.21/drivers/net/qsnet/ep/kthread.h ---- linux-2.4.21.orig/drivers/net/qsnet/ep/kthread.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/kthread.h 2004-05-06 10:24:08.000000000 -0400 +Index: linux-2.4.21/drivers/net/qsnet/ep/kthread.h +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/kthread.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/kthread.h 2005-06-01 23:12:54.673427856 -0400 @@ -0,0 +1,53 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -61773,9 +61884,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/kthread.h linux-2.4.21/drivers + * c-file-style: "linux" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/Makefile linux-2.4.21/drivers/net/qsnet/ep/Makefile ---- linux-2.4.21.orig/drivers/net/qsnet/ep/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/Makefile 2005-05-04 18:24:26.204506832 -0400 +Index: linux-2.4.21/drivers/net/qsnet/ep/Makefile +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/Makefile 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/Makefile 2005-06-01 23:12:54.673427856 -0400 @@ -0,0 +1,33 @@ +# +# Makefile for Quadrics QsNet @@ -61810,9 +61922,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/Makefile linux-2.4.21/drivers/ + +include $(TOPDIR)/Rules.make + -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/Makefile.conf linux-2.4.21/drivers/net/qsnet/ep/Makefile.conf ---- linux-2.4.21.orig/drivers/net/qsnet/ep/Makefile.conf 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/Makefile.conf 2005-03-02 10:40:57.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/ep/Makefile.conf +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/Makefile.conf 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/Makefile.conf 2005-06-01 23:12:54.673427856 -0400 @@ -0,0 +1,12 @@ +# Flags for generating QsNet Linux Kernel Makefiles +MODNAME = ep.o @@ -61826,9 +61939,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/Makefile.conf linux-2.4.21/dri +ep3-$(CONFIG_ELAN3) := kcomm_elan3.o kmsg_elan3.o kmap_elan3.o neterr_elan3.o probenetwork_elan3.o support_elan3.o threadcode_elan3.o threadcode_elan3_Linux.o epcomms_elan3.o epcommsTx_elan3.o epcommsRx_elan3.o +ep4-$(CONFIG_ELAN4) := kcomm_elan4.o kmsg_elan4.o kmap_elan4.o neterr_elan4.o probenetwork_elan4.o commands_elan4.o debug_elan4.o support_elan4.o threadcode_elan4_Linux.o epcomms_elan4.o epcommsTx_elan4.o epcommsRx_elan4.o +# EXTRALINES END -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/neterr.c linux-2.4.21/drivers/net/qsnet/ep/neterr.c ---- linux-2.4.21.orig/drivers/net/qsnet/ep/neterr.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/neterr.c 2004-11-12 05:54:51.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/ep/neterr.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/neterr.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/neterr.c 2005-06-01 23:12:54.674427704 -0400 @@ -0,0 +1,82 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -61912,9 +62026,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/neterr.c linux-2.4.21/drivers/ + * End: + */ + -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/neterr_elan3.c linux-2.4.21/drivers/net/qsnet/ep/neterr_elan3.c ---- linux-2.4.21.orig/drivers/net/qsnet/ep/neterr_elan3.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/neterr_elan3.c 2003-11-17 08:26:45.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/ep/neterr_elan3.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/neterr_elan3.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/neterr_elan3.c 2005-06-01 23:12:54.674427704 -0400 @@ -0,0 +1,326 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -62242,9 +62357,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/neterr_elan3.c linux-2.4.21/dr + * End: + */ + -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/neterr_elan4.c linux-2.4.21/drivers/net/qsnet/ep/neterr_elan4.c ---- linux-2.4.21.orig/drivers/net/qsnet/ep/neterr_elan4.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/neterr_elan4.c 2003-11-24 12:57:24.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/ep/neterr_elan4.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/neterr_elan4.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/neterr_elan4.c 2005-06-01 23:12:54.675427552 -0400 @@ -0,0 +1,251 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -62497,9 +62613,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/neterr_elan4.c linux-2.4.21/dr + * End: + */ + -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/nmh.c linux-2.4.21/drivers/net/qsnet/ep/nmh.c ---- linux-2.4.21.orig/drivers/net/qsnet/ep/nmh.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/nmh.c 2004-01-05 08:48:08.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/ep/nmh.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/nmh.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/nmh.c 2005-06-01 23:12:54.676427400 -0400 @@ -0,0 +1,181 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -62682,9 +62799,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/nmh.c linux-2.4.21/drivers/net + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/probenetwork.c linux-2.4.21/drivers/net/qsnet/ep/probenetwork.c ---- linux-2.4.21.orig/drivers/net/qsnet/ep/probenetwork.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/probenetwork.c 2004-04-19 11:43:15.000000000 -0400 +Index: linux-2.4.21/drivers/net/qsnet/ep/probenetwork.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/probenetwork.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/probenetwork.c 2005-06-01 23:12:54.677427248 -0400 @@ -0,0 +1,446 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -63132,9 +63250,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/probenetwork.c linux-2.4.21/dr + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/probenetwork_elan3.c linux-2.4.21/drivers/net/qsnet/ep/probenetwork_elan3.c ---- linux-2.4.21.orig/drivers/net/qsnet/ep/probenetwork_elan3.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/probenetwork_elan3.c 2004-04-15 08:30:08.000000000 -0400 +Index: linux-2.4.21/drivers/net/qsnet/ep/probenetwork_elan3.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/probenetwork_elan3.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/probenetwork_elan3.c 2005-06-01 23:12:54.677427248 -0400 @@ -0,0 +1,298 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -63434,9 +63553,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/probenetwork_elan3.c linux-2.4 + return updated; +} + -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/probenetwork_elan3_thread.c linux-2.4.21/drivers/net/qsnet/ep/probenetwork_elan3_thread.c ---- linux-2.4.21.orig/drivers/net/qsnet/ep/probenetwork_elan3_thread.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/probenetwork_elan3_thread.c 2004-03-24 06:32:56.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/ep/probenetwork_elan3_thread.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/probenetwork_elan3_thread.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/probenetwork_elan3_thread.c 2005-06-01 23:12:54.678427096 -0400 @@ -0,0 +1,98 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -63536,9 +63656,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/probenetwork_elan3_thread.c li + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/probenetwork_elan4.c linux-2.4.21/drivers/net/qsnet/ep/probenetwork_elan4.c ---- linux-2.4.21.orig/drivers/net/qsnet/ep/probenetwork_elan4.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/probenetwork_elan4.c 2004-08-19 07:05:03.000000000 -0400 +Index: linux-2.4.21/drivers/net/qsnet/ep/probenetwork_elan4.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/probenetwork_elan4.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/probenetwork_elan4.c 2005-06-01 23:12:54.679426944 -0400 @@ -0,0 +1,396 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -63936,9 +64057,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/probenetwork_elan4.c linux-2.4 + + return 0; +} -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/procfs_linux.c linux-2.4.21/drivers/net/qsnet/ep/procfs_linux.c ---- linux-2.4.21.orig/drivers/net/qsnet/ep/procfs_linux.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/procfs_linux.c 2005-01-18 09:18:42.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/ep/procfs_linux.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/procfs_linux.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/procfs_linux.c 2005-06-01 23:12:54.680426792 -0400 @@ -0,0 +1,693 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -64633,14 +64755,16 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/procfs_linux.c linux-2.4.21/dr + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/quadrics_version.h linux-2.4.21/drivers/net/qsnet/ep/quadrics_version.h ---- linux-2.4.21.orig/drivers/net/qsnet/ep/quadrics_version.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/quadrics_version.h 2005-03-02 10:41:01.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/ep/quadrics_version.h +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/quadrics_version.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/quadrics_version.h 2005-06-01 23:12:54.680426792 -0400 @@ -0,0 +1 @@ +#define QUADRICS_VERSION "4.30qsnet" -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/railhints.c linux-2.4.21/drivers/net/qsnet/ep/railhints.c ---- linux-2.4.21.orig/drivers/net/qsnet/ep/railhints.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/railhints.c 2004-02-06 17:37:06.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/ep/railhints.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/railhints.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/railhints.c 2005-06-01 23:12:54.680426792 -0400 @@ -0,0 +1,103 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -64745,9 +64869,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/railhints.c linux-2.4.21/drive + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/rmap.c linux-2.4.21/drivers/net/qsnet/ep/rmap.c ---- linux-2.4.21.orig/drivers/net/qsnet/ep/rmap.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/rmap.c 2004-05-19 06:24:38.000000000 -0400 +Index: linux-2.4.21/drivers/net/qsnet/ep/rmap.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/rmap.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/rmap.c 2005-06-01 23:12:54.681426640 -0400 @@ -0,0 +1,365 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -65114,9 +65239,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/rmap.c linux-2.4.21/drivers/ne + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/spinlock_elan3_thread.c linux-2.4.21/drivers/net/qsnet/ep/spinlock_elan3_thread.c ---- linux-2.4.21.orig/drivers/net/qsnet/ep/spinlock_elan3_thread.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/spinlock_elan3_thread.c 2003-10-07 09:22:38.000000000 -0400 +Index: linux-2.4.21/drivers/net/qsnet/ep/spinlock_elan3_thread.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/spinlock_elan3_thread.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/spinlock_elan3_thread.c 2005-06-01 23:12:54.681426640 -0400 @@ -0,0 +1,44 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -65162,9 +65288,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/spinlock_elan3_thread.c linux- + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/statemap.c linux-2.4.21/drivers/net/qsnet/ep/statemap.c ---- linux-2.4.21.orig/drivers/net/qsnet/ep/statemap.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/statemap.c 2004-11-18 07:05:00.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/ep/statemap.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/statemap.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/statemap.c 2005-06-01 23:12:54.682426488 -0400 @@ -0,0 +1,385 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -65551,9 +65678,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/statemap.c linux-2.4.21/driver + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/statusmon.h linux-2.4.21/drivers/net/qsnet/ep/statusmon.h ---- linux-2.4.21.orig/drivers/net/qsnet/ep/statusmon.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/statusmon.h 2003-10-07 09:22:38.000000000 -0400 +Index: linux-2.4.21/drivers/net/qsnet/ep/statusmon.h +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/statusmon.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/statusmon.h 2005-06-01 23:12:54.682426488 -0400 @@ -0,0 +1,44 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -65599,9 +65727,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/statusmon.h linux-2.4.21/drive + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/support.c linux-2.4.21/drivers/net/qsnet/ep/support.c ---- linux-2.4.21.orig/drivers/net/qsnet/ep/support.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/support.c 2004-09-30 11:01:53.000000000 -0400 +Index: linux-2.4.21/drivers/net/qsnet/ep/support.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/support.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/support.c 2005-06-01 23:12:54.683426336 -0400 @@ -0,0 +1,109 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -65712,9 +65841,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/support.c linux-2.4.21/drivers + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/support_elan3.c linux-2.4.21/drivers/net/qsnet/ep/support_elan3.c ---- linux-2.4.21.orig/drivers/net/qsnet/ep/support_elan3.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/support_elan3.c 2004-11-12 05:54:51.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/ep/support_elan3.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/support_elan3.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/support_elan3.c 2005-06-01 23:12:54.687425728 -0400 @@ -0,0 +1,2111 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -67827,9 +67957,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/support_elan3.c linux-2.4.21/d + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/support_elan4.c linux-2.4.21/drivers/net/qsnet/ep/support_elan4.c ---- linux-2.4.21.orig/drivers/net/qsnet/ep/support_elan4.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/support_elan4.c 2004-11-18 07:05:00.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/ep/support_elan4.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/support_elan4.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/support_elan4.c 2005-06-01 23:12:54.689425424 -0400 @@ -0,0 +1,1184 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -69015,9 +69146,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/support_elan4.c linux-2.4.21/d + } + spin_unlock_irqrestore (&rail->r_dma_lock, flags); +} -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/threadcode.c linux-2.4.21/drivers/net/qsnet/ep/threadcode.c ---- linux-2.4.21.orig/drivers/net/qsnet/ep/threadcode.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/threadcode.c 2003-10-07 09:22:38.000000000 -0400 +Index: linux-2.4.21/drivers/net/qsnet/ep/threadcode.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/threadcode.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/threadcode.c 2005-06-01 23:12:54.689425424 -0400 @@ -0,0 +1,146 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -69165,9 +69297,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/threadcode.c linux-2.4.21/driv + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/threadcode_elan3.c linux-2.4.21/drivers/net/qsnet/ep/threadcode_elan3.c ---- linux-2.4.21.orig/drivers/net/qsnet/ep/threadcode_elan3.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/threadcode_elan3.c 2003-10-07 09:22:38.000000000 -0400 +Index: linux-2.4.21/drivers/net/qsnet/ep/threadcode_elan3.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/threadcode_elan3.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/threadcode_elan3.c 2005-06-01 23:12:54.690425272 -0400 @@ -0,0 +1,85 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -69254,9 +69387,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/threadcode_elan3.c linux-2.4.2 + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/threadcode_elan3_Linux.c linux-2.4.21/drivers/net/qsnet/ep/threadcode_elan3_Linux.c ---- linux-2.4.21.orig/drivers/net/qsnet/ep/threadcode_elan3_Linux.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/threadcode_elan3_Linux.c 2005-03-02 10:40:56.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/ep/threadcode_elan3_Linux.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/threadcode_elan3_Linux.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/threadcode_elan3_Linux.c 2005-06-01 23:12:54.690425272 -0400 @@ -0,0 +1,112 @@ +/* --------------------------------------------------------*/ +/* MACHINE GENERATED ELAN CODE */ @@ -69370,9 +69504,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/threadcode_elan3_Linux.c linux + threadcode_elan3_rodata_size, + threadcode_elan3_symbols, +}; -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/threadcode_elan4_Linux.c linux-2.4.21/drivers/net/qsnet/ep/threadcode_elan4_Linux.c ---- linux-2.4.21.orig/drivers/net/qsnet/ep/threadcode_elan4_Linux.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/ep/threadcode_elan4_Linux.c 2005-03-02 10:40:57.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/ep/threadcode_elan4_Linux.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/ep/threadcode_elan4_Linux.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/ep/threadcode_elan4_Linux.c 2005-06-01 23:12:54.691425120 -0400 @@ -0,0 +1,112 @@ +/* --------------------------------------------------------*/ +/* MACHINE GENERATED ELAN CODE */ @@ -69486,9 +69621,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/ep/threadcode_elan4_Linux.c linux + threadcode_elan4_rodata_size, + threadcode_elan4_symbols, +}; -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/jtag/jtagdrv.c linux-2.4.21/drivers/net/qsnet/jtag/jtagdrv.c ---- linux-2.4.21.orig/drivers/net/qsnet/jtag/jtagdrv.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/jtag/jtagdrv.c 2003-06-07 12:02:35.000000000 -0400 +Index: linux-2.4.21/drivers/net/qsnet/jtag/jtagdrv.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/jtag/jtagdrv.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/jtag/jtagdrv.c 2005-06-01 23:12:54.692424968 -0400 @@ -0,0 +1,451 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -69941,9 +70077,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/jtag/jtagdrv.c linux-2.4.21/drive + LPT_WRITE_CTRL (dev, 0); DELAY(1); /* strobe low */ +} + -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/jtag/jtagdrv.h linux-2.4.21/drivers/net/qsnet/jtag/jtagdrv.h ---- linux-2.4.21.orig/drivers/net/qsnet/jtag/jtagdrv.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/jtag/jtagdrv.h 2002-08-09 07:18:37.000000000 -0400 +Index: linux-2.4.21/drivers/net/qsnet/jtag/jtagdrv.h +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/jtag/jtagdrv.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/jtag/jtagdrv.h 2005-06-01 23:12:54.692424968 -0400 @@ -0,0 +1,57 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -70002,9 +70139,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/jtag/jtagdrv.h linux-2.4.21/drive + + +#endif /* __JTAGDRV_COMMON_H */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/jtag/jtagdrv_Linux.c linux-2.4.21/drivers/net/qsnet/jtag/jtagdrv_Linux.c ---- linux-2.4.21.orig/drivers/net/qsnet/jtag/jtagdrv_Linux.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/jtag/jtagdrv_Linux.c 2004-01-06 06:15:46.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/jtag/jtagdrv_Linux.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/jtag/jtagdrv_Linux.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/jtag/jtagdrv_Linux.c 2005-06-01 23:12:54.693424816 -0400 @@ -0,0 +1,319 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -70325,9 +70463,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/jtag/jtagdrv_Linux.c linux-2.4.21 + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/jtag/jtagdrv_Linux.h linux-2.4.21/drivers/net/qsnet/jtag/jtagdrv_Linux.h ---- linux-2.4.21.orig/drivers/net/qsnet/jtag/jtagdrv_Linux.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/jtag/jtagdrv_Linux.h 2002-08-09 07:18:37.000000000 -0400 +Index: linux-2.4.21/drivers/net/qsnet/jtag/jtagdrv_Linux.h +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/jtag/jtagdrv_Linux.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/jtag/jtagdrv_Linux.h 2005-06-01 23:12:54.693424816 -0400 @@ -0,0 +1,174 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -70503,9 +70642,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/jtag/jtagdrv_Linux.h linux-2.4.21 + + +#endif /* __JTAGDRV_LINUX_H */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/jtag/Makefile linux-2.4.21/drivers/net/qsnet/jtag/Makefile ---- linux-2.4.21.orig/drivers/net/qsnet/jtag/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/jtag/Makefile 2005-05-04 18:24:26.596447248 -0400 +Index: linux-2.4.21/drivers/net/qsnet/jtag/Makefile +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/jtag/Makefile 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/jtag/Makefile 2005-06-01 23:12:54.694424664 -0400 @@ -0,0 +1,31 @@ +# +# Makefile for Quadrics QsNet @@ -70538,9 +70678,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/jtag/Makefile linux-2.4.21/driver + +include $(TOPDIR)/Rules.make + -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/jtag/Makefile.conf linux-2.4.21/drivers/net/qsnet/jtag/Makefile.conf ---- linux-2.4.21.orig/drivers/net/qsnet/jtag/Makefile.conf 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/jtag/Makefile.conf 2005-03-02 10:41:00.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/jtag/Makefile.conf +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/jtag/Makefile.conf 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/jtag/Makefile.conf 2005-06-01 23:12:54.694424664 -0400 @@ -0,0 +1,10 @@ +# Flags for generating QsNet Linux Kernel Makefiles +MODNAME = jtag.o @@ -70552,14 +70693,16 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/jtag/Makefile.conf linux-2.4.21/d +# EXTRALINES START + +# EXTRALINES END -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/jtag/quadrics_version.h linux-2.4.21/drivers/net/qsnet/jtag/quadrics_version.h ---- linux-2.4.21.orig/drivers/net/qsnet/jtag/quadrics_version.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/jtag/quadrics_version.h 2005-03-02 10:41:01.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/jtag/quadrics_version.h +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/jtag/quadrics_version.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/jtag/quadrics_version.h 2005-06-01 23:12:54.694424664 -0400 @@ -0,0 +1 @@ +#define QUADRICS_VERSION "4.30qsnet" -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/Makefile linux-2.4.21/drivers/net/qsnet/Makefile ---- linux-2.4.21.orig/drivers/net/qsnet/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/Makefile 2005-05-04 18:24:24.108825424 -0400 +Index: linux-2.4.21/drivers/net/qsnet/Makefile +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/Makefile 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/Makefile 2005-06-01 23:12:54.695424512 -0400 @@ -0,0 +1,17 @@ +# +# Makefile for Quadrics QsNet @@ -70578,9 +70721,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/Makefile linux-2.4.21/drivers/net +subdir-$(CONFIG_JTAG) += jtag + +include $(TOPDIR)/Rules.make -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/qsnet/debug.c linux-2.4.21/drivers/net/qsnet/qsnet/debug.c ---- linux-2.4.21.orig/drivers/net/qsnet/qsnet/debug.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/qsnet/debug.c 2004-08-19 04:09:57.000000000 -0400 +Index: linux-2.4.21/drivers/net/qsnet/qsnet/debug.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/qsnet/debug.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/qsnet/debug.c 2005-06-01 23:12:54.696424360 -0400 @@ -0,0 +1,583 @@ +/* + * Copyright (c) 2003 by Quadrics Ltd. @@ -71165,9 +71309,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/qsnet/debug.c linux-2.4.21/driver + * c-file-style: "linux" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/qsnet/i686_mmx.c linux-2.4.21/drivers/net/qsnet/qsnet/i686_mmx.c ---- linux-2.4.21.orig/drivers/net/qsnet/qsnet/i686_mmx.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/qsnet/i686_mmx.c 2004-01-05 07:08:25.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/qsnet/i686_mmx.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/qsnet/i686_mmx.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/qsnet/i686_mmx.c 2005-06-01 23:12:54.696424360 -0400 @@ -0,0 +1,99 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -71268,9 +71413,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/qsnet/i686_mmx.c linux-2.4.21/dri + } +} +#endif -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/qsnet/kernel_linux.c linux-2.4.21/drivers/net/qsnet/qsnet/kernel_linux.c ---- linux-2.4.21.orig/drivers/net/qsnet/qsnet/kernel_linux.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/qsnet/kernel_linux.c 2004-11-04 06:03:47.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/qsnet/kernel_linux.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/qsnet/kernel_linux.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/qsnet/kernel_linux.c 2005-06-01 23:12:54.697424208 -0400 @@ -0,0 +1,856 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -72128,9 +72274,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/qsnet/kernel_linux.c linux-2.4.21 + * c-file-style: "linux" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/qsnet/Makefile linux-2.4.21/drivers/net/qsnet/qsnet/Makefile ---- linux-2.4.21.orig/drivers/net/qsnet/qsnet/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/qsnet/Makefile 2005-05-04 18:24:26.986387968 -0400 +Index: linux-2.4.21/drivers/net/qsnet/qsnet/Makefile +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/qsnet/Makefile 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/qsnet/Makefile 2005-06-01 23:12:54.697424208 -0400 @@ -0,0 +1,31 @@ +# +# Makefile for Quadrics QsNet @@ -72163,9 +72310,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/qsnet/Makefile linux-2.4.21/drive + +include $(TOPDIR)/Rules.make + -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/qsnet/Makefile.conf linux-2.4.21/drivers/net/qsnet/qsnet/Makefile.conf ---- linux-2.4.21.orig/drivers/net/qsnet/qsnet/Makefile.conf 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/qsnet/Makefile.conf 2005-03-02 10:40:48.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/qsnet/Makefile.conf +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/qsnet/Makefile.conf 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/qsnet/Makefile.conf 2005-06-01 23:12:54.698424056 -0400 @@ -0,0 +1,10 @@ +# Flags for generating QsNet Linux Kernel Makefiles +MODNAME = qsnet.o @@ -72177,9 +72325,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/qsnet/Makefile.conf linux-2.4.21/ +# EXTRALINES START + +# EXTRALINES END -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/qsnet/qsnetkmem_linux.c linux-2.4.21/drivers/net/qsnet/qsnet/qsnetkmem_linux.c ---- linux-2.4.21.orig/drivers/net/qsnet/qsnet/qsnetkmem_linux.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/qsnet/qsnetkmem_linux.c 2003-08-13 06:03:27.000000000 -0400 +Index: linux-2.4.21/drivers/net/qsnet/qsnet/qsnetkmem_linux.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/qsnet/qsnetkmem_linux.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/qsnet/qsnetkmem_linux.c 2005-06-01 23:12:54.698424056 -0400 @@ -0,0 +1,325 @@ +/* + * Copyright (c) 2003 by Quadrics Ltd. @@ -72506,14 +72655,16 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/qsnet/qsnetkmem_linux.c linux-2.4 + * c-file-style: "linux" + * End: + */ -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/qsnet/quadrics_version.h linux-2.4.21/drivers/net/qsnet/qsnet/quadrics_version.h ---- linux-2.4.21.orig/drivers/net/qsnet/qsnet/quadrics_version.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/qsnet/quadrics_version.h 2005-03-02 10:41:01.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/qsnet/quadrics_version.h +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/qsnet/quadrics_version.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/qsnet/quadrics_version.h 2005-06-01 23:12:54.699423904 -0400 @@ -0,0 +1 @@ +#define QUADRICS_VERSION "4.30qsnet" -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/rms/Makefile linux-2.4.21/drivers/net/qsnet/rms/Makefile ---- linux-2.4.21.orig/drivers/net/qsnet/rms/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/rms/Makefile 2005-05-04 18:24:27.388326864 -0400 +Index: linux-2.4.21/drivers/net/qsnet/rms/Makefile +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/rms/Makefile 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/rms/Makefile 2005-06-01 23:12:54.699423904 -0400 @@ -0,0 +1,31 @@ +# +# Makefile for Quadrics QsNet @@ -72546,9 +72697,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/rms/Makefile linux-2.4.21/drivers + +include $(TOPDIR)/Rules.make + -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/rms/Makefile.conf linux-2.4.21/drivers/net/qsnet/rms/Makefile.conf ---- linux-2.4.21.orig/drivers/net/qsnet/rms/Makefile.conf 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/rms/Makefile.conf 2005-03-02 10:41:00.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/rms/Makefile.conf +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/rms/Makefile.conf 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/rms/Makefile.conf 2005-06-01 23:12:54.699423904 -0400 @@ -0,0 +1,10 @@ +# Flags for generating QsNet Linux Kernel Makefiles +MODNAME = rms.o @@ -72560,14 +72712,16 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/rms/Makefile.conf linux-2.4.21/dr +# EXTRALINES START + +# EXTRALINES END -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/rms/quadrics_version.h linux-2.4.21/drivers/net/qsnet/rms/quadrics_version.h ---- linux-2.4.21.orig/drivers/net/qsnet/rms/quadrics_version.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/rms/quadrics_version.h 2005-03-02 10:41:01.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/rms/quadrics_version.h +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/rms/quadrics_version.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/rms/quadrics_version.h 2005-06-01 23:12:54.700423752 -0400 @@ -0,0 +1 @@ +#define QUADRICS_VERSION "4.30qsnet" -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/rms/rms_kern.c linux-2.4.21/drivers/net/qsnet/rms/rms_kern.c ---- linux-2.4.21.orig/drivers/net/qsnet/rms/rms_kern.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/rms/rms_kern.c 2005-01-18 06:05:45.000000000 -0500 +Index: linux-2.4.21/drivers/net/qsnet/rms/rms_kern.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/rms/rms_kern.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/rms/rms_kern.c 2005-06-01 23:12:54.702423448 -0400 @@ -0,0 +1,1757 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -74326,9 +74480,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/rms/rms_kern.c linux-2.4.21/drive + + + -diff -urNp linux-2.4.21.orig/drivers/net/qsnet/rms/rms_kern_Linux.c linux-2.4.21/drivers/net/qsnet/rms/rms_kern_Linux.c ---- linux-2.4.21.orig/drivers/net/qsnet/rms/rms_kern_Linux.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/drivers/net/qsnet/rms/rms_kern_Linux.c 2004-05-14 04:55:57.000000000 -0400 +Index: linux-2.4.21/drivers/net/qsnet/rms/rms_kern_Linux.c +=================================================================== +--- linux-2.4.21.orig/drivers/net/qsnet/rms/rms_kern_Linux.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/drivers/net/qsnet/rms/rms_kern_Linux.c 2005-06-01 23:12:54.703423296 -0400 @@ -0,0 +1,430 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -74760,9 +74915,10 @@ diff -urNp linux-2.4.21.orig/drivers/net/qsnet/rms/rms_kern_Linux.c linux-2.4.21 + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/fs/exec.c linux-2.4.21/fs/exec.c ---- linux-2.4.21.orig/fs/exec.c 2005-05-04 15:31:26.000000000 -0400 -+++ linux-2.4.21/fs/exec.c 2005-05-04 18:24:22.107129728 -0400 +Index: linux-2.4.21/fs/exec.c +=================================================================== +--- linux-2.4.21.orig/fs/exec.c 2005-06-01 22:58:09.044063984 -0400 ++++ linux-2.4.21/fs/exec.c 2005-06-01 23:12:54.704423144 -0400 @@ -51,6 +51,7 @@ #ifdef CONFIG_KMOD #include @@ -74771,7 +74927,7 @@ diff -urNp linux-2.4.21.orig/fs/exec.c linux-2.4.21/fs/exec.c int core_uses_pid; char core_pattern[65] = "core"; -@@ -1118,6 +1119,10 @@ int do_execve(char * filename, char ** a +@@ -1125,6 +1126,10 @@ if (retval < 0) goto out; @@ -74782,9 +74938,10 @@ diff -urNp linux-2.4.21.orig/fs/exec.c linux-2.4.21/fs/exec.c retval = search_binary_handler(&bprm,regs); if (retval >= 0) /* execve success */ -diff -urNp linux-2.4.21.orig/include/elan/bitmap.h linux-2.4.21/include/elan/bitmap.h ---- linux-2.4.21.orig/include/elan/bitmap.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan/bitmap.h 2004-01-20 12:32:15.000000000 -0500 +Index: linux-2.4.21/include/elan/bitmap.h +=================================================================== +--- linux-2.4.21.orig/include/elan/bitmap.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan/bitmap.h 2005-06-01 23:12:54.704423144 -0400 @@ -0,0 +1,74 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -74860,9 +75017,10 @@ diff -urNp linux-2.4.21.orig/include/elan/bitmap.h linux-2.4.21/include/elan/bit + * c-file-style: "linux" + * End: + */ -diff -urNp linux-2.4.21.orig/include/elan/capability.h linux-2.4.21/include/elan/capability.h ---- linux-2.4.21.orig/include/elan/capability.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan/capability.h 2004-07-20 06:15:33.000000000 -0400 +Index: linux-2.4.21/include/elan/capability.h +=================================================================== +--- linux-2.4.21.orig/include/elan/capability.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan/capability.h 2005-06-01 23:12:54.705422992 -0400 @@ -0,0 +1,197 @@ +/* + * Copyright (c) 2003 by Quadrics Limited. @@ -75061,9 +75219,10 @@ diff -urNp linux-2.4.21.orig/include/elan/capability.h linux-2.4.21/include/elan + * c-file-style: "linux" + * End: + */ -diff -urNp linux-2.4.21.orig/include/elan/cm.h linux-2.4.21/include/elan/cm.h ---- linux-2.4.21.orig/include/elan/cm.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan/cm.h 2004-11-12 05:54:50.000000000 -0500 +Index: linux-2.4.21/include/elan/cm.h +=================================================================== +--- linux-2.4.21.orig/include/elan/cm.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan/cm.h 2005-06-01 23:12:54.706422840 -0400 @@ -0,0 +1,412 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -75477,9 +75636,10 @@ diff -urNp linux-2.4.21.orig/include/elan/cm.h linux-2.4.21/include/elan/cm.h + */ +#endif /* __ELAN_CM_H */ + -diff -urNp linux-2.4.21.orig/include/elan/compat.h linux-2.4.21/include/elan/compat.h ---- linux-2.4.21.orig/include/elan/compat.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan/compat.h 2003-12-03 08:18:48.000000000 -0500 +Index: linux-2.4.21/include/elan/compat.h +=================================================================== +--- linux-2.4.21.orig/include/elan/compat.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan/compat.h 2005-06-01 23:12:54.706422840 -0400 @@ -0,0 +1,23 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -75504,9 +75664,10 @@ diff -urNp linux-2.4.21.orig/include/elan/compat.h linux-2.4.21/include/elan/com + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/include/elan/device.h linux-2.4.21/include/elan/device.h ---- linux-2.4.21.orig/include/elan/device.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan/device.h 2003-09-24 09:55:37.000000000 -0400 +Index: linux-2.4.21/include/elan/device.h +=================================================================== +--- linux-2.4.21.orig/include/elan/device.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan/device.h 2005-06-01 23:12:54.707422688 -0400 @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2003 by Quadrics Limited. @@ -75570,9 +75731,10 @@ diff -urNp linux-2.4.21.orig/include/elan/device.h linux-2.4.21/include/elan/dev + * c-file-style: "linux" + * End: + */ -diff -urNp linux-2.4.21.orig/include/elan/devinfo.h linux-2.4.21/include/elan/devinfo.h ---- linux-2.4.21.orig/include/elan/devinfo.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan/devinfo.h 2004-03-12 09:27:39.000000000 -0500 +Index: linux-2.4.21/include/elan/devinfo.h +=================================================================== +--- linux-2.4.21.orig/include/elan/devinfo.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan/devinfo.h 2005-06-01 23:12:54.707422688 -0400 @@ -0,0 +1,81 @@ +/* + * Copyright (c) 2003 by Quadrics Limited. @@ -75655,9 +75817,10 @@ diff -urNp linux-2.4.21.orig/include/elan/devinfo.h linux-2.4.21/include/elan/de + * c-file-style: "linux" + * End: + */ -diff -urNp linux-2.4.21.orig/include/elan/elanmoddebug.h linux-2.4.21/include/elan/elanmoddebug.h ---- linux-2.4.21.orig/include/elan/elanmoddebug.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan/elanmoddebug.h 2003-09-24 09:55:37.000000000 -0400 +Index: linux-2.4.21/include/elan/elanmoddebug.h +=================================================================== +--- linux-2.4.21.orig/include/elan/elanmoddebug.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan/elanmoddebug.h 2005-06-01 23:12:54.707422688 -0400 @@ -0,0 +1,63 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -75722,9 +75885,10 @@ diff -urNp linux-2.4.21.orig/include/elan/elanmoddebug.h linux-2.4.21/include/el + * c-file-style: "linux" + * End: + */ -diff -urNp linux-2.4.21.orig/include/elan/elanmod.h linux-2.4.21/include/elan/elanmod.h ---- linux-2.4.21.orig/include/elan/elanmod.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan/elanmod.h 2004-06-18 05:28:16.000000000 -0400 +Index: linux-2.4.21/include/elan/elanmod.h +=================================================================== +--- linux-2.4.21.orig/include/elan/elanmod.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan/elanmod.h 2005-06-01 23:12:54.708422536 -0400 @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2003 by Quadrics Limited. @@ -75785,9 +75949,10 @@ diff -urNp linux-2.4.21.orig/include/elan/elanmod.h linux-2.4.21/include/elan/el + * c-file-style: "linux" + * End: + */ -diff -urNp linux-2.4.21.orig/include/elan/elanmod_linux.h linux-2.4.21/include/elan/elanmod_linux.h ---- linux-2.4.21.orig/include/elan/elanmod_linux.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan/elanmod_linux.h 2003-09-29 11:36:20.000000000 -0400 +Index: linux-2.4.21/include/elan/elanmod_linux.h +=================================================================== +--- linux-2.4.21.orig/include/elan/elanmod_linux.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan/elanmod_linux.h 2005-06-01 23:12:54.708422536 -0400 @@ -0,0 +1,140 @@ +/* + * Copyright (c) 2003 by Quadrics Ltd. @@ -75929,9 +76094,10 @@ diff -urNp linux-2.4.21.orig/include/elan/elanmod_linux.h linux-2.4.21/include/e + * c-file-style: "linux" + * End: + */ -diff -urNp linux-2.4.21.orig/include/elan/elanmod_subsystem.h linux-2.4.21/include/elan/elanmod_subsystem.h ---- linux-2.4.21.orig/include/elan/elanmod_subsystem.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan/elanmod_subsystem.h 2003-09-29 11:35:13.000000000 -0400 +Index: linux-2.4.21/include/elan/elanmod_subsystem.h +=================================================================== +--- linux-2.4.21.orig/include/elan/elanmod_subsystem.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan/elanmod_subsystem.h 2005-06-01 23:12:54.708422536 -0400 @@ -0,0 +1,138 @@ +/* + * Copyright (c) 2003 by Quadrics Limited. @@ -76071,9 +76237,10 @@ diff -urNp linux-2.4.21.orig/include/elan/elanmod_subsystem.h linux-2.4.21/inclu + * c-file-style: "linux" + * End: + */ -diff -urNp linux-2.4.21.orig/include/elan/epcomms.h linux-2.4.21/include/elan/epcomms.h ---- linux-2.4.21.orig/include/elan/epcomms.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan/epcomms.h 2004-11-12 05:54:50.000000000 -0500 +Index: linux-2.4.21/include/elan/epcomms.h +=================================================================== +--- linux-2.4.21.orig/include/elan/epcomms.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan/epcomms.h 2005-06-01 23:12:54.710422232 -0400 @@ -0,0 +1,635 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -76710,9 +76877,10 @@ diff -urNp linux-2.4.21.orig/include/elan/epcomms.h linux-2.4.21/include/elan/ep + */ +#endif /* __ELAN_EPCOMMS_H */ + -diff -urNp linux-2.4.21.orig/include/elan/epsvc.h linux-2.4.21/include/elan/epsvc.h ---- linux-2.4.21.orig/include/elan/epsvc.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan/epsvc.h 2004-02-13 05:03:27.000000000 -0500 +Index: linux-2.4.21/include/elan/epsvc.h +=================================================================== +--- linux-2.4.21.orig/include/elan/epsvc.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan/epsvc.h 2005-06-01 23:12:54.710422232 -0400 @@ -0,0 +1,36 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -76750,9 +76918,10 @@ diff -urNp linux-2.4.21.orig/include/elan/epsvc.h linux-2.4.21/include/elan/epsv + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/include/elan/kalloc.h linux-2.4.21/include/elan/kalloc.h ---- linux-2.4.21.orig/include/elan/kalloc.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan/kalloc.h 2004-05-19 06:23:59.000000000 -0400 +Index: linux-2.4.21/include/elan/kalloc.h +=================================================================== +--- linux-2.4.21.orig/include/elan/kalloc.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan/kalloc.h 2005-06-01 23:12:54.710422232 -0400 @@ -0,0 +1,108 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -76862,9 +77031,10 @@ diff -urNp linux-2.4.21.orig/include/elan/kalloc.h linux-2.4.21/include/elan/kal + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/include/elan/kcomm.h linux-2.4.21/include/elan/kcomm.h ---- linux-2.4.21.orig/include/elan/kcomm.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan/kcomm.h 2004-12-14 05:19:14.000000000 -0500 +Index: linux-2.4.21/include/elan/kcomm.h +=================================================================== +--- linux-2.4.21.orig/include/elan/kcomm.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan/kcomm.h 2005-06-01 23:12:54.712421928 -0400 @@ -0,0 +1,839 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -77705,9 +77875,10 @@ diff -urNp linux-2.4.21.orig/include/elan/kcomm.h linux-2.4.21/include/elan/kcom + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/include/elan/kcomm_stats.h linux-2.4.21/include/elan/kcomm_stats.h ---- linux-2.4.21.orig/include/elan/kcomm_stats.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan/kcomm_stats.h 2004-11-12 05:54:51.000000000 -0500 +Index: linux-2.4.21/include/elan/kcomm_stats.h +=================================================================== +--- linux-2.4.21.orig/include/elan/kcomm_stats.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan/kcomm_stats.h 2005-06-01 23:12:54.712421928 -0400 @@ -0,0 +1,153 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -77862,9 +78033,10 @@ diff -urNp linux-2.4.21.orig/include/elan/kcomm_stats.h linux-2.4.21/include/ela + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/include/elan/kmap.h linux-2.4.21/include/elan/kmap.h ---- linux-2.4.21.orig/include/elan/kmap.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan/kmap.h 2004-12-14 05:19:14.000000000 -0500 +Index: linux-2.4.21/include/elan/kmap.h +=================================================================== +--- linux-2.4.21.orig/include/elan/kmap.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan/kmap.h 2005-06-01 23:12:54.713421776 -0400 @@ -0,0 +1,68 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -77934,9 +78106,10 @@ diff -urNp linux-2.4.21.orig/include/elan/kmap.h linux-2.4.21/include/elan/kmap. + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/include/elan/kmsg.h linux-2.4.21/include/elan/kmsg.h ---- linux-2.4.21.orig/include/elan/kmsg.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan/kmsg.h 2003-09-23 09:55:12.000000000 -0400 +Index: linux-2.4.21/include/elan/kmsg.h +=================================================================== +--- linux-2.4.21.orig/include/elan/kmsg.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan/kmsg.h 2005-06-01 23:12:54.713421776 -0400 @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2003 by Quadrics Ltd. @@ -77952,9 +78125,10 @@ diff -urNp linux-2.4.21.orig/include/elan/kmsg.h linux-2.4.21/include/elan/kmsg. +/* $Source: /cvs/master/quadrics/epmod/kmsg.h,v $ */ + +#endif /* __ELAN_KMSG_H */ -diff -urNp linux-2.4.21.orig/include/elan/kthread.h linux-2.4.21/include/elan/kthread.h ---- linux-2.4.21.orig/include/elan/kthread.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan/kthread.h 2004-05-06 10:24:08.000000000 -0400 +Index: linux-2.4.21/include/elan/kthread.h +=================================================================== +--- linux-2.4.21.orig/include/elan/kthread.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan/kthread.h 2005-06-01 23:12:54.713421776 -0400 @@ -0,0 +1,53 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -78009,9 +78183,10 @@ diff -urNp linux-2.4.21.orig/include/elan/kthread.h linux-2.4.21/include/elan/kt + * c-file-style: "linux" + * End: + */ -diff -urNp linux-2.4.21.orig/include/elan/nmh.h linux-2.4.21/include/elan/nmh.h ---- linux-2.4.21.orig/include/elan/nmh.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan/nmh.h 2004-01-06 05:29:55.000000000 -0500 +Index: linux-2.4.21/include/elan/nmh.h +=================================================================== +--- linux-2.4.21.orig/include/elan/nmh.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan/nmh.h 2005-06-01 23:12:54.714421624 -0400 @@ -0,0 +1,95 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -78108,9 +78283,10 @@ diff -urNp linux-2.4.21.orig/include/elan/nmh.h linux-2.4.21/include/elan/nmh.h + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/include/elan/rmap.h linux-2.4.21/include/elan/rmap.h ---- linux-2.4.21.orig/include/elan/rmap.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan/rmap.h 2004-05-19 06:24:40.000000000 -0400 +Index: linux-2.4.21/include/elan/rmap.h +=================================================================== +--- linux-2.4.21.orig/include/elan/rmap.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan/rmap.h 2005-06-01 23:12:54.714421624 -0400 @@ -0,0 +1,49 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -78161,9 +78337,10 @@ diff -urNp linux-2.4.21.orig/include/elan/rmap.h linux-2.4.21/include/elan/rmap. + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/include/elan/statemap.h linux-2.4.21/include/elan/statemap.h ---- linux-2.4.21.orig/include/elan/statemap.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan/statemap.h 2003-10-07 09:22:38.000000000 -0400 +Index: linux-2.4.21/include/elan/statemap.h +=================================================================== +--- linux-2.4.21.orig/include/elan/statemap.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan/statemap.h 2005-06-01 23:12:54.714421624 -0400 @@ -0,0 +1,52 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -78217,9 +78394,10 @@ diff -urNp linux-2.4.21.orig/include/elan/statemap.h linux-2.4.21/include/elan/s + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/include/elan/stats.h linux-2.4.21/include/elan/stats.h ---- linux-2.4.21.orig/include/elan/stats.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan/stats.h 2003-09-24 09:55:37.000000000 -0400 +Index: linux-2.4.21/include/elan/stats.h +=================================================================== +--- linux-2.4.21.orig/include/elan/stats.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan/stats.h 2005-06-01 23:12:54.715421472 -0400 @@ -0,0 +1,85 @@ +/* + * Copyright (c) 2003 by Quadrics Limited. @@ -78306,9 +78484,10 @@ diff -urNp linux-2.4.21.orig/include/elan/stats.h linux-2.4.21/include/elan/stat + * c-file-style: "linux" + * End: + */ -diff -urNp linux-2.4.21.orig/include/elan3/compat.h linux-2.4.21/include/elan3/compat.h ---- linux-2.4.21.orig/include/elan3/compat.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan3/compat.h 2004-06-09 05:07:03.000000000 -0400 +Index: linux-2.4.21/include/elan3/compat.h +=================================================================== +--- linux-2.4.21.orig/include/elan3/compat.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan3/compat.h 2005-06-01 23:12:54.715421472 -0400 @@ -0,0 +1,177 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -78487,9 +78666,10 @@ diff -urNp linux-2.4.21.orig/include/elan3/compat.h linux-2.4.21/include/elan3/c + * End: + */ + -diff -urNp linux-2.4.21.orig/include/elan3/dma.h linux-2.4.21/include/elan3/dma.h ---- linux-2.4.21.orig/include/elan3/dma.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan3/dma.h 2002-08-21 08:43:27.000000000 -0400 +Index: linux-2.4.21/include/elan3/dma.h +=================================================================== +--- linux-2.4.21.orig/include/elan3/dma.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan3/dma.h 2005-06-01 23:12:54.716421320 -0400 @@ -0,0 +1,213 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -78704,9 +78884,10 @@ diff -urNp linux-2.4.21.orig/include/elan3/dma.h linux-2.4.21/include/elan3/dma. + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/include/elan3/e3types.h linux-2.4.21/include/elan3/e3types.h ---- linux-2.4.21.orig/include/elan3/e3types.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan3/e3types.h 2002-08-09 07:23:33.000000000 -0400 +Index: linux-2.4.21/include/elan3/e3types.h +=================================================================== +--- linux-2.4.21.orig/include/elan3/e3types.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan3/e3types.h 2005-06-01 23:12:54.716421320 -0400 @@ -0,0 +1,82 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -78790,9 +78971,10 @@ diff -urNp linux-2.4.21.orig/include/elan3/e3types.h linux-2.4.21/include/elan3/ + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/include/elan3/elan3mmu.h linux-2.4.21/include/elan3/elan3mmu.h ---- linux-2.4.21.orig/include/elan3/elan3mmu.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan3/elan3mmu.h 2004-12-14 05:19:48.000000000 -0500 +Index: linux-2.4.21/include/elan3/elan3mmu.h +=================================================================== +--- linux-2.4.21.orig/include/elan3/elan3mmu.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan3/elan3mmu.h 2005-06-01 23:12:54.717421168 -0400 @@ -0,0 +1,346 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -79140,9 +79322,10 @@ diff -urNp linux-2.4.21.orig/include/elan3/elan3mmu.h linux-2.4.21/include/elan3 + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/include/elan3/elan3mmu_linux.h linux-2.4.21/include/elan3/elan3mmu_linux.h ---- linux-2.4.21.orig/include/elan3/elan3mmu_linux.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan3/elan3mmu_linux.h 2003-09-24 09:57:24.000000000 -0400 +Index: linux-2.4.21/include/elan3/elan3mmu_linux.h +=================================================================== +--- linux-2.4.21.orig/include/elan3/elan3mmu_linux.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan3/elan3mmu_linux.h 2005-06-01 23:12:54.717421168 -0400 @@ -0,0 +1,39 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -79183,9 +79366,10 @@ diff -urNp linux-2.4.21.orig/include/elan3/elan3mmu_linux.h linux-2.4.21/include + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/include/elan3/elan3ops.h linux-2.4.21/include/elan3/elan3ops.h ---- linux-2.4.21.orig/include/elan3/elan3ops.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan3/elan3ops.h 2003-09-24 09:57:24.000000000 -0400 +Index: linux-2.4.21/include/elan3/elan3ops.h +=================================================================== +--- linux-2.4.21.orig/include/elan3/elan3ops.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan3/elan3ops.h 2005-06-01 23:12:54.718421016 -0400 @@ -0,0 +1,42 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -79229,9 +79413,10 @@ diff -urNp linux-2.4.21.orig/include/elan3/elan3ops.h linux-2.4.21/include/elan3 + * c-file-style: "linux" + * End: + */ -diff -urNp linux-2.4.21.orig/include/elan3/elanctxt.h linux-2.4.21/include/elan3/elanctxt.h ---- linux-2.4.21.orig/include/elan3/elanctxt.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan3/elanctxt.h 2003-09-24 09:57:24.000000000 -0400 +Index: linux-2.4.21/include/elan3/elanctxt.h +=================================================================== +--- linux-2.4.21.orig/include/elan3/elanctxt.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan3/elanctxt.h 2005-06-01 23:12:54.719420864 -0400 @@ -0,0 +1,856 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -80089,9 +80274,10 @@ diff -urNp linux-2.4.21.orig/include/elan3/elanctxt.h linux-2.4.21/include/elan3 + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/include/elan3/elandebug.h linux-2.4.21/include/elan3/elandebug.h ---- linux-2.4.21.orig/include/elan3/elandebug.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan3/elandebug.h 2003-09-24 09:57:24.000000000 -0400 +Index: linux-2.4.21/include/elan3/elandebug.h +=================================================================== +--- linux-2.4.21.orig/include/elan3/elandebug.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan3/elandebug.h 2005-06-01 23:12:54.720420712 -0400 @@ -0,0 +1,106 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -80199,9 +80385,10 @@ diff -urNp linux-2.4.21.orig/include/elan3/elandebug.h linux-2.4.21/include/elan + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/include/elan3/elandev.h linux-2.4.21/include/elan3/elandev.h ---- linux-2.4.21.orig/include/elan3/elandev.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan3/elandev.h 2004-12-10 06:10:19.000000000 -0500 +Index: linux-2.4.21/include/elan3/elandev.h +=================================================================== +--- linux-2.4.21.orig/include/elan3/elandev.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan3/elandev.h 2005-06-01 23:12:54.721420560 -0400 @@ -0,0 +1,581 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -80784,9 +80971,10 @@ diff -urNp linux-2.4.21.orig/include/elan3/elandev.h linux-2.4.21/include/elan3/ + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/include/elan3/elandev_linux.h linux-2.4.21/include/elan3/elandev_linux.h ---- linux-2.4.21.orig/include/elan3/elandev_linux.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan3/elandev_linux.h 2003-09-24 09:57:24.000000000 -0400 +Index: linux-2.4.21/include/elan3/elandev_linux.h +=================================================================== +--- linux-2.4.21.orig/include/elan3/elandev_linux.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan3/elandev_linux.h 2005-06-01 23:12:54.721420560 -0400 @@ -0,0 +1,56 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -80844,9 +81032,10 @@ diff -urNp linux-2.4.21.orig/include/elan3/elandev_linux.h linux-2.4.21/include/ + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/include/elan3/elanio.h linux-2.4.21/include/elan3/elanio.h ---- linux-2.4.21.orig/include/elan3/elanio.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan3/elanio.h 2003-12-08 10:40:26.000000000 -0500 +Index: linux-2.4.21/include/elan3/elanio.h +=================================================================== +--- linux-2.4.21.orig/include/elan3/elanio.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan3/elanio.h 2005-06-01 23:12:54.722420408 -0400 @@ -0,0 +1,226 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -81074,9 +81263,10 @@ diff -urNp linux-2.4.21.orig/include/elan3/elanio.h linux-2.4.21/include/elan3/e + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/include/elan3/elanregs.h linux-2.4.21/include/elan3/elanregs.h ---- linux-2.4.21.orig/include/elan3/elanregs.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan3/elanregs.h 2004-04-22 08:27:21.000000000 -0400 +Index: linux-2.4.21/include/elan3/elanregs.h +=================================================================== +--- linux-2.4.21.orig/include/elan3/elanregs.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan3/elanregs.h 2005-06-01 23:12:54.724420104 -0400 @@ -0,0 +1,1063 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -82141,9 +82331,10 @@ diff -urNp linux-2.4.21.orig/include/elan3/elanregs.h linux-2.4.21/include/elan3 + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/include/elan3/elansyscall.h linux-2.4.21/include/elan3/elansyscall.h ---- linux-2.4.21.orig/include/elan3/elansyscall.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan3/elansyscall.h 2004-06-07 09:50:06.000000000 -0400 +Index: linux-2.4.21/include/elan3/elansyscall.h +=================================================================== +--- linux-2.4.21.orig/include/elan3/elansyscall.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan3/elansyscall.h 2005-06-01 23:12:54.724420104 -0400 @@ -0,0 +1,124 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -82269,9 +82460,10 @@ diff -urNp linux-2.4.21.orig/include/elan3/elansyscall.h linux-2.4.21/include/el + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/include/elan3/elanuregs.h linux-2.4.21/include/elan3/elanuregs.h ---- linux-2.4.21.orig/include/elan3/elanuregs.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan3/elanuregs.h 2003-09-24 09:57:24.000000000 -0400 +Index: linux-2.4.21/include/elan3/elanuregs.h +=================================================================== +--- linux-2.4.21.orig/include/elan3/elanuregs.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan3/elanuregs.h 2005-06-01 23:12:54.725419952 -0400 @@ -0,0 +1,295 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -82568,9 +82760,10 @@ diff -urNp linux-2.4.21.orig/include/elan3/elanuregs.h linux-2.4.21/include/elan + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/include/elan3/elanvp.h linux-2.4.21/include/elan3/elanvp.h ---- linux-2.4.21.orig/include/elan3/elanvp.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan3/elanvp.h 2004-06-18 05:28:06.000000000 -0400 +Index: linux-2.4.21/include/elan3/elanvp.h +=================================================================== +--- linux-2.4.21.orig/include/elan3/elanvp.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan3/elanvp.h 2005-06-01 23:12:54.726419800 -0400 @@ -0,0 +1,165 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -82737,9 +82930,10 @@ diff -urNp linux-2.4.21.orig/include/elan3/elanvp.h linux-2.4.21/include/elan3/e + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/include/elan3/events.h linux-2.4.21/include/elan3/events.h ---- linux-2.4.21.orig/include/elan3/events.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan3/events.h 2003-09-24 09:57:24.000000000 -0400 +Index: linux-2.4.21/include/elan3/events.h +=================================================================== +--- linux-2.4.21.orig/include/elan3/events.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan3/events.h 2005-06-01 23:12:54.726419800 -0400 @@ -0,0 +1,183 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -82924,9 +83118,10 @@ diff -urNp linux-2.4.21.orig/include/elan3/events.h linux-2.4.21/include/elan3/e + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/include/elan3/intrinsics.h linux-2.4.21/include/elan3/intrinsics.h ---- linux-2.4.21.orig/include/elan3/intrinsics.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan3/intrinsics.h 2003-09-24 09:57:24.000000000 -0400 +Index: linux-2.4.21/include/elan3/intrinsics.h +=================================================================== +--- linux-2.4.21.orig/include/elan3/intrinsics.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan3/intrinsics.h 2005-06-01 23:12:54.727419648 -0400 @@ -0,0 +1,320 @@ +/* + * Copyright (c) 2003 by Quadrics Limited. @@ -83248,9 +83443,10 @@ diff -urNp linux-2.4.21.orig/include/elan3/intrinsics.h linux-2.4.21/include/ela + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/include/elan3/minames.h linux-2.4.21/include/elan3/minames.h ---- linux-2.4.21.orig/include/elan3/minames.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan3/minames.h 2005-03-02 10:40:51.000000000 -0500 +Index: linux-2.4.21/include/elan3/minames.h +=================================================================== +--- linux-2.4.21.orig/include/elan3/minames.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan3/minames.h 2005-06-01 23:12:54.728419496 -0400 @@ -0,0 +1,256 @@ +{MI_WaitForRemoteDescRead, "MI_WaitForRemoteDescRead"}, +{MI_WaitForRemoteDescRead2, "MI_WaitForRemoteDescRead2"}, @@ -83508,9 +83704,10 @@ diff -urNp linux-2.4.21.orig/include/elan3/minames.h linux-2.4.21/include/elan3/ +{MI_CheckForRunIfZero, "MI_CheckForRunIfZero"}, +{MI_TestForBreakOrSuspend, "MI_TestForBreakOrSuspend"}, +{MI_SwapForRunable, "MI_SwapForRunable"}, -diff -urNp linux-2.4.21.orig/include/elan3/neterr_rpc.h linux-2.4.21/include/elan3/neterr_rpc.h ---- linux-2.4.21.orig/include/elan3/neterr_rpc.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan3/neterr_rpc.h 2003-06-26 12:05:22.000000000 -0400 +Index: linux-2.4.21/include/elan3/neterr_rpc.h +=================================================================== +--- linux-2.4.21.orig/include/elan3/neterr_rpc.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan3/neterr_rpc.h 2005-06-01 23:12:54.728419496 -0400 @@ -0,0 +1,68 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -83580,9 +83777,10 @@ diff -urNp linux-2.4.21.orig/include/elan3/neterr_rpc.h linux-2.4.21/include/ela + * End: + */ +#endif /* __ELAN3_NETERR_RPC_H */ -diff -urNp linux-2.4.21.orig/include/elan3/perm.h linux-2.4.21/include/elan3/perm.h ---- linux-2.4.21.orig/include/elan3/perm.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan3/perm.h 2003-09-24 09:57:24.000000000 -0400 +Index: linux-2.4.21/include/elan3/perm.h +=================================================================== +--- linux-2.4.21.orig/include/elan3/perm.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan3/perm.h 2005-06-01 23:12:54.728419496 -0400 @@ -0,0 +1,29 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -83613,9 +83811,10 @@ diff -urNp linux-2.4.21.orig/include/elan3/perm.h linux-2.4.21/include/elan3/per + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/include/elan3/pte.h linux-2.4.21/include/elan3/pte.h ---- linux-2.4.21.orig/include/elan3/pte.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan3/pte.h 2003-09-24 09:57:24.000000000 -0400 +Index: linux-2.4.21/include/elan3/pte.h +=================================================================== +--- linux-2.4.21.orig/include/elan3/pte.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan3/pte.h 2005-06-01 23:12:54.729419344 -0400 @@ -0,0 +1,139 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -83756,9 +83955,10 @@ diff -urNp linux-2.4.21.orig/include/elan3/pte.h linux-2.4.21/include/elan3/pte. + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/include/elan3/spinlock.h linux-2.4.21/include/elan3/spinlock.h ---- linux-2.4.21.orig/include/elan3/spinlock.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan3/spinlock.h 2003-09-24 09:57:24.000000000 -0400 +Index: linux-2.4.21/include/elan3/spinlock.h +=================================================================== +--- linux-2.4.21.orig/include/elan3/spinlock.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan3/spinlock.h 2005-06-01 23:12:54.729419344 -0400 @@ -0,0 +1,195 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -83955,9 +84155,10 @@ diff -urNp linux-2.4.21.orig/include/elan3/spinlock.h linux-2.4.21/include/elan3 + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/include/elan3/thread.h linux-2.4.21/include/elan3/thread.h ---- linux-2.4.21.orig/include/elan3/thread.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan3/thread.h 2002-08-09 07:23:34.000000000 -0400 +Index: linux-2.4.21/include/elan3/thread.h +=================================================================== +--- linux-2.4.21.orig/include/elan3/thread.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan3/thread.h 2005-06-01 23:12:54.730419192 -0400 @@ -0,0 +1,137 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -84096,9 +84297,10 @@ diff -urNp linux-2.4.21.orig/include/elan3/thread.h linux-2.4.21/include/elan3/t + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/include/elan3/threadlinkage.h linux-2.4.21/include/elan3/threadlinkage.h ---- linux-2.4.21.orig/include/elan3/threadlinkage.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan3/threadlinkage.h 2002-08-09 07:23:34.000000000 -0400 +Index: linux-2.4.21/include/elan3/threadlinkage.h +=================================================================== +--- linux-2.4.21.orig/include/elan3/threadlinkage.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan3/threadlinkage.h 2005-06-01 23:12:54.730419192 -0400 @@ -0,0 +1,103 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -84203,9 +84405,10 @@ diff -urNp linux-2.4.21.orig/include/elan3/threadlinkage.h linux-2.4.21/include/ + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/include/elan3/threadsyscall.h linux-2.4.21/include/elan3/threadsyscall.h ---- linux-2.4.21.orig/include/elan3/threadsyscall.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan3/threadsyscall.h 2003-09-24 09:57:24.000000000 -0400 +Index: linux-2.4.21/include/elan3/threadsyscall.h +=================================================================== +--- linux-2.4.21.orig/include/elan3/threadsyscall.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan3/threadsyscall.h 2005-06-01 23:12:54.730419192 -0400 @@ -0,0 +1,64 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -84271,9 +84474,10 @@ diff -urNp linux-2.4.21.orig/include/elan3/threadsyscall.h linux-2.4.21/include/ + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/include/elan3/trtype.h linux-2.4.21/include/elan3/trtype.h ---- linux-2.4.21.orig/include/elan3/trtype.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan3/trtype.h 2002-08-09 07:23:34.000000000 -0400 +Index: linux-2.4.21/include/elan3/trtype.h +=================================================================== +--- linux-2.4.21.orig/include/elan3/trtype.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan3/trtype.h 2005-06-01 23:12:54.731419040 -0400 @@ -0,0 +1,116 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -84391,9 +84595,10 @@ diff -urNp linux-2.4.21.orig/include/elan3/trtype.h linux-2.4.21/include/elan3/t + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/include/elan3/urom_addrs.h linux-2.4.21/include/elan3/urom_addrs.h ---- linux-2.4.21.orig/include/elan3/urom_addrs.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan3/urom_addrs.h 2002-07-12 10:28:21.000000000 -0400 +Index: linux-2.4.21/include/elan3/urom_addrs.h +=================================================================== +--- linux-2.4.21.orig/include/elan3/urom_addrs.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan3/urom_addrs.h 2005-06-01 23:12:54.731419040 -0400 @@ -0,0 +1,262 @@ +#define MI_WaitForRemoteDescRead 0x0 +#define MI_WaitForRemoteDescRead2 0x1 @@ -84657,9 +84862,10 @@ diff -urNp linux-2.4.21.orig/include/elan3/urom_addrs.h linux-2.4.21/include/ela + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/include/elan3/vmseg.h linux-2.4.21/include/elan3/vmseg.h ---- linux-2.4.21.orig/include/elan3/vmseg.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan3/vmseg.h 2003-09-24 09:57:24.000000000 -0400 +Index: linux-2.4.21/include/elan3/vmseg.h +=================================================================== +--- linux-2.4.21.orig/include/elan3/vmseg.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan3/vmseg.h 2005-06-01 23:12:54.732418888 -0400 @@ -0,0 +1,75 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -84736,9 +84942,10 @@ diff -urNp linux-2.4.21.orig/include/elan3/vmseg.h linux-2.4.21/include/elan3/vm + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/include/elan3/vpd.h linux-2.4.21/include/elan3/vpd.h ---- linux-2.4.21.orig/include/elan3/vpd.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan3/vpd.h 2002-08-09 07:23:34.000000000 -0400 +Index: linux-2.4.21/include/elan3/vpd.h +=================================================================== +--- linux-2.4.21.orig/include/elan3/vpd.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan3/vpd.h 2005-06-01 23:12:54.732418888 -0400 @@ -0,0 +1,47 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -84787,9 +84994,10 @@ diff -urNp linux-2.4.21.orig/include/elan3/vpd.h linux-2.4.21/include/elan3/vpd. + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/include/elan4/commands.h linux-2.4.21/include/elan4/commands.h ---- linux-2.4.21.orig/include/elan4/commands.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan4/commands.h 2004-06-16 11:45:02.000000000 -0400 +Index: linux-2.4.21/include/elan4/commands.h +=================================================================== +--- linux-2.4.21.orig/include/elan4/commands.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan4/commands.h 2005-06-01 23:12:54.733418736 -0400 @@ -0,0 +1,247 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -85038,9 +85246,10 @@ diff -urNp linux-2.4.21.orig/include/elan4/commands.h linux-2.4.21/include/elan4 + +#endif /* __ELAN4_COMMANDS_H */ + -diff -urNp linux-2.4.21.orig/include/elan4/debug.h linux-2.4.21/include/elan4/debug.h ---- linux-2.4.21.orig/include/elan4/debug.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan4/debug.h 2005-01-18 09:36:10.000000000 -0500 +Index: linux-2.4.21/include/elan4/debug.h +=================================================================== +--- linux-2.4.21.orig/include/elan4/debug.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan4/debug.h 2005-06-01 23:12:54.733418736 -0400 @@ -0,0 +1,113 @@ +/* + * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd. @@ -85155,9 +85364,10 @@ diff -urNp linux-2.4.21.orig/include/elan4/debug.h linux-2.4.21/include/elan4/de + * End: + */ +#endif /* _ELAN4_ELANDEBUG_H */ -diff -urNp linux-2.4.21.orig/include/elan4/device.h linux-2.4.21/include/elan4/device.h ---- linux-2.4.21.orig/include/elan4/device.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan4/device.h 2004-11-03 09:24:32.000000000 -0500 +Index: linux-2.4.21/include/elan4/device.h +=================================================================== +--- linux-2.4.21.orig/include/elan4/device.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan4/device.h 2005-06-01 23:12:54.735418432 -0400 @@ -0,0 +1,781 @@ +/* + * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd. @@ -85940,9 +86150,10 @@ diff -urNp linux-2.4.21.orig/include/elan4/device.h linux-2.4.21/include/elan4/d + * End: + */ +#endif /* __ELAN4_ELANDEV_H */ -diff -urNp linux-2.4.21.orig/include/elan4/device_Linux.h linux-2.4.21/include/elan4/device_Linux.h ---- linux-2.4.21.orig/include/elan4/device_Linux.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan4/device_Linux.h 2004-08-09 10:02:37.000000000 -0400 +Index: linux-2.4.21/include/elan4/device_Linux.h +=================================================================== +--- linux-2.4.21.orig/include/elan4/device_Linux.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan4/device_Linux.h 2005-06-01 23:12:54.735418432 -0400 @@ -0,0 +1,97 @@ +/* + * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd. @@ -86041,9 +86252,10 @@ diff -urNp linux-2.4.21.orig/include/elan4/device_Linux.h linux-2.4.21/include/e + * End: + */ +#endif /* __ELAN4_ELANDEV_LINUX_H */ -diff -urNp linux-2.4.21.orig/include/elan4/dma.h linux-2.4.21/include/elan4/dma.h ---- linux-2.4.21.orig/include/elan4/dma.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan4/dma.h 2003-09-04 08:39:17.000000000 -0400 +Index: linux-2.4.21/include/elan4/dma.h +=================================================================== +--- linux-2.4.21.orig/include/elan4/dma.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan4/dma.h 2005-06-01 23:12:54.736418280 -0400 @@ -0,0 +1,82 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -86127,9 +86339,10 @@ diff -urNp linux-2.4.21.orig/include/elan4/dma.h linux-2.4.21/include/elan4/dma. +} E4_DMA64; + +#endif /* __ELAN4_DMA_H */ -diff -urNp linux-2.4.21.orig/include/elan4/events.h linux-2.4.21/include/elan4/events.h ---- linux-2.4.21.orig/include/elan4/events.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan4/events.h 2004-06-23 07:07:18.000000000 -0400 +Index: linux-2.4.21/include/elan4/events.h +=================================================================== +--- linux-2.4.21.orig/include/elan4/events.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan4/events.h 2005-06-01 23:12:54.736418280 -0400 @@ -0,0 +1,179 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -86310,9 +86523,10 @@ diff -urNp linux-2.4.21.orig/include/elan4/events.h linux-2.4.21/include/elan4/e +#endif /* _ASM */ + +#endif /* __ELAN4_EVENTS_H */ -diff -urNp linux-2.4.21.orig/include/elan4/i2c.h linux-2.4.21/include/elan4/i2c.h ---- linux-2.4.21.orig/include/elan4/i2c.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan4/i2c.h 2003-12-02 11:11:22.000000000 -0500 +Index: linux-2.4.21/include/elan4/i2c.h +=================================================================== +--- linux-2.4.21.orig/include/elan4/i2c.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan4/i2c.h 2005-06-01 23:12:54.736418280 -0400 @@ -0,0 +1,47 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -86361,9 +86575,10 @@ diff -urNp linux-2.4.21.orig/include/elan4/i2c.h linux-2.4.21/include/elan4/i2c. + * End: + */ +#endif /* _ELAN4_I2C_H */ -diff -urNp linux-2.4.21.orig/include/elan4/intcookie.h linux-2.4.21/include/elan4/intcookie.h ---- linux-2.4.21.orig/include/elan4/intcookie.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan4/intcookie.h 2004-08-09 10:02:37.000000000 -0400 +Index: linux-2.4.21/include/elan4/intcookie.h +=================================================================== +--- linux-2.4.21.orig/include/elan4/intcookie.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan4/intcookie.h 2005-06-01 23:12:54.737418128 -0400 @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd. @@ -86427,9 +86642,10 @@ diff -urNp linux-2.4.21.orig/include/elan4/intcookie.h linux-2.4.21/include/elan + * End: + */ +#endif /* __ELAN4_INTCOOKIE_H */ -diff -urNp linux-2.4.21.orig/include/elan4/ioctl.h linux-2.4.21/include/elan4/ioctl.h ---- linux-2.4.21.orig/include/elan4/ioctl.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan4/ioctl.h 2005-01-11 07:15:39.000000000 -0500 +Index: linux-2.4.21/include/elan4/ioctl.h +=================================================================== +--- linux-2.4.21.orig/include/elan4/ioctl.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan4/ioctl.h 2005-06-01 23:12:54.738417976 -0400 @@ -0,0 +1,320 @@ +/* + * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd. @@ -86751,9 +86967,10 @@ diff -urNp linux-2.4.21.orig/include/elan4/ioctl.h linux-2.4.21/include/elan4/io + * End: + */ +#endif /* __ELAN4_IOCTL_H */ -diff -urNp linux-2.4.21.orig/include/elan4/mmu.h linux-2.4.21/include/elan4/mmu.h ---- linux-2.4.21.orig/include/elan4/mmu.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan4/mmu.h 2004-04-21 08:04:24.000000000 -0400 +Index: linux-2.4.21/include/elan4/mmu.h +=================================================================== +--- linux-2.4.21.orig/include/elan4/mmu.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan4/mmu.h 2005-06-01 23:12:54.738417976 -0400 @@ -0,0 +1,94 @@ +/* + * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd. @@ -86849,9 +87066,10 @@ diff -urNp linux-2.4.21.orig/include/elan4/mmu.h linux-2.4.21/include/elan4/mmu. + * End: + */ +#endif /* __ELAN4_MMU_H */ -diff -urNp linux-2.4.21.orig/include/elan4/neterr.h linux-2.4.21/include/elan4/neterr.h ---- linux-2.4.21.orig/include/elan4/neterr.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan4/neterr.h 2004-01-19 09:38:34.000000000 -0500 +Index: linux-2.4.21/include/elan4/neterr.h +=================================================================== +--- linux-2.4.21.orig/include/elan4/neterr.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan4/neterr.h 2005-06-01 23:12:54.738417976 -0400 @@ -0,0 +1,40 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -86893,9 +87111,10 @@ diff -urNp linux-2.4.21.orig/include/elan4/neterr.h linux-2.4.21/include/elan4/n + * End: + */ +#endif /* __ELAN4_NETERR_H */ -diff -urNp linux-2.4.21.orig/include/elan4/pci.h linux-2.4.21/include/elan4/pci.h ---- linux-2.4.21.orig/include/elan4/pci.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan4/pci.h 2003-09-04 08:39:17.000000000 -0400 +Index: linux-2.4.21/include/elan4/pci.h +=================================================================== +--- linux-2.4.21.orig/include/elan4/pci.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan4/pci.h 2005-06-01 23:12:54.739417824 -0400 @@ -0,0 +1,227 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -87124,9 +87343,10 @@ diff -urNp linux-2.4.21.orig/include/elan4/pci.h linux-2.4.21/include/elan4/pci. +#define ECTRL_SYS_CLOCK_RATIO_MASK (7 << ECTRL_SYS_CLOCK_RATIO_SHIFT) + +#endif /* __ELAN4_PCI_H */ -diff -urNp linux-2.4.21.orig/include/elan4/registers.h linux-2.4.21/include/elan4/registers.h ---- linux-2.4.21.orig/include/elan4/registers.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan4/registers.h 2004-10-04 10:26:18.000000000 -0400 +Index: linux-2.4.21/include/elan4/registers.h +=================================================================== +--- linux-2.4.21.orig/include/elan4/registers.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan4/registers.h 2005-06-01 23:12:54.742417368 -0400 @@ -0,0 +1,1588 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -88716,9 +88936,10 @@ diff -urNp linux-2.4.21.orig/include/elan4/registers.h linux-2.4.21/include/elan +#define ELAN4_REVB_NUM_COMMAND_QUEUES (ELAN4_REVB_I2C_OFFSET >> 13) + +#endif /* notdef _ELAN4_REGISTERS_H */ -diff -urNp linux-2.4.21.orig/include/elan4/sdram.h linux-2.4.21/include/elan4/sdram.h ---- linux-2.4.21.orig/include/elan4/sdram.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan4/sdram.h 2003-09-24 09:55:55.000000000 -0400 +Index: linux-2.4.21/include/elan4/sdram.h +=================================================================== +--- linux-2.4.21.orig/include/elan4/sdram.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan4/sdram.h 2005-06-01 23:12:54.743417216 -0400 @@ -0,0 +1,41 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -88761,9 +88982,10 @@ diff -urNp linux-2.4.21.orig/include/elan4/sdram.h linux-2.4.21/include/elan4/sd +#define SDRAM_MIN_PAGE_SIZE (8192) + +#endif /* __ELAN4_SDRAM_H */ -diff -urNp linux-2.4.21.orig/include/elan4/stats.h linux-2.4.21/include/elan4/stats.h ---- linux-2.4.21.orig/include/elan4/stats.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan4/stats.h 2004-10-06 07:09:12.000000000 -0400 +Index: linux-2.4.21/include/elan4/stats.h +=================================================================== +--- linux-2.4.21.orig/include/elan4/stats.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan4/stats.h 2005-06-01 23:12:54.743417216 -0400 @@ -0,0 +1,83 @@ +/* + * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd. @@ -88848,9 +89070,10 @@ diff -urNp linux-2.4.21.orig/include/elan4/stats.h linux-2.4.21/include/elan4/st + * End: + */ +#endif /*__ELAN4_STATS_H */ -diff -urNp linux-2.4.21.orig/include/elan4/tprintf.h linux-2.4.21/include/elan4/tprintf.h ---- linux-2.4.21.orig/include/elan4/tprintf.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan4/tprintf.h 2003-09-04 08:39:17.000000000 -0400 +Index: linux-2.4.21/include/elan4/tprintf.h +=================================================================== +--- linux-2.4.21.orig/include/elan4/tprintf.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan4/tprintf.h 2005-06-01 23:12:54.743417216 -0400 @@ -0,0 +1,24 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -88876,9 +89099,10 @@ diff -urNp linux-2.4.21.orig/include/elan4/tprintf.h linux-2.4.21/include/elan4/ +#endif /* _ASM */ + +#endif /* __ELAN4_TPRINTF_H */ -diff -urNp linux-2.4.21.orig/include/elan4/trap.h linux-2.4.21/include/elan4/trap.h ---- linux-2.4.21.orig/include/elan4/trap.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan4/trap.h 2003-10-07 08:11:10.000000000 -0400 +Index: linux-2.4.21/include/elan4/trap.h +=================================================================== +--- linux-2.4.21.orig/include/elan4/trap.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan4/trap.h 2005-06-01 23:12:54.743417216 -0400 @@ -0,0 +1,95 @@ +/* + * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd. @@ -88975,9 +89199,10 @@ diff -urNp linux-2.4.21.orig/include/elan4/trap.h linux-2.4.21/include/elan4/tra + * End: + */ +#endif /* __ELAN4_TRAP_H */ -diff -urNp linux-2.4.21.orig/include/elan4/trtype.h linux-2.4.21/include/elan4/trtype.h ---- linux-2.4.21.orig/include/elan4/trtype.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan4/trtype.h 2004-02-06 05:38:21.000000000 -0500 +Index: linux-2.4.21/include/elan4/trtype.h +=================================================================== +--- linux-2.4.21.orig/include/elan4/trtype.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan4/trtype.h 2005-06-01 23:12:54.744417064 -0400 @@ -0,0 +1,112 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -89091,9 +89316,10 @@ diff -urNp linux-2.4.21.orig/include/elan4/trtype.h linux-2.4.21/include/elan4/t +#define TR_TRACEROUTE1_BCAST_BOTTOM(val) (((val) >> 12) & 7) /* 12:14 Broadcast Bottom */ + +#endif /* _ELAN4_TRANSACTIONTYPE_H */ -diff -urNp linux-2.4.21.orig/include/elan4/types.h linux-2.4.21/include/elan4/types.h ---- linux-2.4.21.orig/include/elan4/types.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan4/types.h 2003-09-04 08:39:17.000000000 -0400 +Index: linux-2.4.21/include/elan4/types.h +=================================================================== +--- linux-2.4.21.orig/include/elan4/types.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan4/types.h 2005-06-01 23:12:54.744417064 -0400 @@ -0,0 +1,69 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -89164,9 +89390,10 @@ diff -urNp linux-2.4.21.orig/include/elan4/types.h linux-2.4.21/include/elan4/ty + +#endif /* __ELAN4_TYPES_H */ + -diff -urNp linux-2.4.21.orig/include/elan4/user.h linux-2.4.21/include/elan4/user.h ---- linux-2.4.21.orig/include/elan4/user.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan4/user.h 2004-11-18 12:54:17.000000000 -0500 +Index: linux-2.4.21/include/elan4/user.h +=================================================================== +--- linux-2.4.21.orig/include/elan4/user.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan4/user.h 2005-06-01 23:12:54.745416912 -0400 @@ -0,0 +1,344 @@ +/* + * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd. @@ -89512,9 +89739,10 @@ diff -urNp linux-2.4.21.orig/include/elan4/user.h linux-2.4.21/include/elan4/use + * End: + */ +#endif /* __ELAN4_USER_H */ -diff -urNp linux-2.4.21.orig/include/elan4/userregs.h linux-2.4.21/include/elan4/userregs.h ---- linux-2.4.21.orig/include/elan4/userregs.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan4/userregs.h 2004-10-07 06:57:40.000000000 -0400 +Index: linux-2.4.21/include/elan4/userregs.h +=================================================================== +--- linux-2.4.21.orig/include/elan4/userregs.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan4/userregs.h 2005-06-01 23:12:54.746416760 -0400 @@ -0,0 +1,383 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -89899,9 +90127,10 @@ diff -urNp linux-2.4.21.orig/include/elan4/userregs.h linux-2.4.21/include/elan4 +#endif + +#endif /* __ELAN4_USERREGS_H */ -diff -urNp linux-2.4.21.orig/include/elan4/usertrap.h linux-2.4.21/include/elan4/usertrap.h ---- linux-2.4.21.orig/include/elan4/usertrap.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan4/usertrap.h 2004-05-05 05:08:35.000000000 -0400 +Index: linux-2.4.21/include/elan4/usertrap.h +=================================================================== +--- linux-2.4.21.orig/include/elan4/usertrap.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan4/usertrap.h 2005-06-01 23:12:54.746416760 -0400 @@ -0,0 +1,114 @@ +/* + * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd. @@ -90017,9 +90246,10 @@ diff -urNp linux-2.4.21.orig/include/elan4/usertrap.h linux-2.4.21/include/elan4 + * End: + */ +#endif /* __ELAN4_USERTRAP_H */ -diff -urNp linux-2.4.21.orig/include/elan4/xsdram.h linux-2.4.21/include/elan4/xsdram.h ---- linux-2.4.21.orig/include/elan4/xsdram.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/elan4/xsdram.h 2004-03-05 07:32:04.000000000 -0500 +Index: linux-2.4.21/include/elan4/xsdram.h +=================================================================== +--- linux-2.4.21.orig/include/elan4/xsdram.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/elan4/xsdram.h 2005-06-01 23:12:54.747416608 -0400 @@ -0,0 +1,59 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -90080,9 +90310,10 @@ diff -urNp linux-2.4.21.orig/include/elan4/xsdram.h linux-2.4.21/include/elan4/x +#endif + +#endif /* __ELAN4_XSDRAM_H */ -diff -urNp linux-2.4.21.orig/include/jtag/jtagio.h linux-2.4.21/include/jtag/jtagio.h ---- linux-2.4.21.orig/include/jtag/jtagio.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/jtag/jtagio.h 2005-01-27 10:21:47.000000000 -0500 +Index: linux-2.4.21/include/jtag/jtagio.h +=================================================================== +--- linux-2.4.21.orig/include/jtag/jtagio.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/jtag/jtagio.h 2005-06-01 23:12:54.747416608 -0400 @@ -0,0 +1,106 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -90190,9 +90421,10 @@ diff -urNp linux-2.4.21.orig/include/jtag/jtagio.h linux-2.4.21/include/jtag/jta +#endif + +#endif /* __SYS_JTAGMOD_H */ -diff -urNp linux-2.4.21.orig/include/linux/coproc.h linux-2.4.21/include/linux/coproc.h ---- linux-2.4.21.orig/include/linux/coproc.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/linux/coproc.h 2005-05-04 18:24:21.707190528 -0400 +Index: linux-2.4.21/include/linux/coproc.h +=================================================================== +--- linux-2.4.21.orig/include/linux/coproc.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/linux/coproc.h 2005-06-01 23:12:54.748416456 -0400 @@ -0,0 +1,206 @@ +/* + * Copyright (C) 2002, 2003 Quadrics Ltd. @@ -90400,9 +90632,10 @@ diff -urNp linux-2.4.21.orig/include/linux/coproc.h linux-2.4.21/include/linux/c + + +#endif /* __LINUX_COPROC_H__ */ -diff -urNp linux-2.4.21.orig/include/linux/ptrack.h linux-2.4.21/include/linux/ptrack.h ---- linux-2.4.21.orig/include/linux/ptrack.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/linux/ptrack.h 2005-05-04 18:24:21.917158608 -0400 +Index: linux-2.4.21/include/linux/ptrack.h +=================================================================== +--- linux-2.4.21.orig/include/linux/ptrack.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/linux/ptrack.h 2005-06-01 23:12:54.748416456 -0400 @@ -0,0 +1,53 @@ +/* + * Copyright (C) 2000 Regents of the University of California @@ -90457,10 +90690,11 @@ diff -urNp linux-2.4.21.orig/include/linux/ptrack.h linux-2.4.21/include/linux/p +extern int ptrack_call_callbacks (int phase, struct task_struct *child); + +#endif /* __LINUX_PTRACK_H */ -diff -urNp linux-2.4.21.orig/include/linux/sched.h linux-2.4.21/include/linux/sched.h ---- linux-2.4.21.orig/include/linux/sched.h 2005-05-04 15:31:26.000000000 -0400 -+++ linux-2.4.21/include/linux/sched.h 2005-05-04 18:24:22.108129576 -0400 -@@ -30,6 +30,8 @@ extern unsigned long event; +Index: linux-2.4.21/include/linux/sched.h +=================================================================== +--- linux-2.4.21.orig/include/linux/sched.h 2005-06-01 22:52:05.000000000 -0400 ++++ linux-2.4.21/include/linux/sched.h 2005-06-01 23:12:54.749416304 -0400 +@@ -30,6 +30,8 @@ #include #include @@ -90469,7 +90703,7 @@ diff -urNp linux-2.4.21.orig/include/linux/sched.h linux-2.4.21/include/linux/sc struct exec_domain; extern int exec_shield; extern int exec_shield_randomize; -@@ -322,6 +324,9 @@ struct mm_struct { +@@ -322,6 +324,9 @@ #endif /* Architecture-specific MM context */ mm_context_t context; @@ -90479,7 +90713,7 @@ diff -urNp linux-2.4.21.orig/include/linux/sched.h linux-2.4.21/include/linux/sc /* coredumping support */ int core_waiters; -@@ -342,6 +347,7 @@ extern int mmlist_nr; +@@ -342,6 +347,7 @@ mmap_sem: __RWSEM_INITIALIZER(name.mmap_sem), \ page_table_lock: SPIN_LOCK_UNLOCKED, \ mmlist: LIST_HEAD_INIT(name.mmlist), \ @@ -90487,7 +90721,7 @@ diff -urNp linux-2.4.21.orig/include/linux/sched.h linux-2.4.21/include/linux/sc rlimit_rss: RLIM_INFINITY, \ } -@@ -572,6 +578,9 @@ struct task_struct { +@@ -572,6 +578,9 @@ /* context-switch lock */ spinlock_t switch_lock; @@ -90497,7 +90731,7 @@ diff -urNp linux-2.4.21.orig/include/linux/sched.h linux-2.4.21/include/linux/sc /* journalling filesystem info */ void *journal_info; -@@ -740,6 +749,7 @@ extern struct exec_domain default_exec_d +@@ -740,6 +749,7 @@ blocked: {{0}}, \ alloc_lock: SPIN_LOCK_UNLOCKED, \ switch_lock: SPIN_LOCK_UNLOCKED, \ @@ -90505,9 +90739,10 @@ diff -urNp linux-2.4.21.orig/include/linux/sched.h linux-2.4.21/include/linux/sc journal_info: NULL, \ real_stack: &tsk, \ } -diff -urNp linux-2.4.21.orig/include/qsnet/autoconf.h linux-2.4.21/include/qsnet/autoconf.h ---- linux-2.4.21.orig/include/qsnet/autoconf.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/qsnet/autoconf.h 2005-05-04 18:24:23.935851720 -0400 +Index: linux-2.4.21/include/qsnet/autoconf.h +=================================================================== +--- linux-2.4.21.orig/include/qsnet/autoconf.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/qsnet/autoconf.h 2005-06-01 23:12:54.750416152 -0400 @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2004 by Quadrics Ltd. @@ -90547,9 +90782,10 @@ diff -urNp linux-2.4.21.orig/include/qsnet/autoconf.h linux-2.4.21/include/qsnet +#define CONFIG_JTAG +#define CONFIG_QSNET +#define CONFIG_RMS -diff -urNp linux-2.4.21.orig/include/qsnet/condvar.h linux-2.4.21/include/qsnet/condvar.h ---- linux-2.4.21.orig/include/qsnet/condvar.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/qsnet/condvar.h 2003-06-07 11:43:33.000000000 -0400 +Index: linux-2.4.21/include/qsnet/condvar.h +=================================================================== +--- linux-2.4.21.orig/include/qsnet/condvar.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/qsnet/condvar.h 2005-06-01 23:12:54.750416152 -0400 @@ -0,0 +1,140 @@ +/* + * Copyright (C) 2000 Regents of the University of California @@ -90691,9 +90927,10 @@ diff -urNp linux-2.4.21.orig/include/qsnet/condvar.h linux-2.4.21/include/qsnet/ + +#endif /* __KERNEL__ */ +#endif /* _LINUX_CONDVAR_H */ -diff -urNp linux-2.4.21.orig/include/qsnet/config.h linux-2.4.21/include/qsnet/config.h ---- linux-2.4.21.orig/include/qsnet/config.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/qsnet/config.h 2003-07-24 17:31:19.000000000 -0400 +Index: linux-2.4.21/include/qsnet/config.h +=================================================================== +--- linux-2.4.21.orig/include/qsnet/config.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/qsnet/config.h 2005-06-01 23:12:54.751416000 -0400 @@ -0,0 +1,195 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -90890,9 +91127,10 @@ diff -urNp linux-2.4.21.orig/include/qsnet/config.h linux-2.4.21/include/qsnet/c +#include + +#endif /* _QSNET_CONFIG_H */ -diff -urNp linux-2.4.21.orig/include/qsnet/crwlock.h linux-2.4.21/include/qsnet/crwlock.h ---- linux-2.4.21.orig/include/qsnet/crwlock.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/qsnet/crwlock.h 2003-09-24 10:07:02.000000000 -0400 +Index: linux-2.4.21/include/qsnet/crwlock.h +=================================================================== +--- linux-2.4.21.orig/include/qsnet/crwlock.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/qsnet/crwlock.h 2005-06-01 23:12:54.751416000 -0400 @@ -0,0 +1,207 @@ +/* + * Copyright (C) 2000 Regents of the University of California @@ -91101,9 +91339,10 @@ diff -urNp linux-2.4.21.orig/include/qsnet/crwlock.h linux-2.4.21/include/qsnet/ + +#endif /* __KERNEL__ */ +#endif /* _LINUX_RWLOCK_H */ -diff -urNp linux-2.4.21.orig/include/qsnet/ctrl_linux.h linux-2.4.21/include/qsnet/ctrl_linux.h ---- linux-2.4.21.orig/include/qsnet/ctrl_linux.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/qsnet/ctrl_linux.h 2003-03-26 04:32:03.000000000 -0500 +Index: linux-2.4.21/include/qsnet/ctrl_linux.h +=================================================================== +--- linux-2.4.21.orig/include/qsnet/ctrl_linux.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/qsnet/ctrl_linux.h 2005-06-01 23:12:54.751416000 -0400 @@ -0,0 +1,37 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -91142,9 +91381,10 @@ diff -urNp linux-2.4.21.orig/include/qsnet/ctrl_linux.h linux-2.4.21/include/qsn + * c-file-style: "linux" + * End: + */ -diff -urNp linux-2.4.21.orig/include/qsnet/debug.h linux-2.4.21/include/qsnet/debug.h ---- linux-2.4.21.orig/include/qsnet/debug.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/qsnet/debug.h 2004-08-03 09:55:32.000000000 -0400 +Index: linux-2.4.21/include/qsnet/debug.h +=================================================================== +--- linux-2.4.21.orig/include/qsnet/debug.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/qsnet/debug.h 2005-06-01 23:12:54.752415848 -0400 @@ -0,0 +1,68 @@ +/* + * Copyright (C) 2000 Regents of the University of California @@ -91214,9 +91454,10 @@ diff -urNp linux-2.4.21.orig/include/qsnet/debug.h linux-2.4.21/include/qsnet/de + * c-file-style: "linux" + * End: + */ -diff -urNp linux-2.4.21.orig/include/qsnet/fence.h linux-2.4.21/include/qsnet/fence.h ---- linux-2.4.21.orig/include/qsnet/fence.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/qsnet/fence.h 2004-11-23 09:34:45.000000000 -0500 +Index: linux-2.4.21/include/qsnet/fence.h +=================================================================== +--- linux-2.4.21.orig/include/qsnet/fence.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/qsnet/fence.h 2005-06-01 23:12:54.752415848 -0400 @@ -0,0 +1,178 @@ +/* + * Copyright (c) 2003 by Quadrics Supercomputers World Ltd. @@ -91396,9 +91637,10 @@ diff -urNp linux-2.4.21.orig/include/qsnet/fence.h linux-2.4.21/include/qsnet/fe + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/include/qsnet/kernel.h linux-2.4.21/include/qsnet/kernel.h ---- linux-2.4.21.orig/include/qsnet/kernel.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/qsnet/kernel.h 2003-03-14 05:18:22.000000000 -0500 +Index: linux-2.4.21/include/qsnet/kernel.h +=================================================================== +--- linux-2.4.21.orig/include/qsnet/kernel.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/qsnet/kernel.h 2005-06-01 23:12:54.752415848 -0400 @@ -0,0 +1,38 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -91438,9 +91680,10 @@ diff -urNp linux-2.4.21.orig/include/qsnet/kernel.h linux-2.4.21/include/qsnet/k + + + -diff -urNp linux-2.4.21.orig/include/qsnet/kernel_linux.h linux-2.4.21/include/qsnet/kernel_linux.h ---- linux-2.4.21.orig/include/qsnet/kernel_linux.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/qsnet/kernel_linux.h 2005-01-18 09:37:22.000000000 -0500 +Index: linux-2.4.21/include/qsnet/kernel_linux.h +=================================================================== +--- linux-2.4.21.orig/include/qsnet/kernel_linux.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/qsnet/kernel_linux.h 2005-06-01 23:12:54.753415696 -0400 @@ -0,0 +1,354 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -91796,9 +92039,10 @@ diff -urNp linux-2.4.21.orig/include/qsnet/kernel_linux.h linux-2.4.21/include/q + * c-file-style: "linux" + * End: + */ -diff -urNp linux-2.4.21.orig/include/qsnet/kpte.h linux-2.4.21/include/qsnet/kpte.h ---- linux-2.4.21.orig/include/qsnet/kpte.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/qsnet/kpte.h 2004-11-02 05:45:29.000000000 -0500 +Index: linux-2.4.21/include/qsnet/kpte.h +=================================================================== +--- linux-2.4.21.orig/include/qsnet/kpte.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/qsnet/kpte.h 2005-06-01 23:12:54.753415696 -0400 @@ -0,0 +1,107 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -91907,9 +92151,10 @@ diff -urNp linux-2.4.21.orig/include/qsnet/kpte.h linux-2.4.21/include/qsnet/kpt + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/include/qsnet/kthread.h linux-2.4.21/include/qsnet/kthread.h ---- linux-2.4.21.orig/include/qsnet/kthread.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/qsnet/kthread.h 2004-10-28 07:50:29.000000000 -0400 +Index: linux-2.4.21/include/qsnet/kthread.h +=================================================================== +--- linux-2.4.21.orig/include/qsnet/kthread.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/qsnet/kthread.h 2005-06-01 23:12:54.754415544 -0400 @@ -0,0 +1,71 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -91982,9 +92227,10 @@ diff -urNp linux-2.4.21.orig/include/qsnet/kthread.h linux-2.4.21/include/qsnet/ + * c-file-style: "linux" + * End: + */ -diff -urNp linux-2.4.21.orig/include/qsnet/list.h linux-2.4.21/include/qsnet/list.h ---- linux-2.4.21.orig/include/qsnet/list.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/qsnet/list.h 2003-10-27 08:55:33.000000000 -0500 +Index: linux-2.4.21/include/qsnet/list.h +=================================================================== +--- linux-2.4.21.orig/include/qsnet/list.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/qsnet/list.h 2005-06-01 23:12:54.754415544 -0400 @@ -0,0 +1,80 @@ +/* + * Copyright (c) 2003 by Quadrics Limited. @@ -92066,9 +92312,10 @@ diff -urNp linux-2.4.21.orig/include/qsnet/list.h linux-2.4.21/include/qsnet/lis + pos = n, n = (pos)->next) + +#endif /* __QSNET_LIST_H */ -diff -urNp linux-2.4.21.orig/include/qsnet/mutex.h linux-2.4.21/include/qsnet/mutex.h ---- linux-2.4.21.orig/include/qsnet/mutex.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/qsnet/mutex.h 2003-06-26 12:05:45.000000000 -0400 +Index: linux-2.4.21/include/qsnet/mutex.h +=================================================================== +--- linux-2.4.21.orig/include/qsnet/mutex.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/qsnet/mutex.h 2005-06-01 23:12:54.754415544 -0400 @@ -0,0 +1,91 @@ +/* + * Copyright (C) 2000 Regents of the University of California @@ -92161,9 +92408,10 @@ diff -urNp linux-2.4.21.orig/include/qsnet/mutex.h linux-2.4.21/include/qsnet/mu + +#endif /* __KERNEL__ */ +#endif /* _LINUX_MUTEX_H */ -diff -urNp linux-2.4.21.orig/include/qsnet/procfs_linux.h linux-2.4.21/include/qsnet/procfs_linux.h ---- linux-2.4.21.orig/include/qsnet/procfs_linux.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/qsnet/procfs_linux.h 2004-12-06 12:36:24.000000000 -0500 +Index: linux-2.4.21/include/qsnet/procfs_linux.h +=================================================================== +--- linux-2.4.21.orig/include/qsnet/procfs_linux.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/qsnet/procfs_linux.h 2005-06-01 23:12:54.755415392 -0400 @@ -0,0 +1,234 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -92399,9 +92647,10 @@ diff -urNp linux-2.4.21.orig/include/qsnet/procfs_linux.h linux-2.4.21/include/q + * c-file-style: "linux" + * End: + */ -diff -urNp linux-2.4.21.orig/include/qsnet/pthread.h linux-2.4.21/include/qsnet/pthread.h ---- linux-2.4.21.orig/include/qsnet/pthread.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/qsnet/pthread.h 2004-06-07 06:47:06.000000000 -0400 +Index: linux-2.4.21/include/qsnet/pthread.h +=================================================================== +--- linux-2.4.21.orig/include/qsnet/pthread.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/qsnet/pthread.h 2005-06-01 23:12:54.755415392 -0400 @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2003 by Quadrics Supercomputers World Ltd. @@ -92462,9 +92711,10 @@ diff -urNp linux-2.4.21.orig/include/qsnet/pthread.h linux-2.4.21/include/qsnet/ + * c-file-style: "stroustrup" + * End: + */ -diff -urNp linux-2.4.21.orig/include/qsnet/statsformat.h linux-2.4.21/include/qsnet/statsformat.h ---- linux-2.4.21.orig/include/qsnet/statsformat.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/qsnet/statsformat.h 2003-05-22 15:37:14.000000000 -0400 +Index: linux-2.4.21/include/qsnet/statsformat.h +=================================================================== +--- linux-2.4.21.orig/include/qsnet/statsformat.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/qsnet/statsformat.h 2005-06-01 23:12:54.756415240 -0400 @@ -0,0 +1,25 @@ +#ifndef _QSNET_STATSFORMAT_H +#define _QSNET_STATSFORMAT_H @@ -92491,9 +92741,10 @@ diff -urNp linux-2.4.21.orig/include/qsnet/statsformat.h linux-2.4.21/include/qs +#endif + +#endif -diff -urNp linux-2.4.21.orig/include/qsnet/types.h linux-2.4.21/include/qsnet/types.h ---- linux-2.4.21.orig/include/qsnet/types.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/qsnet/types.h 2003-08-01 12:21:38.000000000 -0400 +Index: linux-2.4.21/include/qsnet/types.h +=================================================================== +--- linux-2.4.21.orig/include/qsnet/types.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/qsnet/types.h 2005-06-01 23:12:54.756415240 -0400 @@ -0,0 +1,90 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -92585,9 +92836,10 @@ diff -urNp linux-2.4.21.orig/include/qsnet/types.h linux-2.4.21/include/qsnet/ty + + +#endif /* __QSNET_TYPES_H */ -diff -urNp linux-2.4.21.orig/include/qsnet/workarounds.h linux-2.4.21/include/qsnet/workarounds.h ---- linux-2.4.21.orig/include/qsnet/workarounds.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/qsnet/workarounds.h 2002-08-09 07:15:55.000000000 -0400 +Index: linux-2.4.21/include/qsnet/workarounds.h +=================================================================== +--- linux-2.4.21.orig/include/qsnet/workarounds.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/qsnet/workarounds.h 2005-06-01 23:12:54.756415240 -0400 @@ -0,0 +1,24 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -92613,9 +92865,10 @@ diff -urNp linux-2.4.21.orig/include/qsnet/workarounds.h linux-2.4.21/include/qs +#define ELAN_REVB_BUG_3 + +#endif /* _QSNET_WORKAROUNDS_H */ -diff -urNp linux-2.4.21.orig/include/rms/rmscall.h linux-2.4.21/include/rms/rmscall.h ---- linux-2.4.21.orig/include/rms/rmscall.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/rms/rmscall.h 2004-05-14 04:55:57.000000000 -0400 +Index: linux-2.4.21/include/rms/rmscall.h +=================================================================== +--- linux-2.4.21.orig/include/rms/rmscall.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/rms/rmscall.h 2005-06-01 23:12:54.757415088 -0400 @@ -0,0 +1,144 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -92761,9 +93014,10 @@ diff -urNp linux-2.4.21.orig/include/rms/rmscall.h linux-2.4.21/include/rms/rmsc + + + -diff -urNp linux-2.4.21.orig/include/rms/rmsio.h linux-2.4.21/include/rms/rmsio.h ---- linux-2.4.21.orig/include/rms/rmsio.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/include/rms/rmsio.h 2004-05-14 04:55:57.000000000 -0400 +Index: linux-2.4.21/include/rms/rmsio.h +=================================================================== +--- linux-2.4.21.orig/include/rms/rmsio.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/include/rms/rmsio.h 2005-06-01 23:12:54.757415088 -0400 @@ -0,0 +1,185 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -92950,10 +93204,11 @@ diff -urNp linux-2.4.21.orig/include/rms/rmsio.h linux-2.4.21/include/rms/rmsio. + + + -diff -urNp linux-2.4.21.orig/ipc/shm.c linux-2.4.21/ipc/shm.c ---- linux-2.4.21.orig/ipc/shm.c 2005-05-04 15:31:08.000000000 -0400 -+++ linux-2.4.21/ipc/shm.c 2005-05-04 18:24:22.292101608 -0400 -@@ -709,6 +709,44 @@ asmlinkage long sys_shmdt (char *shmaddr +Index: linux-2.4.21/ipc/shm.c +=================================================================== +--- linux-2.4.21.orig/ipc/shm.c 2005-06-01 22:51:50.000000000 -0400 ++++ linux-2.4.21/ipc/shm.c 2005-06-01 23:12:54.758414936 -0400 +@@ -723,6 +723,44 @@ return retval; } @@ -92998,9 +93253,10 @@ diff -urNp linux-2.4.21.orig/ipc/shm.c linux-2.4.21/ipc/shm.c #ifdef CONFIG_PROC_FS static int sysvipc_shm_read_proc(char *buffer, char **start, off_t offset, int length, int *eof, void *data) { -diff -urNp linux-2.4.21.orig/kernel/exit.c linux-2.4.21/kernel/exit.c ---- linux-2.4.21.orig/kernel/exit.c 2005-05-04 15:31:25.000000000 -0400 -+++ linux-2.4.21/kernel/exit.c 2005-05-04 18:24:22.109129424 -0400 +Index: linux-2.4.21/kernel/exit.c +=================================================================== +--- linux-2.4.21.orig/kernel/exit.c 2005-06-01 22:58:09.055062312 -0400 ++++ linux-2.4.21/kernel/exit.c 2005-06-01 23:12:54.759414784 -0400 @@ -19,6 +19,7 @@ #include #include @@ -93009,7 +93265,7 @@ diff -urNp linux-2.4.21.orig/kernel/exit.c linux-2.4.21/kernel/exit.c #include #include #include -@@ -702,6 +703,10 @@ NORET_TYPE void do_exit(long code) +@@ -705,6 +706,10 @@ if (current->tux_info) current->tux_exit(); acct_process(code); @@ -93020,9 +93276,10 @@ diff -urNp linux-2.4.21.orig/kernel/exit.c linux-2.4.21/kernel/exit.c if (isaudit(tsk)) audit_exit(tsk, code); __exit_mm(tsk); -diff -urNp linux-2.4.21.orig/kernel/fork.c linux-2.4.21/kernel/fork.c ---- linux-2.4.21.orig/kernel/fork.c 2005-05-04 15:31:26.000000000 -0400 -+++ linux-2.4.21/kernel/fork.c 2005-05-04 18:24:22.110129272 -0400 +Index: linux-2.4.21/kernel/fork.c +=================================================================== +--- linux-2.4.21.orig/kernel/fork.c 2005-06-01 22:58:09.055062312 -0400 ++++ linux-2.4.21/kernel/fork.c 2005-06-01 23:12:54.760414632 -0400 @@ -14,6 +14,7 @@ #include #include @@ -93031,7 +93288,7 @@ diff -urNp linux-2.4.21.orig/kernel/fork.c linux-2.4.21/kernel/fork.c #include #include #include -@@ -307,6 +308,7 @@ static struct mm_struct * mm_init(struct +@@ -308,6 +309,7 @@ /* unlimited stack is larger than TASK_SIZE */ mm->non_executable_cache = NON_EXECUTABLE_CACHE(current); mm->pgd = pgd_alloc(mm); @@ -93039,7 +93296,7 @@ diff -urNp linux-2.4.21.orig/kernel/fork.c linux-2.4.21/kernel/fork.c mm->def_flags = 0; if (mm->pgd) return mm; -@@ -1104,6 +1106,12 @@ int do_fork(unsigned long clone_flags, +@@ -1110,6 +1112,12 @@ p->vfork_done = &vfork; init_completion(&vfork); } @@ -93052,9 +93309,10 @@ diff -urNp linux-2.4.21.orig/kernel/fork.c linux-2.4.21/kernel/fork.c if ((p->ptrace & PT_PTRACED) || (clone_flags & CLONE_STOPPED)) { /* -diff -urNp linux-2.4.21.orig/kernel/ksyms.c linux-2.4.21/kernel/ksyms.c ---- linux-2.4.21.orig/kernel/ksyms.c 2005-05-04 15:31:26.000000000 -0400 -+++ linux-2.4.21/kernel/ksyms.c 2005-05-04 18:24:22.479073184 -0400 +Index: linux-2.4.21/kernel/ksyms.c +=================================================================== +--- linux-2.4.21.orig/kernel/ksyms.c 2005-06-01 23:12:40.911519984 -0400 ++++ linux-2.4.21/kernel/ksyms.c 2005-06-01 23:12:54.760414632 -0400 @@ -43,6 +43,7 @@ #include #include @@ -93063,7 +93321,7 @@ diff -urNp linux-2.4.21.orig/kernel/ksyms.c linux-2.4.21/kernel/ksyms.c #include #include #include -@@ -103,6 +104,10 @@ EXPORT_SYMBOL(__stop___kallsyms); +@@ -104,6 +105,10 @@ #endif @@ -93074,7 +93332,7 @@ diff -urNp linux-2.4.21.orig/kernel/ksyms.c linux-2.4.21/kernel/ksyms.c /* process memory management */ EXPORT_SYMBOL(do_mmap_pgoff); EXPORT_SYMBOL(do_munmap); -@@ -112,6 +117,7 @@ EXPORT_SYMBOL(exit_mm); +@@ -113,6 +118,7 @@ EXPORT_SYMBOL(exit_files); EXPORT_SYMBOL(exit_fs); EXPORT_SYMBOL(exit_sighand); @@ -93082,7 +93340,7 @@ diff -urNp linux-2.4.21.orig/kernel/ksyms.c linux-2.4.21/kernel/ksyms.c EXPORT_SYMBOL(unshare_files); EXPORT_SYMBOL(mmput); -@@ -580,6 +586,10 @@ EXPORT_SYMBOL(flush_old_exec); +@@ -589,6 +595,10 @@ EXPORT_SYMBOL(kernel_read); EXPORT_SYMBOL(open_exec); @@ -93093,10 +93351,11 @@ diff -urNp linux-2.4.21.orig/kernel/ksyms.c linux-2.4.21/kernel/ksyms.c /* Miscellaneous access points */ EXPORT_SYMBOL(si_meminfo); -diff -urNp linux-2.4.21.orig/kernel/Makefile linux-2.4.21/kernel/Makefile ---- linux-2.4.21.orig/kernel/Makefile 2005-05-04 15:31:11.000000000 -0400 -+++ linux-2.4.21/kernel/Makefile 2005-05-04 18:24:22.108129576 -0400 -@@ -18,6 +18,10 @@ obj-y = sched.o dma.o fork.o exec_do +Index: linux-2.4.21/kernel/Makefile +=================================================================== +--- linux-2.4.21.orig/kernel/Makefile 2005-06-01 22:51:53.000000000 -0400 ++++ linux-2.4.21/kernel/Makefile 2005-06-01 23:12:54.760414632 -0400 +@@ -18,6 +18,10 @@ signal.o sys.o kmod.o context.o \ futex.o pid.o kksymoops.o @@ -93107,9 +93366,10 @@ diff -urNp linux-2.4.21.orig/kernel/Makefile linux-2.4.21/kernel/Makefile obj-$(CONFIG_UID16) += uid16.o obj-$(CONFIG_MODULES) += ksyms.o obj-$(CONFIG_COMPAT) += compat.o -diff -urNp linux-2.4.21.orig/kernel/ptrack.c linux-2.4.21/kernel/ptrack.c ---- linux-2.4.21.orig/kernel/ptrack.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.4.21/kernel/ptrack.c 2005-05-04 18:24:21.917158608 -0400 +Index: linux-2.4.21/kernel/ptrack.c +=================================================================== +--- linux-2.4.21.orig/kernel/ptrack.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.4.21/kernel/ptrack.c 2005-06-01 23:12:54.761414480 -0400 @@ -0,0 +1,143 @@ +/* + * Copyright (C) 2000 Regents of the University of California @@ -93254,9 +93514,10 @@ diff -urNp linux-2.4.21.orig/kernel/ptrack.c linux-2.4.21/kernel/ptrack.c + } + return 1; +} -diff -urNp linux-2.4.21.orig/mm/filemap.c linux-2.4.21/mm/filemap.c ---- linux-2.4.21.orig/mm/filemap.c 2005-05-04 15:31:26.000000000 -0400 -+++ linux-2.4.21/mm/filemap.c 2005-05-04 18:24:21.729187184 -0400 +Index: linux-2.4.21/mm/filemap.c +=================================================================== +--- linux-2.4.21.orig/mm/filemap.c 2005-06-01 23:12:41.100491256 -0400 ++++ linux-2.4.21/mm/filemap.c 2005-06-01 23:12:54.763414176 -0400 @@ -22,6 +22,7 @@ #include #include @@ -93265,7 +93526,7 @@ diff -urNp linux-2.4.21.orig/mm/filemap.c linux-2.4.21/mm/filemap.c #include #include #include -@@ -2456,6 +2457,7 @@ int filemap_sync(struct vm_area_struct * +@@ -2468,6 +2469,7 @@ flush_cache_range(vma, end - size, end); if (address >= end) BUG(); @@ -93273,9 +93534,10 @@ diff -urNp linux-2.4.21.orig/mm/filemap.c linux-2.4.21/mm/filemap.c do { error |= filemap_sync_pmd_range(dir, address, end - address, vma, flags); address = (address + PGDIR_SIZE) & PGDIR_MASK; -diff -urNp linux-2.4.21.orig/mm/memory.c linux-2.4.21/mm/memory.c ---- linux-2.4.21.orig/mm/memory.c 2005-05-04 15:31:16.000000000 -0400 -+++ linux-2.4.21/mm/memory.c 2005-05-04 18:24:21.731186880 -0400 +Index: linux-2.4.21/mm/memory.c +=================================================================== +--- linux-2.4.21.orig/mm/memory.c 2005-06-01 22:52:04.000000000 -0400 ++++ linux-2.4.21/mm/memory.c 2005-06-01 23:13:59.371592240 -0400 @@ -42,6 +42,7 @@ #include #include @@ -93284,7 +93546,7 @@ diff -urNp linux-2.4.21.orig/mm/memory.c linux-2.4.21/mm/memory.c #include #include #include -@@ -632,6 +633,7 @@ void zap_page_range(struct vm_area_struc +@@ -632,6 +633,7 @@ BUG_ON(address >= end); spin_lock(&mm->page_table_lock); @@ -93292,7 +93554,7 @@ diff -urNp linux-2.4.21.orig/mm/memory.c linux-2.4.21/mm/memory.c flush_cache_range(vma, start, end); tlb = tlb_gather_mmu(vma); -@@ -1264,6 +1266,7 @@ int zeromap_page_range(struct vm_area_st +@@ -1302,6 +1304,7 @@ BUG(); spin_lock(&mm->page_table_lock); @@ -93300,7 +93562,7 @@ diff -urNp linux-2.4.21.orig/mm/memory.c linux-2.4.21/mm/memory.c do { pmd_t *pmd = pmd_alloc(mm, dir, address); error = -ENOMEM; -@@ -1275,6 +1278,7 @@ int zeromap_page_range(struct vm_area_st +@@ -1313,6 +1316,7 @@ address = (address + PGDIR_SIZE) & PGDIR_MASK; dir++; } while (address && (address < end)); @@ -93308,7 +93570,7 @@ diff -urNp linux-2.4.21.orig/mm/memory.c linux-2.4.21/mm/memory.c spin_unlock(&mm->page_table_lock); flush_tlb_range(vma, beg, end); return error; -@@ -1353,6 +1357,7 @@ int remap_page_range(struct vm_area_stru +@@ -1391,6 +1395,7 @@ BUG(); spin_lock(&mm->page_table_lock); @@ -93316,7 +93578,7 @@ diff -urNp linux-2.4.21.orig/mm/memory.c linux-2.4.21/mm/memory.c do { pmd_t *pmd = pmd_alloc(mm, dir, from); error = -ENOMEM; -@@ -1364,6 +1369,7 @@ int remap_page_range(struct vm_area_stru +@@ -1402,6 +1407,7 @@ from = (from + PGDIR_SIZE) & PGDIR_MASK; dir++; } while (from && (from < end)); @@ -93324,18 +93586,18 @@ diff -urNp linux-2.4.21.orig/mm/memory.c linux-2.4.21/mm/memory.c spin_unlock(&mm->page_table_lock); flush_tlb_range(vma, beg, end); return error; -@@ -1436,8 +1442,10 @@ static int do_wp_page(struct mm_struct * - if (reuse) { +@@ -1497,8 +1503,10 @@ unlock_page(old_page); flush_cache_page(vma, address); + entry = maybe_mkwrite(pte_mkyoung(pte_mkdirty(pte)), vma); + coproc_invalidate_page(vma, address); - establish_pte(vma, address, page_table, pte_mkyoung(pte_mkdirty(pte_mkwrite(pte)))); + establish_pte(vma, address, page_table, entry); pte_unmap(page_table); -+ coproc_update_page(vma, address); ++ coproc_update_page(vma, address); spin_unlock(&mm->page_table_lock); return 1; /* Minor fault */ } -@@ -1467,6 +1475,7 @@ static int do_wp_page(struct mm_struct * +@@ -1528,6 +1536,7 @@ if (PageReserved(old_page)) ++mm->rss; page_remove_rmap(old_page, page_table); @@ -93343,7 +93605,7 @@ diff -urNp linux-2.4.21.orig/mm/memory.c linux-2.4.21/mm/memory.c break_cow(vma, new_page, address, page_table); pte_chain = page_add_rmap(new_page, page_table, pte_chain); lru_cache_add(new_page); -@@ -1475,6 +1484,7 @@ static int do_wp_page(struct mm_struct * +@@ -1536,6 +1545,7 @@ new_page = old_page; } pte_unmap(page_table); @@ -93351,7 +93613,7 @@ diff -urNp linux-2.4.21.orig/mm/memory.c linux-2.4.21/mm/memory.c spin_unlock(&mm->page_table_lock); if (old_page_locked) unlock_page(old_page); -@@ -1687,6 +1697,7 @@ static int do_swap_page(struct mm_struct +@@ -1748,6 +1758,7 @@ /* No need to invalidate - it was non-present before */ update_mmu_cache(vma, address, pte); pte_unmap(page_table); @@ -93359,7 +93621,7 @@ diff -urNp linux-2.4.21.orig/mm/memory.c linux-2.4.21/mm/memory.c spin_unlock(&mm->page_table_lock); pte_chain_free(pte_chain); return ret; -@@ -1743,6 +1754,7 @@ static int do_anonymous_page(struct mm_s +@@ -1804,6 +1815,7 @@ /* No need to invalidate - it was non-present before */ update_mmu_cache(vma, addr, entry); pte_unmap(page_table); @@ -93367,7 +93629,7 @@ diff -urNp linux-2.4.21.orig/mm/memory.c linux-2.4.21/mm/memory.c spin_unlock(&mm->page_table_lock); ret = 1; /* Minor fault */ goto out; -@@ -1841,6 +1853,7 @@ int do_no_page(struct mm_struct * mm, st +@@ -1902,6 +1914,7 @@ /* no need to invalidate: a not-present page shouldn't be cached */ update_mmu_cache(vma, address, entry); @@ -93375,7 +93637,7 @@ diff -urNp linux-2.4.21.orig/mm/memory.c linux-2.4.21/mm/memory.c spin_unlock(&mm->page_table_lock); pte_chain_free(pte_chain); return 2; /* Major fault */ -@@ -1897,8 +1910,10 @@ static inline int handle_pte_fault(struc +@@ -1958,8 +1971,10 @@ entry = pte_mkdirty(entry); } entry = pte_mkyoung(entry); @@ -93386,9 +93648,10 @@ diff -urNp linux-2.4.21.orig/mm/memory.c linux-2.4.21/mm/memory.c spin_unlock(&mm->page_table_lock); return 1; } -diff -urNp linux-2.4.21.orig/mm/mmap.c linux-2.4.21/mm/mmap.c ---- linux-2.4.21.orig/mm/mmap.c 2005-05-04 15:31:09.000000000 -0400 -+++ linux-2.4.21/mm/mmap.c 2005-05-04 18:24:21.732186728 -0400 +Index: linux-2.4.21/mm/mmap.c +=================================================================== +--- linux-2.4.21.orig/mm/mmap.c 2005-06-01 22:51:50.000000000 -0400 ++++ linux-2.4.21/mm/mmap.c 2005-06-01 23:12:54.767413568 -0400 @@ -30,6 +30,7 @@ #include #include @@ -93397,7 +93660,7 @@ diff -urNp linux-2.4.21.orig/mm/mmap.c linux-2.4.21/mm/mmap.c #include #include #include -@@ -1459,6 +1460,7 @@ void exit_mmap(struct mm_struct * mm) +@@ -1459,6 +1460,7 @@ mm->total_vm = 0; mm->locked_vm = 0; @@ -93405,9 +93668,10 @@ diff -urNp linux-2.4.21.orig/mm/mmap.c linux-2.4.21/mm/mmap.c flush_cache_mm(mm); while (mpnt) { struct vm_area_struct * next = mpnt->vm_next; -diff -urNp linux-2.4.21.orig/mm/mprotect.c linux-2.4.21/mm/mprotect.c ---- linux-2.4.21.orig/mm/mprotect.c 2005-05-04 15:31:08.000000000 -0400 -+++ linux-2.4.21/mm/mprotect.c 2005-05-04 18:24:21.732186728 -0400 +Index: linux-2.4.21/mm/mprotect.c +=================================================================== +--- linux-2.4.21.orig/mm/mprotect.c 2005-06-01 22:51:50.000000000 -0400 ++++ linux-2.4.21/mm/mprotect.c 2005-06-01 23:12:54.767413568 -0400 @@ -24,6 +24,7 @@ #include #include @@ -93416,7 +93680,7 @@ diff -urNp linux-2.4.21.orig/mm/mprotect.c linux-2.4.21/mm/mprotect.c #include #include -@@ -106,6 +107,7 @@ static void change_protection(struct vm_ +@@ -106,6 +107,7 @@ if (start >= end) BUG(); spin_lock(¤t->mm->page_table_lock); @@ -93424,9 +93688,10 @@ diff -urNp linux-2.4.21.orig/mm/mprotect.c linux-2.4.21/mm/mprotect.c do { change_pmd_range(vma, dir, start, end - start, newprot); start = (start + PGDIR_SIZE) & PGDIR_MASK; -diff -urNp linux-2.4.21.orig/mm/mremap.c linux-2.4.21/mm/mremap.c ---- linux-2.4.21.orig/mm/mremap.c 2005-05-04 15:31:08.000000000 -0400 -+++ linux-2.4.21/mm/mremap.c 2005-05-04 18:24:21.733186576 -0400 +Index: linux-2.4.21/mm/mremap.c +=================================================================== +--- linux-2.4.21.orig/mm/mremap.c 2005-06-01 22:51:50.000000000 -0400 ++++ linux-2.4.21/mm/mremap.c 2005-06-01 23:12:54.768413416 -0400 @@ -26,6 +26,7 @@ #include #include @@ -93435,7 +93700,7 @@ diff -urNp linux-2.4.21.orig/mm/mremap.c linux-2.4.21/mm/mremap.c #include #include -@@ -160,7 +161,10 @@ static int move_page_tables(struct vm_ar +@@ -160,7 +161,10 @@ unsigned long new_addr, unsigned long old_addr, unsigned long len) { unsigned long offset = len; @@ -93446,9 +93711,10 @@ diff -urNp linux-2.4.21.orig/mm/mremap.c linux-2.4.21/mm/mremap.c flush_cache_range(vma, old_addr, old_addr + len); /* -diff -urNp linux-2.4.21.orig/mm/rmap.c linux-2.4.21/mm/rmap.c ---- linux-2.4.21.orig/mm/rmap.c 2005-05-04 15:31:09.000000000 -0400 -+++ linux-2.4.21/mm/rmap.c 2005-05-04 18:24:21.733186576 -0400 +Index: linux-2.4.21/mm/rmap.c +=================================================================== +--- linux-2.4.21.orig/mm/rmap.c 2005-06-01 22:51:50.000000000 -0400 ++++ linux-2.4.21/mm/rmap.c 2005-06-01 23:12:54.768413416 -0400 @@ -26,6 +26,7 @@ #include #include @@ -93457,7 +93723,7 @@ diff -urNp linux-2.4.21.orig/mm/rmap.c linux-2.4.21/mm/rmap.c #include #include -@@ -449,6 +450,7 @@ static int try_to_unmap_one(struct page +@@ -449,6 +450,7 @@ } /* Nuke the page table entry. */ diff --git a/lustre/kernel_patches/patches/small_scatterlist-2.4.21-rhel.patch b/lustre/kernel_patches/patches/small_scatterlist-2.4.21-rhel.patch index 2dae026..381d490 100644 --- a/lustre/kernel_patches/patches/small_scatterlist-2.4.21-rhel.patch +++ b/lustre/kernel_patches/patches/small_scatterlist-2.4.21-rhel.patch @@ -1,7 +1,7 @@ Index: linux-2.4.21/crypto/cipher.c =================================================================== ---- linux-2.4.21.orig/crypto/cipher.c 2004-12-21 13:51:10.000000000 -0500 -+++ linux-2.4.21/crypto/cipher.c 2004-12-21 13:58:10.000000000 -0500 +--- linux-2.4.21.orig/crypto/cipher.c 2005-06-01 22:51:50.000000000 -0400 ++++ linux-2.4.21/crypto/cipher.c 2005-06-01 23:07:51.067582960 -0400 @@ -88,12 +88,21 @@ walk->sg = sg; @@ -26,8 +26,8 @@ Index: linux-2.4.21/crypto/cipher.c static void scatterwalk_map(struct scatter_walk *walk, int out) Index: linux-2.4.21/crypto/digest.c =================================================================== ---- linux-2.4.21.orig/crypto/digest.c 2004-12-21 13:51:10.000000000 -0500 -+++ linux-2.4.21/crypto/digest.c 2004-12-21 13:58:10.000000000 -0500 +--- linux-2.4.21.orig/crypto/digest.c 2005-06-01 22:51:50.000000000 -0400 ++++ linux-2.4.21/crypto/digest.c 2005-06-01 23:07:51.068582808 -0400 @@ -29,7 +29,11 @@ unsigned int i; @@ -54,8 +54,8 @@ Index: linux-2.4.21/crypto/digest.c crypto_kunmap(p, 0); Index: linux-2.4.21/crypto/hmac.c =================================================================== ---- linux-2.4.21.orig/crypto/hmac.c 2004-12-21 13:51:10.000000000 -0500 -+++ linux-2.4.21/crypto/hmac.c 2004-12-21 13:58:10.000000000 -0500 +--- linux-2.4.21.orig/crypto/hmac.c 2005-06-01 22:51:50.000000000 -0400 ++++ linux-2.4.21/crypto/hmac.c 2005-06-01 23:07:51.068582808 -0400 @@ -25,8 +25,14 @@ { struct scatterlist tmp; @@ -116,8 +116,8 @@ Index: linux-2.4.21/crypto/hmac.c crypto_digest_update(tfm, &tmp, 1); Index: linux-2.4.21/crypto/tcrypt.c =================================================================== ---- linux-2.4.21.orig/crypto/tcrypt.c 2004-12-21 13:51:10.000000000 -0500 -+++ linux-2.4.21/crypto/tcrypt.c 2004-12-21 13:58:10.000000000 -0500 +--- linux-2.4.21.orig/crypto/tcrypt.c 2005-06-01 22:51:50.000000000 -0400 ++++ linux-2.4.21/crypto/tcrypt.c 2005-06-01 23:07:51.071582352 -0400 @@ -24,6 +24,15 @@ #include #include "tcrypt.h" @@ -1189,8 +1189,8 @@ Index: linux-2.4.21/crypto/tcrypt.c printk("%s\n", memcmp(q, c5_tv[i].ciphertext, Index: linux-2.4.21/drivers/ide/ide-dma.c =================================================================== ---- linux-2.4.21.orig/drivers/ide/ide-dma.c 2004-12-21 13:51:31.000000000 -0500 -+++ linux-2.4.21/drivers/ide/ide-dma.c 2004-12-21 13:58:10.000000000 -0500 +--- linux-2.4.21.orig/drivers/ide/ide-dma.c 2005-06-01 22:52:05.000000000 -0400 ++++ linux-2.4.21/drivers/ide/ide-dma.c 2005-06-01 23:07:51.072582200 -0400 @@ -280,14 +280,25 @@ memset(&sg[nents], 0, sizeof(*sg)); @@ -1244,8 +1244,8 @@ Index: linux-2.4.21/drivers/ide/ide-dma.c #else Index: linux-2.4.21/drivers/scsi/dpt_i2o.c =================================================================== ---- linux-2.4.21.orig/drivers/scsi/dpt_i2o.c 2004-12-21 13:51:20.000000000 -0500 -+++ linux-2.4.21/drivers/scsi/dpt_i2o.c 2004-12-21 13:58:10.000000000 -0500 +--- linux-2.4.21.orig/drivers/scsi/dpt_i2o.c 2005-06-01 22:51:54.000000000 -0400 ++++ linux-2.4.21/drivers/scsi/dpt_i2o.c 2005-06-01 23:07:51.074581896 -0400 @@ -2152,7 +2152,13 @@ for(i = 0 ; i < cmd->use_sg; i++) { *mptr++ = direction|0x10000000|sg->length; @@ -1263,7 +1263,7 @@ Index: linux-2.4.21/drivers/scsi/dpt_i2o.c Index: linux-2.4.21/drivers/scsi/scsi_debug.c =================================================================== --- linux-2.4.21.orig/drivers/scsi/scsi_debug.c 2002-11-28 18:53:14.000000000 -0500 -+++ linux-2.4.21/drivers/scsi/scsi_debug.c 2004-12-21 13:58:10.000000000 -0500 ++++ linux-2.4.21/drivers/scsi/scsi_debug.c 2005-06-01 23:07:51.075581744 -0400 @@ -186,7 +186,13 @@ struct scatterlist *sgpnt = (struct scatterlist *) SCpnt->request_buffer; @@ -1336,8 +1336,8 @@ Index: linux-2.4.21/drivers/scsi/scsi_debug.c } else if (nbytes > 0) Index: linux-2.4.21/drivers/scsi/scsi_lib.c =================================================================== ---- linux-2.4.21.orig/drivers/scsi/scsi_lib.c 2004-12-21 13:51:31.000000000 -0500 -+++ linux-2.4.21/drivers/scsi/scsi_lib.c 2004-12-21 13:58:10.000000000 -0500 +--- linux-2.4.21.orig/drivers/scsi/scsi_lib.c 2005-06-01 22:52:05.000000000 -0400 ++++ linux-2.4.21/drivers/scsi/scsi_lib.c 2005-06-01 23:07:51.076581592 -0400 @@ -554,7 +554,13 @@ if (bbpnt) { for (i = 0; i < SCpnt->use_sg; i++) { @@ -1378,8 +1378,8 @@ Index: linux-2.4.21/drivers/scsi/scsi_lib.c } Index: linux-2.4.21/drivers/scsi/scsi_merge.c =================================================================== ---- linux-2.4.21.orig/drivers/scsi/scsi_merge.c 2004-12-21 13:51:06.000000000 -0500 -+++ linux-2.4.21/drivers/scsi/scsi_merge.c 2004-12-21 13:58:10.000000000 -0500 +--- linux-2.4.21.orig/drivers/scsi/scsi_merge.c 2005-06-01 22:51:45.000000000 -0400 ++++ linux-2.4.21/drivers/scsi/scsi_merge.c 2005-06-01 23:07:51.077581440 -0400 @@ -144,11 +144,21 @@ */ for(jj=0; jj < SCpnt->use_sg; jj++) @@ -1500,8 +1500,8 @@ Index: linux-2.4.21/drivers/scsi/scsi_merge.c Index: linux-2.4.21/drivers/scsi/sg.c =================================================================== ---- linux-2.4.21.orig/drivers/scsi/sg.c 2004-12-21 13:51:21.000000000 -0500 -+++ linux-2.4.21/drivers/scsi/sg.c 2004-12-21 13:58:10.000000000 -0500 +--- linux-2.4.21.orig/drivers/scsi/sg.c 2005-06-01 22:52:05.000000000 -0400 ++++ linux-2.4.21/drivers/scsi/sg.c 2005-06-01 23:07:51.080580984 -0400 @@ -1077,7 +1077,11 @@ for (k = 0; k < rsv_schp->k_use_sg; ++k, ++sclp) { @@ -1708,8 +1708,8 @@ Index: linux-2.4.21/drivers/scsi/sg.c sfp->save_scat_len = num; Index: linux-2.4.21/drivers/scsi/sr.c =================================================================== ---- linux-2.4.21.orig/drivers/scsi/sr.c 2004-12-21 13:51:21.000000000 -0500 -+++ linux-2.4.21/drivers/scsi/sr.c 2004-12-21 13:58:10.000000000 -0500 +--- linux-2.4.21.orig/drivers/scsi/sr.c 2005-06-01 22:51:55.000000000 -0400 ++++ linux-2.4.21/drivers/scsi/sr.c 2005-06-01 23:07:51.080580984 -0400 @@ -343,7 +343,12 @@ i = 0; @@ -1752,7 +1752,7 @@ Index: linux-2.4.21/drivers/scsi/sr.c Index: linux-2.4.21/drivers/scsi/sim710.c =================================================================== --- linux-2.4.21.orig/drivers/scsi/sim710.c 2002-08-02 20:39:44.000000000 -0400 -+++ linux-2.4.21/drivers/scsi/sim710.c 2004-12-21 13:58:10.000000000 -0500 ++++ linux-2.4.21/drivers/scsi/sim710.c 2005-06-01 23:07:51.082580680 -0400 @@ -1164,7 +1164,11 @@ for (i = 0; cmd->use_sg ? (i < cmd->use_sg) : !i; i++) { @@ -1767,8 +1767,8 @@ Index: linux-2.4.21/drivers/scsi/sim710.c u32 cnt = cmd->use_sg ? Index: linux-2.4.21/drivers/scsi/advansys.c =================================================================== ---- linux-2.4.21.orig/drivers/scsi/advansys.c 2004-12-21 13:51:30.000000000 -0500 -+++ linux-2.4.21/drivers/scsi/advansys.c 2004-12-21 13:58:10.000000000 -0500 +--- linux-2.4.21.orig/drivers/scsi/advansys.c 2005-06-01 22:52:05.000000000 -0400 ++++ linux-2.4.21/drivers/scsi/advansys.c 2005-06-01 23:07:51.097578400 -0400 @@ -6803,7 +6803,11 @@ slp = (struct scatterlist *) scp->request_buffer; for (sgcnt = 0; sgcnt < scp->use_sg; sgcnt++, slp++) { @@ -1796,7 +1796,7 @@ Index: linux-2.4.21/drivers/scsi/advansys.c Index: linux-2.4.21/drivers/scsi/pci2000.c =================================================================== --- linux-2.4.21.orig/drivers/scsi/pci2000.c 2001-11-09 17:05:06.000000000 -0500 -+++ linux-2.4.21/drivers/scsi/pci2000.c 2004-12-21 13:58:10.000000000 -0500 ++++ linux-2.4.21/drivers/scsi/pci2000.c 2005-06-01 23:07:51.098578248 -0400 @@ -513,7 +513,11 @@ if ( SCpnt->use_sg ) @@ -1824,7 +1824,7 @@ Index: linux-2.4.21/drivers/scsi/pci2000.c Index: linux-2.4.21/drivers/scsi/pci2220i.c =================================================================== --- linux-2.4.21.orig/drivers/scsi/pci2220i.c 2001-11-09 17:05:06.000000000 -0500 -+++ linux-2.4.21/drivers/scsi/pci2220i.c 2004-12-21 13:58:10.000000000 -0500 ++++ linux-2.4.21/drivers/scsi/pci2220i.c 2005-06-01 23:07:51.100577944 -0400 @@ -463,7 +463,11 @@ { if ( padapter->nextSg < padapter->SCpnt->use_sg ) @@ -1852,7 +1852,7 @@ Index: linux-2.4.21/drivers/scsi/pci2220i.c Index: linux-2.4.21/drivers/scsi/BusLogic.c =================================================================== --- linux-2.4.21.orig/drivers/scsi/BusLogic.c 2001-12-21 12:41:55.000000000 -0500 -+++ linux-2.4.21/drivers/scsi/BusLogic.c 2004-12-21 13:58:10.000000000 -0500 ++++ linux-2.4.21/drivers/scsi/BusLogic.c 2005-06-01 23:07:51.104577336 -0400 @@ -3402,7 +3402,12 @@ CCB->ScatterGatherList[Segment].SegmentByteCount = ScatterList[Segment].length; @@ -1869,7 +1869,7 @@ Index: linux-2.4.21/drivers/scsi/BusLogic.c Index: linux-2.4.21/drivers/scsi/ultrastor.c =================================================================== --- linux-2.4.21.orig/drivers/scsi/ultrastor.c 2002-08-02 20:39:44.000000000 -0400 -+++ linux-2.4.21/drivers/scsi/ultrastor.c 2004-12-21 13:58:10.000000000 -0500 ++++ linux-2.4.21/drivers/scsi/ultrastor.c 2005-06-01 23:07:51.105577184 -0400 @@ -666,7 +666,11 @@ sl = (struct scatterlist *) SCpnt->request_buffer; max = SCpnt->use_sg; @@ -1885,7 +1885,7 @@ Index: linux-2.4.21/drivers/scsi/ultrastor.c Index: linux-2.4.21/drivers/scsi/aha152x.c =================================================================== --- linux-2.4.21.orig/drivers/scsi/aha152x.c 2003-06-13 10:51:36.000000000 -0400 -+++ linux-2.4.21/drivers/scsi/aha152x.c 2004-12-21 13:58:10.000000000 -0500 ++++ linux-2.4.21/drivers/scsi/aha152x.c 2005-06-01 23:07:51.108576728 -0400 @@ -603,7 +603,11 @@ #define SCSEM(SCpnt) SCDATA(SCpnt)->sem @@ -1901,7 +1901,7 @@ Index: linux-2.4.21/drivers/scsi/aha152x.c Index: linux-2.4.21/drivers/scsi/aha1542.c =================================================================== --- linux-2.4.21.orig/drivers/scsi/aha1542.c 2001-10-12 18:35:53.000000000 -0400 -+++ linux-2.4.21/drivers/scsi/aha1542.c 2004-12-21 13:58:10.000000000 -0500 ++++ linux-2.4.21/drivers/scsi/aha1542.c 2005-06-01 23:07:51.109576576 -0400 @@ -69,8 +69,13 @@ { printk(KERN_CRIT "sgpnt[%d:%d] addr %p/0x%lx length %d\n", @@ -1957,7 +1957,7 @@ Index: linux-2.4.21/drivers/scsi/aha1542.c Index: linux-2.4.21/drivers/scsi/aha1740.c =================================================================== --- linux-2.4.21.orig/drivers/scsi/aha1740.c 2001-09-30 15:26:07.000000000 -0400 -+++ linux-2.4.21/drivers/scsi/aha1740.c 2004-12-21 13:58:10.000000000 -0500 ++++ linux-2.4.21/drivers/scsi/aha1740.c 2005-06-01 23:07:51.110576424 -0400 @@ -397,7 +397,11 @@ for(i=0; iuse_sg; i++) { @@ -1972,8 +1972,8 @@ Index: linux-2.4.21/drivers/scsi/aha1740.c host->ecb[ecbno].dataptr = virt_to_bus(cptr); Index: linux-2.4.21/drivers/scsi/aic7xxx_old.c =================================================================== ---- linux-2.4.21.orig/drivers/scsi/aic7xxx_old.c 2004-12-21 13:51:20.000000000 -0500 -+++ linux-2.4.21/drivers/scsi/aic7xxx_old.c 2004-12-21 13:58:10.000000000 -0500 +--- linux-2.4.21.orig/drivers/scsi/aic7xxx_old.c 2005-06-01 22:51:54.000000000 -0400 ++++ linux-2.4.21/drivers/scsi/aic7xxx_old.c 2005-06-01 23:07:51.118575208 -0400 @@ -2845,7 +2845,11 @@ struct scatterlist *sg; @@ -1989,7 +1989,7 @@ Index: linux-2.4.21/drivers/scsi/aic7xxx_old.c Index: linux-2.4.21/drivers/scsi/fdomain.c =================================================================== --- linux-2.4.21.orig/drivers/scsi/fdomain.c 2002-11-28 18:53:14.000000000 -0500 -+++ linux-2.4.21/drivers/scsi/fdomain.c 2004-12-21 13:58:10.000000000 -0500 ++++ linux-2.4.21/drivers/scsi/fdomain.c 2005-06-01 23:07:51.120574904 -0400 @@ -1564,7 +1564,11 @@ if (current_SC->SCp.buffers_residual) { --current_SC->SCp.buffers_residual; @@ -2029,7 +2029,7 @@ Index: linux-2.4.21/drivers/scsi/fdomain.c Index: linux-2.4.21/drivers/scsi/in2000.c =================================================================== --- linux-2.4.21.orig/drivers/scsi/in2000.c 2003-06-13 10:51:36.000000000 -0400 -+++ linux-2.4.21/drivers/scsi/in2000.c 2004-12-21 13:58:10.000000000 -0500 ++++ linux-2.4.21/drivers/scsi/in2000.c 2005-06-01 23:07:51.122574600 -0400 @@ -355,7 +355,11 @@ if (cmd->use_sg) { cmd->SCp.buffer = (struct scatterlist *)cmd->buffer; @@ -2057,7 +2057,7 @@ Index: linux-2.4.21/drivers/scsi/in2000.c Index: linux-2.4.21/drivers/scsi/NCR5380.c =================================================================== --- linux-2.4.21.orig/drivers/scsi/NCR5380.c 2003-06-13 10:51:36.000000000 -0400 -+++ linux-2.4.21/drivers/scsi/NCR5380.c 2004-12-21 13:58:10.000000000 -0500 ++++ linux-2.4.21/drivers/scsi/NCR5380.c 2005-06-01 23:07:51.124574296 -0400 @@ -337,7 +337,11 @@ if (cmd->use_sg) { cmd->SCp.buffer = (struct scatterlist *) cmd->buffer; @@ -2085,7 +2085,7 @@ Index: linux-2.4.21/drivers/scsi/NCR5380.c Index: linux-2.4.21/drivers/scsi/NCR53c406a.c =================================================================== --- linux-2.4.21.orig/drivers/scsi/NCR53c406a.c 2001-09-30 15:26:07.000000000 -0400 -+++ linux-2.4.21/drivers/scsi/NCR53c406a.c 2004-12-21 13:58:10.000000000 -0500 ++++ linux-2.4.21/drivers/scsi/NCR53c406a.c 2005-06-01 23:07:51.125574144 -0400 @@ -895,7 +895,11 @@ sgcount = current_SC->use_sg; sglist = current_SC->request_buffer; @@ -2113,7 +2113,7 @@ Index: linux-2.4.21/drivers/scsi/NCR53c406a.c Index: linux-2.4.21/drivers/scsi/sym53c416.c =================================================================== --- linux-2.4.21.orig/drivers/scsi/sym53c416.c 2001-09-30 15:26:07.000000000 -0400 -+++ linux-2.4.21/drivers/scsi/sym53c416.c 2004-12-21 13:58:10.000000000 -0500 ++++ linux-2.4.21/drivers/scsi/sym53c416.c 2005-06-01 23:07:51.126573992 -0400 @@ -448,7 +448,11 @@ sglist = current_command->request_buffer; while(sgcount--) @@ -2141,7 +2141,7 @@ Index: linux-2.4.21/drivers/scsi/sym53c416.c Index: linux-2.4.21/drivers/scsi/qlogicfas.c =================================================================== --- linux-2.4.21.orig/drivers/scsi/qlogicfas.c 2003-06-13 10:51:36.000000000 -0400 -+++ linux-2.4.21/drivers/scsi/qlogicfas.c 2004-12-21 13:58:10.000000000 -0500 ++++ linux-2.4.21/drivers/scsi/qlogicfas.c 2005-06-01 23:07:51.126573992 -0400 @@ -393,7 +393,11 @@ REG0; return ((qabort == 1 ? DID_ABORT : DID_RESET) << 16); @@ -2157,7 +2157,7 @@ Index: linux-2.4.21/drivers/scsi/qlogicfas.c Index: linux-2.4.21/drivers/scsi/qla1280.c =================================================================== --- linux-2.4.21.orig/drivers/scsi/qla1280.c 2001-09-30 15:26:07.000000000 -0400 -+++ linux-2.4.21/drivers/scsi/qla1280.c 2004-12-21 13:58:10.000000000 -0500 ++++ linux-2.4.21/drivers/scsi/qla1280.c 2005-06-01 23:07:51.131573232 -0400 @@ -3985,8 +3985,13 @@ { DEBUG(sprintf(debug_buff,"SG Segment ap=0x%p, len=0x%x\n\r",sg->address,sg->length)); @@ -2212,8 +2212,8 @@ Index: linux-2.4.21/drivers/scsi/qla1280.c } Index: linux-2.4.21/drivers/scsi/seagate.c =================================================================== ---- linux-2.4.21.orig/drivers/scsi/seagate.c 2004-12-21 13:51:00.000000000 -0500 -+++ linux-2.4.21/drivers/scsi/seagate.c 2004-12-21 13:58:10.000000000 -0500 +--- linux-2.4.21.orig/drivers/scsi/seagate.c 2005-06-01 22:51:40.000000000 -0400 ++++ linux-2.4.21/drivers/scsi/seagate.c 2005-06-01 23:07:51.133572928 -0400 @@ -1070,7 +1070,11 @@ buffer = (struct scatterlist *) SCint->buffer; @@ -2254,7 +2254,7 @@ Index: linux-2.4.21/drivers/scsi/seagate.c Index: linux-2.4.21/drivers/scsi/53c7,8xx.c =================================================================== --- linux-2.4.21.orig/drivers/scsi/53c7,8xx.c 2002-02-25 14:38:04.000000000 -0500 -+++ linux-2.4.21/drivers/scsi/53c7,8xx.c 2004-12-21 13:58:10.000000000 -0500 ++++ linux-2.4.21/drivers/scsi/53c7,8xx.c 2005-06-01 23:07:51.137572320 -0400 @@ -3787,7 +3787,11 @@ for (i = 0; cmd->use_sg ? (i < cmd->use_sg) : !i; cmd_datain += 4, cmd_dataout += 4, ++i) { @@ -2295,8 +2295,8 @@ Index: linux-2.4.21/drivers/scsi/53c7,8xx.c offset = ptr - (char *) (cmd->request_buffer); Index: linux-2.4.21/drivers/scsi/eata_dma.c =================================================================== ---- linux-2.4.21.orig/drivers/scsi/eata_dma.c 2004-12-21 13:51:30.000000000 -0500 -+++ linux-2.4.21/drivers/scsi/eata_dma.c 2004-12-21 13:58:10.000000000 -0500 +--- linux-2.4.21.orig/drivers/scsi/eata_dma.c 2005-06-01 22:52:05.000000000 -0400 ++++ linux-2.4.21/drivers/scsi/eata_dma.c 2005-06-01 23:07:51.138572168 -0400 @@ -571,7 +571,11 @@ ccb->cp_datalen = htonl(cmd->use_sg * sizeof(struct eata_sg_list)); sl=(struct scatterlist *)cmd->request_buffer; @@ -2312,7 +2312,7 @@ Index: linux-2.4.21/drivers/scsi/eata_dma.c Index: linux-2.4.21/drivers/scsi/eata_pio.c =================================================================== --- linux-2.4.21.orig/drivers/scsi/eata_pio.c 2001-09-30 15:26:07.000000000 -0400 -+++ linux-2.4.21/drivers/scsi/eata_pio.c 2004-12-21 13:58:10.000000000 -0500 ++++ linux-2.4.21/drivers/scsi/eata_pio.c 2005-06-01 23:07:51.139572016 -0400 @@ -99,7 +99,11 @@ else { @@ -2340,7 +2340,7 @@ Index: linux-2.4.21/drivers/scsi/eata_pio.c Index: linux-2.4.21/drivers/scsi/wd7000.c =================================================================== --- linux-2.4.21.orig/drivers/scsi/wd7000.c 2001-09-30 15:26:08.000000000 -0400 -+++ linux-2.4.21/drivers/scsi/wd7000.c 2004-12-21 13:58:10.000000000 -0500 ++++ linux-2.4.21/drivers/scsi/wd7000.c 2005-06-01 23:07:51.140571864 -0400 @@ -1189,7 +1189,11 @@ any2scsi (scb->maxlen, SCpnt->use_sg * sizeof (Sgb)); @@ -2356,7 +2356,7 @@ Index: linux-2.4.21/drivers/scsi/wd7000.c Index: linux-2.4.21/drivers/scsi/scsiiom.c =================================================================== --- linux-2.4.21.orig/drivers/scsi/scsiiom.c 2000-12-31 14:06:00.000000000 -0500 -+++ linux-2.4.21/drivers/scsi/scsiiom.c 2004-12-21 13:58:10.000000000 -0500 ++++ linux-2.4.21/drivers/scsi/scsiiom.c 2005-06-01 23:07:51.142571560 -0400 @@ -379,7 +379,11 @@ pSRB->pSegmentList++; psgl = pSRB->pSegmentList; @@ -2474,7 +2474,7 @@ Index: linux-2.4.21/drivers/scsi/scsiiom.c Index: linux-2.4.21/drivers/scsi/tmscsim.c =================================================================== --- linux-2.4.21.orig/drivers/scsi/tmscsim.c 2001-12-21 12:41:55.000000000 -0500 -+++ linux-2.4.21/drivers/scsi/tmscsim.c 2004-12-21 13:58:10.000000000 -0500 ++++ linux-2.4.21/drivers/scsi/tmscsim.c 2005-06-01 23:07:51.144571256 -0400 @@ -1146,7 +1146,11 @@ { pSRB->SGcount = 1; @@ -2490,7 +2490,7 @@ Index: linux-2.4.21/drivers/scsi/tmscsim.c Index: linux-2.4.21/drivers/scsi/AM53C974.c =================================================================== --- linux-2.4.21.orig/drivers/scsi/AM53C974.c 2001-09-30 15:26:07.000000000 -0400 -+++ linux-2.4.21/drivers/scsi/AM53C974.c 2004-12-21 13:58:10.000000000 -0500 ++++ linux-2.4.21/drivers/scsi/AM53C974.c 2005-06-01 23:07:51.146570952 -0400 @@ -842,7 +842,11 @@ if (cmd->use_sg) { cmd->SCp.buffer = (struct scatterlist *) cmd->buffer; @@ -2517,8 +2517,8 @@ Index: linux-2.4.21/drivers/scsi/AM53C974.c if (cmd->SCp.this_residual) { Index: linux-2.4.21/drivers/scsi/megaraid2.c =================================================================== ---- linux-2.4.21.orig/drivers/scsi/megaraid2.c 2004-12-21 13:51:19.000000000 -0500 -+++ linux-2.4.21/drivers/scsi/megaraid2.c 2004-12-21 13:58:10.000000000 -0500 +--- linux-2.4.21.orig/drivers/scsi/megaraid2.c 2005-06-01 22:51:54.000000000 -0400 ++++ linux-2.4.21/drivers/scsi/megaraid2.c 2005-06-01 23:07:51.149570496 -0400 @@ -2180,7 +2180,11 @@ if( cmd->use_sg ) { sgl = (struct scatterlist *) @@ -2533,8 +2533,8 @@ Index: linux-2.4.21/drivers/scsi/megaraid2.c c = *(u8 *)cmd->request_buffer; Index: linux-2.4.21/drivers/scsi/megaraid.c =================================================================== ---- linux-2.4.21.orig/drivers/scsi/megaraid.c 2004-12-21 13:51:19.000000000 -0500 -+++ linux-2.4.21/drivers/scsi/megaraid.c 2004-12-21 13:58:10.000000000 -0500 +--- linux-2.4.21.orig/drivers/scsi/megaraid.c 2005-06-01 22:51:54.000000000 -0400 ++++ linux-2.4.21/drivers/scsi/megaraid.c 2005-06-01 23:07:51.152570040 -0400 @@ -1201,8 +1201,13 @@ case READ_CAPACITY: if ( SCpnt->use_sg ) { @@ -2565,7 +2565,7 @@ Index: linux-2.4.21/drivers/scsi/megaraid.c Index: linux-2.4.21/drivers/scsi/atp870u.c =================================================================== --- linux-2.4.21.orig/drivers/scsi/atp870u.c 2002-08-02 20:39:44.000000000 -0400 -+++ linux-2.4.21/drivers/scsi/atp870u.c 2004-12-21 13:58:10.000000000 -0500 ++++ linux-2.4.21/drivers/scsi/atp870u.c 2005-06-01 23:07:51.154569736 -0400 @@ -804,7 +804,11 @@ sgpnt = (struct scatterlist *) workrequ->request_buffer; i = 0; @@ -2581,7 +2581,7 @@ Index: linux-2.4.21/drivers/scsi/atp870u.c Index: linux-2.4.21/drivers/scsi/gdth.c =================================================================== --- linux-2.4.21.orig/drivers/scsi/gdth.c 2003-06-13 10:51:36.000000000 -0400 -+++ linux-2.4.21/drivers/scsi/gdth.c 2004-12-21 13:58:10.000000000 -0500 ++++ linux-2.4.21/drivers/scsi/gdth.c 2005-06-01 23:07:51.158569128 -0400 @@ -2662,7 +2662,11 @@ if (cpsum+cpnow > cpcount) cpnow = cpcount - cpsum; @@ -2621,7 +2621,7 @@ Index: linux-2.4.21/drivers/scsi/gdth.c Index: linux-2.4.21/drivers/scsi/ini9100u.c =================================================================== --- linux-2.4.21.orig/drivers/scsi/ini9100u.c 2001-09-30 15:26:07.000000000 -0400 -+++ linux-2.4.21/drivers/scsi/ini9100u.c 2004-12-21 13:58:10.000000000 -0500 ++++ linux-2.4.21/drivers/scsi/ini9100u.c 2005-06-01 23:07:51.159568976 -0400 @@ -489,7 +489,11 @@ if (SCpnt->use_sg) { pSrbSG = (struct scatterlist *) SCpnt->request_buffer; @@ -2649,7 +2649,7 @@ Index: linux-2.4.21/drivers/scsi/ini9100u.c Index: linux-2.4.21/drivers/scsi/inia100.c =================================================================== --- linux-2.4.21.orig/drivers/scsi/inia100.c 2001-09-30 15:26:07.000000000 -0400 -+++ linux-2.4.21/drivers/scsi/inia100.c 2004-12-21 13:58:10.000000000 -0500 ++++ linux-2.4.21/drivers/scsi/inia100.c 2005-06-01 23:07:51.159568976 -0400 @@ -494,7 +494,11 @@ pSCB->SCB_SGLen = (U32) (SCpnt->use_sg * 8); pSrbSG = (struct scatterlist *) SCpnt->request_buffer; @@ -2664,8 +2664,8 @@ Index: linux-2.4.21/drivers/scsi/inia100.c } Index: linux-2.4.21/drivers/scsi/ide-scsi.c =================================================================== ---- linux-2.4.21.orig/drivers/scsi/ide-scsi.c 2004-12-21 13:51:31.000000000 -0500 -+++ linux-2.4.21/drivers/scsi/ide-scsi.c 2004-12-21 13:58:10.000000000 -0500 +--- linux-2.4.21.orig/drivers/scsi/ide-scsi.c 2005-06-01 22:52:05.000000000 -0400 ++++ linux-2.4.21/drivers/scsi/ide-scsi.c 2005-06-01 23:07:51.160568824 -0400 @@ -154,7 +154,11 @@ return; } @@ -2720,8 +2720,8 @@ Index: linux-2.4.21/drivers/scsi/ide-scsi.c sg++; Index: linux-2.4.21/drivers/scsi/ppa.c =================================================================== ---- linux-2.4.21.orig/drivers/scsi/ppa.c 2004-12-21 13:51:30.000000000 -0500 -+++ linux-2.4.21/drivers/scsi/ppa.c 2004-12-21 13:58:10.000000000 -0500 +--- linux-2.4.21.orig/drivers/scsi/ppa.c 2005-06-01 22:52:05.000000000 -0400 ++++ linux-2.4.21/drivers/scsi/ppa.c 2005-06-01 23:07:51.161568672 -0400 @@ -740,7 +740,11 @@ if (cmd->SCp.buffers_residual--) { cmd->SCp.buffer++; @@ -2748,8 +2748,8 @@ Index: linux-2.4.21/drivers/scsi/ppa.c cmd->SCp.buffer = NULL; Index: linux-2.4.21/drivers/scsi/imm.c =================================================================== ---- linux-2.4.21.orig/drivers/scsi/imm.c 2004-12-21 13:51:30.000000000 -0500 -+++ linux-2.4.21/drivers/scsi/imm.c 2004-12-21 13:58:10.000000000 -0500 +--- linux-2.4.21.orig/drivers/scsi/imm.c 2005-06-01 22:52:05.000000000 -0400 ++++ linux-2.4.21/drivers/scsi/imm.c 2005-06-01 23:07:51.162568520 -0400 @@ -834,7 +834,11 @@ if (cmd->SCp.buffers_residual--) { cmd->SCp.buffer++; @@ -2776,8 +2776,8 @@ Index: linux-2.4.21/drivers/scsi/imm.c cmd->SCp.buffer = NULL; Index: linux-2.4.21/drivers/scsi/st.c =================================================================== ---- linux-2.4.21.orig/drivers/scsi/st.c 2004-12-21 13:51:30.000000000 -0500 -+++ linux-2.4.21/drivers/scsi/st.c 2004-12-21 13:58:10.000000000 -0500 +--- linux-2.4.21.orig/drivers/scsi/st.c 2005-06-01 22:52:04.000000000 -0400 ++++ linux-2.4.21/drivers/scsi/st.c 2005-06-01 23:07:51.164568216 -0400 @@ -3409,6 +3409,12 @@ } @@ -2924,8 +2924,8 @@ Index: linux-2.4.21/drivers/scsi/st.c src_offset += count; Index: linux-2.4.21/drivers/scsi/osst.c =================================================================== ---- linux-2.4.21.orig/drivers/scsi/osst.c 2004-12-21 13:51:30.000000000 -0500 -+++ linux-2.4.21/drivers/scsi/osst.c 2004-12-21 13:58:10.000000000 -0500 +--- linux-2.4.21.orig/drivers/scsi/osst.c 2005-06-01 22:52:04.000000000 -0400 ++++ linux-2.4.21/drivers/scsi/osst.c 2005-06-01 23:07:51.169567456 -0400 @@ -477,7 +477,11 @@ if (STp->raw) { if (STp->buffer->syscall_result) { @@ -3111,7 +3111,7 @@ Index: linux-2.4.21/drivers/scsi/osst.c Index: linux-2.4.21/drivers/scsi/pcmcia/nsp_cs.c =================================================================== --- linux-2.4.21.orig/drivers/scsi/pcmcia/nsp_cs.c 2003-06-13 10:51:36.000000000 -0400 -+++ linux-2.4.21/drivers/scsi/pcmcia/nsp_cs.c 2004-12-21 13:58:10.000000000 -0500 ++++ linux-2.4.21/drivers/scsi/pcmcia/nsp_cs.c 2005-06-01 23:07:51.170567304 -0400 @@ -201,7 +201,11 @@ SCp.phase : current state of the command */ if (SCpnt->use_sg) { @@ -3150,8 +3150,8 @@ Index: linux-2.4.21/drivers/scsi/pcmcia/nsp_cs.c Index: linux-2.4.21/drivers/scsi/ips.c =================================================================== ---- linux-2.4.21.orig/drivers/scsi/ips.c 2004-12-21 13:51:19.000000000 -0500 -+++ linux-2.4.21/drivers/scsi/ips.c 2004-12-21 13:58:10.000000000 -0500 +--- linux-2.4.21.orig/drivers/scsi/ips.c 2005-06-01 22:51:54.000000000 -0400 ++++ linux-2.4.21/drivers/scsi/ips.c 2005-06-01 23:07:51.175566544 -0400 @@ -217,7 +217,11 @@ #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,0) #include @@ -3166,9 +3166,9 @@ Index: linux-2.4.21/drivers/scsi/ips.c #ifndef __devexit_p Index: linux-2.4.21/drivers/scsi/libata-core.c =================================================================== ---- linux-2.4.21.orig/drivers/scsi/libata-core.c 2004-12-21 13:51:26.000000000 -0500 -+++ linux-2.4.21/drivers/scsi/libata-core.c 2004-12-21 13:58:10.000000000 -0500 -@@ -1915,8 +1915,13 @@ +--- linux-2.4.21.orig/drivers/scsi/libata-core.c 2005-06-01 22:51:58.000000000 -0400 ++++ linux-2.4.21/drivers/scsi/libata-core.c 2005-06-01 23:36:21.244596536 -0400 +@@ -2068,8 +2068,13 @@ qc->buf_virt = buf; sg = qc->sg; @@ -3180,29 +3180,41 @@ Index: linux-2.4.21/drivers/scsi/libata-core.c sg->offset = (unsigned long) buf & ~PAGE_MASK; +#endif /* !SMALL_SCATTERLIST */ sg_dma_len(sg) = buflen; + } - /* WARN_ON(buflen > PAGE_SIZE); */ -@@ -2143,9 +2148,15 @@ +@@ -2297,8 +2302,13 @@ if (qc->cursect == (qc->nsect - 1)) ap->pio_task_state = PIO_ST_LAST; +#if SMALL_SCATTERLIST + page = sg[qc->cursg].u.page.page; -+ buf = kmap(page) + -+ sg[qc->cursg].u.page.offset + (qc->cursg_ofs * ATA_SECT_SIZE); ++ offset = sg[qc->cursg].u.page.offset + qc->cursg_ofs * ATA_SECT_SIZE; +#else page = sg[qc->cursg].page; - buf = kmap(page) + - sg[qc->cursg].offset + (qc->cursg_ofs * ATA_SECT_SIZE); + offset = sg[qc->cursg].offset + qc->cursg_ofs * ATA_SECT_SIZE; +#endif /* SMALL_SCATTERLIST */ - qc->cursect++; - qc->cursg_ofs++; + /* get the current page and offset */ + page = nth_page(page, (offset >> PAGE_SHIFT)); +@@ -2339,8 +2349,13 @@ + sg = &qc->sg[qc->cursg]; + + next_page: ++#if SMALL_SCATTERLIST ++ page = sg->u.page.page; ++ offset = sg->u.page.offset + qc->cursg_ofs; ++#else + page = sg->page; + offset = sg->offset + qc->cursg_ofs; ++#endif + + /* get the current page and offset */ + page = nth_page(page, (offset >> PAGE_SHIFT)); Index: linux-2.4.21/drivers/scsi/libata-scsi.c =================================================================== ---- linux-2.4.21.orig/drivers/scsi/libata-scsi.c 2004-12-21 13:51:26.000000000 -0500 -+++ linux-2.4.21/drivers/scsi/libata-scsi.c 2004-12-21 13:58:10.000000000 -0500 -@@ -686,7 +686,11 @@ +--- linux-2.4.21.orig/drivers/scsi/libata-scsi.c 2005-06-01 22:51:58.000000000 -0400 ++++ linux-2.4.21/drivers/scsi/libata-scsi.c 2005-06-01 23:12:15.112442040 -0400 +@@ -689,7 +689,11 @@ struct scatterlist *sg; sg = (struct scatterlist *) cmd->request_buffer; @@ -3214,22 +3226,22 @@ Index: linux-2.4.21/drivers/scsi/libata-scsi.c buflen = sg->length; } else { buf = cmd->request_buffer; -@@ -714,7 +718,11 @@ +@@ -717,7 +721,11 @@ struct scatterlist *sg; sg = (struct scatterlist *) cmd->request_buffer; +#if SMALL_SCATTERLIST -+ kunmap_atomic(sg->u.page.page, KM_USER0); ++ kunmap_atomic(buf - sg->u.page.offset, KM_USER0); +#else - kunmap_atomic(sg->page, KM_USER0); + kunmap_atomic(buf - sg->offset, KM_USER0); +#endif /* !SMALL_SCATTERLIST */ } } Index: linux-2.4.21/drivers/block/cpqarray.c =================================================================== ---- linux-2.4.21.orig/drivers/block/cpqarray.c 2004-12-21 13:51:20.000000000 -0500 -+++ linux-2.4.21/drivers/block/cpqarray.c 2004-12-21 13:58:10.000000000 -0500 +--- linux-2.4.21.orig/drivers/block/cpqarray.c 2005-06-01 22:51:54.000000000 -0400 ++++ linux-2.4.21/drivers/block/cpqarray.c 2005-06-01 23:07:51.183565328 -0400 @@ -1003,9 +1003,14 @@ } else { if (seg == SG_MAX) @@ -3271,8 +3283,8 @@ Index: linux-2.4.21/drivers/block/cpqarray.c c->req.hdr.sg_cnt = seg; Index: linux-2.4.21/drivers/block/cciss.c =================================================================== ---- linux-2.4.21.orig/drivers/block/cciss.c 2004-12-21 13:51:19.000000000 -0500 -+++ linux-2.4.21/drivers/block/cciss.c 2004-12-21 13:58:10.000000000 -0500 +--- linux-2.4.21.orig/drivers/block/cciss.c 2005-06-01 22:51:54.000000000 -0400 ++++ linux-2.4.21/drivers/block/cciss.c 2005-06-01 23:07:51.185565024 -0400 @@ -2491,9 +2491,14 @@ } else { if (seg == MAXSGENTRIES) @@ -3310,8 +3322,8 @@ Index: linux-2.4.21/drivers/block/cciss.c c->SG[i].Ext = 0; /* we are not chaining */ Index: linux-2.4.21/drivers/block/sx8.c =================================================================== ---- linux-2.4.21.orig/drivers/block/sx8.c 2004-12-21 13:51:26.000000000 -0500 -+++ linux-2.4.21/drivers/block/sx8.c 2004-12-21 13:58:10.000000000 -0500 +--- linux-2.4.21.orig/drivers/block/sx8.c 2005-06-01 22:51:58.000000000 -0400 ++++ linux-2.4.21/drivers/block/sx8.c 2005-06-01 23:07:51.186564872 -0400 @@ -1103,9 +1103,15 @@ } else { if (unlikely(n_elem == CARM_MAX_REQ_SG)) @@ -3330,8 +3342,8 @@ Index: linux-2.4.21/drivers/block/sx8.c } Index: linux-2.4.21/drivers/ieee1394/dma.c =================================================================== ---- linux-2.4.21.orig/drivers/ieee1394/dma.c 2003-06-13 10:51:34.000000000 -0400 -+++ linux-2.4.21/drivers/ieee1394/dma.c 2004-12-21 13:58:10.000000000 -0500 +--- linux-2.4.21.orig/drivers/ieee1394/dma.c 2005-06-01 22:52:05.000000000 -0400 ++++ linux-2.4.21/drivers/ieee1394/dma.c 2005-06-01 23:07:51.187564720 -0400 @@ -97,8 +97,12 @@ /* fill scatter/gather list with pages */ for(i = 0; i < dma->n_pages; i++) { @@ -3349,7 +3361,7 @@ Index: linux-2.4.21/drivers/ieee1394/dma.c Index: linux-2.4.21/drivers/ieee1394/sbp2.c =================================================================== --- linux-2.4.21.orig/drivers/ieee1394/sbp2.c 2003-06-13 10:51:34.000000000 -0400 -+++ linux-2.4.21/drivers/ieee1394/sbp2.c 2004-12-21 13:58:10.000000000 -0500 ++++ linux-2.4.21/drivers/ieee1394/sbp2.c 2005-06-01 23:07:51.189564416 -0400 @@ -2036,11 +2036,19 @@ command->dma_dir = dma_dir; command->dma_size = sgpnt[0].length; @@ -3373,7 +3385,7 @@ Index: linux-2.4.21/drivers/ieee1394/sbp2.c Index: linux-2.4.21/drivers/message/i2o/i2o_scsi.c =================================================================== --- linux-2.4.21.orig/drivers/message/i2o/i2o_scsi.c 2002-08-02 20:39:44.000000000 -0400 -+++ linux-2.4.21/drivers/message/i2o/i2o_scsi.c 2004-12-21 13:58:10.000000000 -0500 ++++ linux-2.4.21/drivers/message/i2o/i2o_scsi.c 2005-06-01 23:07:51.190564264 -0400 @@ -693,7 +693,11 @@ { *mptr++=direction|0x10000000|sg->length; @@ -3401,7 +3413,7 @@ Index: linux-2.4.21/drivers/message/i2o/i2o_scsi.c Index: linux-2.4.21/drivers/net/fc/iph5526.c =================================================================== --- linux-2.4.21.orig/drivers/net/fc/iph5526.c 2003-06-13 10:51:34.000000000 -0400 -+++ linux-2.4.21/drivers/net/fc/iph5526.c 2004-12-21 13:58:10.000000000 -0500 ++++ linux-2.4.21/drivers/net/fc/iph5526.c 2005-06-01 23:07:51.193563808 -0400 @@ -4249,7 +4249,11 @@ if (Cmnd->use_sg) { int count = 0, j; @@ -3450,8 +3462,8 @@ Index: linux-2.4.21/drivers/net/fc/iph5526.c update_EDB_indx(fi); Index: linux-2.4.21/drivers/net/wireless/airo.c =================================================================== ---- linux-2.4.21.orig/drivers/net/wireless/airo.c 2004-12-21 13:51:20.000000000 -0500 -+++ linux-2.4.21/drivers/net/wireless/airo.c 2004-12-21 13:58:10.000000000 -0500 +--- linux-2.4.21.orig/drivers/net/wireless/airo.c 2005-06-01 22:51:55.000000000 -0400 ++++ linux-2.4.21/drivers/net/wireless/airo.c 2005-06-01 23:07:51.198563048 -0400 @@ -1584,11 +1584,20 @@ aes_counter[12] = (u8)(counter >> 24); counter++; @@ -3476,7 +3488,7 @@ Index: linux-2.4.21/drivers/net/wireless/airo.c Index: linux-2.4.21/drivers/usb/microtek.c =================================================================== --- linux-2.4.21.orig/drivers/usb/microtek.c 2002-11-28 18:53:14.000000000 -0500 -+++ linux-2.4.21/drivers/usb/microtek.c 2004-12-21 13:58:10.000000000 -0500 ++++ linux-2.4.21/drivers/usb/microtek.c 2005-06-01 23:07:51.199562896 -0400 @@ -623,7 +623,11 @@ context->fragment++; mts_int_submit_urb(transfer, @@ -3504,7 +3516,7 @@ Index: linux-2.4.21/drivers/usb/microtek.c Index: linux-2.4.21/drivers/usb/hpusbscsi.c =================================================================== --- linux-2.4.21.orig/drivers/usb/hpusbscsi.c 2003-06-13 10:51:36.000000000 -0400 -+++ linux-2.4.21/drivers/usb/hpusbscsi.c 2004-12-21 13:58:10.000000000 -0500 ++++ linux-2.4.21/drivers/usb/hpusbscsi.c 2005-06-01 23:07:51.199562896 -0400 @@ -576,6 +576,17 @@ hpusbscsi->state = HP_STATE_WORKING; PDEBUG(2, "state= %s", states[hpusbscsi->state]); @@ -3534,7 +3546,7 @@ Index: linux-2.4.21/drivers/usb/hpusbscsi.c Index: linux-2.4.21/drivers/usb/storage/protocol.c =================================================================== --- linux-2.4.21.orig/drivers/usb/storage/protocol.c 2002-08-02 20:39:45.000000000 -0400 -+++ linux-2.4.21/drivers/usb/storage/protocol.c 2004-12-21 13:58:10.000000000 -0500 ++++ linux-2.4.21/drivers/usb/storage/protocol.c 2005-06-01 23:07:51.200562744 -0400 @@ -72,7 +72,11 @@ struct scatterlist *sg; @@ -3549,8 +3561,8 @@ Index: linux-2.4.21/drivers/usb/storage/protocol.c Index: linux-2.4.21/drivers/usb/storage/transport.c =================================================================== ---- linux-2.4.21.orig/drivers/usb/storage/transport.c 2004-12-21 13:51:15.000000000 -0500 -+++ linux-2.4.21/drivers/usb/storage/transport.c 2004-12-21 13:58:10.000000000 -0500 +--- linux-2.4.21.orig/drivers/usb/storage/transport.c 2005-06-01 22:51:52.000000000 -0400 ++++ linux-2.4.21/drivers/usb/storage/transport.c 2005-06-01 23:07:51.201562592 -0400 @@ -592,11 +592,20 @@ if (transfer_amount - total_transferred >= sg[i].length) { @@ -3575,8 +3587,8 @@ Index: linux-2.4.21/drivers/usb/storage/transport.c /* if we get an error, end the loop here */ Index: linux-2.4.21/drivers/usb/storage/usb.c =================================================================== ---- linux-2.4.21.orig/drivers/usb/storage/usb.c 2004-12-21 13:51:15.000000000 -0500 -+++ linux-2.4.21/drivers/usb/storage/usb.c 2004-12-21 13:58:10.000000000 -0500 +--- linux-2.4.21.orig/drivers/usb/storage/usb.c 2005-06-01 22:51:52.000000000 -0400 ++++ linux-2.4.21/drivers/usb/storage/usb.c 2005-06-01 23:07:51.202562440 -0400 @@ -291,13 +291,21 @@ if (us->srb->use_sg) { sg = (struct scatterlist *)us->srb->request_buffer; @@ -3602,7 +3614,7 @@ Index: linux-2.4.21/drivers/usb/storage/usb.c Index: linux-2.4.21/drivers/usb/storage/shuttle_usbat.c =================================================================== --- linux-2.4.21.orig/drivers/usb/storage/shuttle_usbat.c 2003-06-13 10:51:37.000000000 -0400 -+++ linux-2.4.21/drivers/usb/storage/shuttle_usbat.c 2004-12-21 13:58:10.000000000 -0500 ++++ linux-2.4.21/drivers/usb/storage/shuttle_usbat.c 2005-06-01 23:07:51.202562440 -0400 @@ -217,7 +217,11 @@ sg = (struct scatterlist *)data; for (i=0; i= sg[i].length) { @@ -3861,7 +3873,7 @@ Index: linux-2.4.21/drivers/usb/storage/freecom.c Index: linux-2.4.21/drivers/usb/storage/isd200.c =================================================================== --- linux-2.4.21.orig/drivers/usb/storage/isd200.c 2003-06-13 10:51:37.000000000 -0400 -+++ linux-2.4.21/drivers/usb/storage/isd200.c 2004-12-21 13:58:10.000000000 -0500 ++++ linux-2.4.21/drivers/usb/storage/isd200.c 2005-06-01 23:07:51.206561832 -0400 @@ -494,13 +494,21 @@ sg[i].length) { result = isd200_transfer_partial(us, @@ -3906,7 +3918,7 @@ Index: linux-2.4.21/drivers/usb/storage/isd200.c Index: linux-2.4.21/drivers/usb/storage/datafab.c =================================================================== --- linux-2.4.21.orig/drivers/usb/storage/datafab.c 2003-06-13 10:51:37.000000000 -0400 -+++ linux-2.4.21/drivers/usb/storage/datafab.c 2004-12-21 13:58:10.000000000 -0500 ++++ linux-2.4.21/drivers/usb/storage/datafab.c 2005-06-01 23:07:51.207561680 -0400 @@ -265,18 +265,30 @@ while (sg_idx < use_sg && transferred < len) { if (len - transferred >= sg[sg_idx].length - current_sg_offset) { @@ -3972,7 +3984,7 @@ Index: linux-2.4.21/drivers/usb/storage/datafab.c Index: linux-2.4.21/drivers/usb/storage/jumpshot.c =================================================================== --- linux-2.4.21.orig/drivers/usb/storage/jumpshot.c 2003-06-13 10:51:37.000000000 -0400 -+++ linux-2.4.21/drivers/usb/storage/jumpshot.c 2004-12-21 13:58:10.000000000 -0500 ++++ linux-2.4.21/drivers/usb/storage/jumpshot.c 2005-06-01 23:07:51.208561528 -0400 @@ -341,18 +341,30 @@ while (sg_idx < use_sg && transferred < len) { if (len - transferred >= sg[sg_idx].length - current_sg_offset) { @@ -4038,8 +4050,8 @@ Index: linux-2.4.21/drivers/usb/storage/jumpshot.c break; Index: linux-2.4.21/drivers/usb/storage/scsiglue.c =================================================================== ---- linux-2.4.21.orig/drivers/usb/storage/scsiglue.c 2004-12-21 13:51:15.000000000 -0500 -+++ linux-2.4.21/drivers/usb/storage/scsiglue.c 2004-12-21 13:58:10.000000000 -0500 +--- linux-2.4.21.orig/drivers/usb/storage/scsiglue.c 2005-06-01 22:51:52.000000000 -0400 ++++ linux-2.4.21/drivers/usb/storage/scsiglue.c 2005-06-01 23:07:51.209561376 -0400 @@ -606,7 +606,11 @@ } @@ -4114,8 +4126,8 @@ Index: linux-2.4.21/drivers/usb/storage/scsiglue.c element++; Index: linux-2.4.21/drivers/addon/ips_70015/ips.c =================================================================== ---- linux-2.4.21.orig/drivers/addon/ips_70015/ips.c 2004-12-21 13:51:19.000000000 -0500 -+++ linux-2.4.21/drivers/addon/ips_70015/ips.c 2004-12-21 14:02:57.000000000 -0500 +--- linux-2.4.21.orig/drivers/addon/ips_70015/ips.c 2005-06-01 22:51:54.000000000 -0400 ++++ linux-2.4.21/drivers/addon/ips_70015/ips.c 2005-06-01 23:07:51.214560616 -0400 @@ -207,7 +207,11 @@ #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,0) #include @@ -4130,8 +4142,8 @@ Index: linux-2.4.21/drivers/addon/ips_70015/ips.c #ifndef __devexit_p Index: linux-2.4.21/drivers/addon/megaraid_2106/megaraid2.c =================================================================== ---- linux-2.4.21.orig/drivers/addon/megaraid_2106/megaraid2.c 2004-12-21 13:51:19.000000000 -0500 -+++ linux-2.4.21/drivers/addon/megaraid_2106/megaraid2.c 2004-12-21 14:00:26.000000000 -0500 +--- linux-2.4.21.orig/drivers/addon/megaraid_2106/megaraid2.c 2005-06-01 22:51:54.000000000 -0400 ++++ linux-2.4.21/drivers/addon/megaraid_2106/megaraid2.c 2005-06-01 23:07:51.217560160 -0400 @@ -2198,7 +2198,11 @@ if( cmd->use_sg ) { sgl = (struct scatterlist *) @@ -4146,8 +4158,8 @@ Index: linux-2.4.21/drivers/addon/megaraid_2106/megaraid2.c c = *(u8 *)cmd->request_buffer; Index: linux-2.4.21/drivers/addon/iscsi_sfnet/iscsi.c =================================================================== ---- linux-2.4.21.orig/drivers/addon/iscsi_sfnet/iscsi.c 2004-12-21 13:51:27.000000000 -0500 -+++ linux-2.4.21/drivers/addon/iscsi_sfnet/iscsi.c 2004-12-21 14:37:53.000000000 -0500 +--- linux-2.4.21.orig/drivers/addon/iscsi_sfnet/iscsi.c 2005-06-01 22:51:59.000000000 -0400 ++++ linux-2.4.21/drivers/addon/iscsi_sfnet/iscsi.c 2005-06-01 23:07:51.229558336 -0400 @@ -118,6 +118,16 @@ #include "iscsi-probe.h" #include "iscsi-crc.h" @@ -4282,8 +4294,8 @@ Index: linux-2.4.21/drivers/addon/iscsi_sfnet/iscsi.c } Index: linux-2.4.21/include/asm-i386/pci.h =================================================================== ---- linux-2.4.21.orig/include/asm-i386/pci.h 2004-12-21 13:51:05.000000000 -0500 -+++ linux-2.4.21/include/asm-i386/pci.h 2004-12-21 14:36:22.000000000 -0500 +--- linux-2.4.21.orig/include/asm-i386/pci.h 2005-06-01 22:51:45.000000000 -0400 ++++ linux-2.4.21/include/asm-i386/pci.h 2005-06-01 23:21:02.208311288 -0400 @@ -157,6 +157,17 @@ * temporary 2.4 hack */ @@ -4313,7 +4325,7 @@ Index: linux-2.4.21/include/asm-i386/pci.h Index: linux-2.4.21/include/asm-i386/scatterlist.h =================================================================== --- linux-2.4.21.orig/include/asm-i386/scatterlist.h 2002-11-28 18:53:15.000000000 -0500 -+++ linux-2.4.21/include/asm-i386/scatterlist.h 2004-12-21 13:58:10.000000000 -0500 ++++ linux-2.4.21/include/asm-i386/scatterlist.h 2005-06-01 23:07:51.230558184 -0400 @@ -19,7 +19,25 @@ * * and that's it. There's no excuse for not highmem enabling YOUR driver. /jens @@ -4350,8 +4362,8 @@ Index: linux-2.4.21/include/asm-i386/scatterlist.h #define ISA_DMA_THRESHOLD (0x00ffffff) Index: linux-2.4.21/net/xfrm/xfrm_algo.c =================================================================== ---- linux-2.4.21.orig/net/xfrm/xfrm_algo.c 2004-12-21 13:51:11.000000000 -0500 -+++ linux-2.4.21/net/xfrm/xfrm_algo.c 2004-12-21 13:58:10.000000000 -0500 +--- linux-2.4.21.orig/net/xfrm/xfrm_algo.c 2005-06-01 22:51:50.000000000 -0400 ++++ linux-2.4.21/net/xfrm/xfrm_algo.c 2005-06-01 23:07:51.231558032 -0400 @@ -487,9 +487,14 @@ if (copy > 0) { if (copy > len) @@ -4415,8 +4427,8 @@ Index: linux-2.4.21/net/xfrm/xfrm_algo.c if (!(len -= copy)) Index: linux-2.4.21/net/ipv6/addrconf.c =================================================================== ---- linux-2.4.21.orig/net/ipv6/addrconf.c 2004-12-21 13:51:11.000000000 -0500 -+++ linux-2.4.21/net/ipv6/addrconf.c 2004-12-21 13:58:10.000000000 -0500 +--- linux-2.4.21.orig/net/ipv6/addrconf.c 2005-06-01 22:51:50.000000000 -0400 ++++ linux-2.4.21/net/ipv6/addrconf.c 2005-06-01 23:07:51.232557880 -0400 @@ -1047,11 +1047,18 @@ u8 digest[16]; struct scatterlist sg[2]; diff --git a/lustre/kernel_patches/patches/statfs64-cast-unsigned-2.4-rhel.patch b/lustre/kernel_patches/patches/statfs64-cast-unsigned-2.4-rhel.patch new file mode 100644 index 0000000..a1063ae --- /dev/null +++ b/lustre/kernel_patches/patches/statfs64-cast-unsigned-2.4-rhel.patch @@ -0,0 +1,28 @@ +Index: linux-2.4.21/fs/open.c +=================================================================== +--- linux-2.4.21.orig/fs/open.c 2005-05-04 16:09:11.702098704 -0400 ++++ linux-2.4.21/fs/open.c 2005-05-04 16:17:31.597103112 -0400 +@@ -92,15 +92,15 @@ + if (retval) + return retval; + /* Stuff the 32 bit values into the 64 bit struct */ +- buf->f_type = st.f_type; +- buf->f_bsize = st.f_bsize; +- buf->f_blocks = st.f_blocks; +- buf->f_bfree = st.f_bfree; +- buf->f_bavail = st.f_bavail; +- buf->f_files = st.f_files; +- buf->f_ffree = st.f_ffree; ++ buf->f_type = (unsigned long) st.f_type; ++ buf->f_bsize = (unsigned long) st.f_bsize; ++ buf->f_blocks = (unsigned long) st.f_blocks; ++ buf->f_bfree = (unsigned long) st.f_bfree; ++ buf->f_bavail = (unsigned long) st.f_bavail; ++ buf->f_files = (unsigned long) st.f_files; ++ buf->f_ffree = (unsigned long) st.f_ffree; + buf->f_fsid = st.f_fsid; +- buf->f_namelen = st.f_namelen; ++ buf->f_namelen = (unsigned long) st.f_namelen; + memset(buf->f_spare, 0, sizeof(buf->f_spare)); + } + return 0; diff --git a/lustre/kernel_patches/patches/vfs_intent-2.4.21-rhel.patch b/lustre/kernel_patches/patches/vfs_intent-2.4.21-rhel.patch index 1da088c..1055dee 100644 --- a/lustre/kernel_patches/patches/vfs_intent-2.4.21-rhel.patch +++ b/lustre/kernel_patches/patches/vfs_intent-2.4.21-rhel.patch @@ -14,8 +14,8 @@ Index: linux-2.4.21/fs/dcache.c =================================================================== ---- linux-2.4.21.orig/fs/dcache.c 2004-09-11 10:16:31.000000000 -0400 -+++ linux-2.4.21/fs/dcache.c 2004-09-16 19:32:11.000000000 -0400 +--- linux-2.4.21.orig/fs/dcache.c 2005-06-01 22:51:55.000000000 -0400 ++++ linux-2.4.21/fs/dcache.c 2005-06-01 22:58:09.043064136 -0400 @@ -187,6 +187,13 @@ spin_unlock(&dcache_lock); return 0; @@ -55,8 +55,8 @@ Index: linux-2.4.21/fs/dcache.c #define do_switch(x,y) do { \ Index: linux-2.4.21/fs/exec.c =================================================================== ---- linux-2.4.21.orig/fs/exec.c 2004-09-11 10:16:39.000000000 -0400 -+++ linux-2.4.21/fs/exec.c 2004-09-16 19:32:11.000000000 -0400 +--- linux-2.4.21.orig/fs/exec.c 2005-06-01 22:52:05.000000000 -0400 ++++ linux-2.4.21/fs/exec.c 2005-06-01 22:58:09.044063984 -0400 @@ -116,8 +116,10 @@ struct file * file; struct nameidata nd; @@ -79,7 +79,7 @@ Index: linux-2.4.21/fs/exec.c error = PTR_ERR(file); if (IS_ERR(file)) goto out; -@@ -401,8 +404,10 @@ +@@ -405,8 +408,10 @@ struct inode *inode; struct file *file; int err = 0; @@ -91,7 +91,7 @@ Index: linux-2.4.21/fs/exec.c file = ERR_PTR(err); if (!err) { inode = nd.dentry->d_inode; -@@ -414,7 +419,8 @@ +@@ -418,7 +423,8 @@ err = -EACCES; file = ERR_PTR(err); if (!err) { @@ -101,7 +101,7 @@ Index: linux-2.4.21/fs/exec.c if (!IS_ERR(file)) { err = deny_write_access(file); if (err) { -@@ -426,6 +432,7 @@ +@@ -430,6 +436,7 @@ return file; } } @@ -109,7 +109,7 @@ Index: linux-2.4.21/fs/exec.c path_release(&nd); } goto out; -@@ -1355,7 +1362,7 @@ +@@ -1368,7 +1375,7 @@ goto close_fail; if (!file->f_op->write) goto close_fail; @@ -120,8 +120,8 @@ Index: linux-2.4.21/fs/exec.c retval = binfmt->core_dump(signr, regs, file); Index: linux-2.4.21/fs/namei.c =================================================================== ---- linux-2.4.21.orig/fs/namei.c 2004-09-11 10:16:29.000000000 -0400 -+++ linux-2.4.21/fs/namei.c 2004-09-16 19:34:57.000000000 -0400 +--- linux-2.4.21.orig/fs/namei.c 2005-06-01 22:52:05.000000000 -0400 ++++ linux-2.4.21/fs/namei.c 2005-06-01 23:01:30.065504080 -0400 @@ -94,6 +94,13 @@ * XEmacs seems to be relying on it... */ @@ -248,16 +248,16 @@ Index: linux-2.4.21/fs/namei.c err = PTR_ERR(dentry); if (IS_ERR(dentry)) break; -@@ -547,7 +583,7 @@ - goto out_dput; +@@ -548,7 +584,7 @@ if (inode->i_op->follow_link) { + struct vfsmount *mnt = mntget(nd->mnt); - err = do_follow_link(dentry, nd); + err = do_follow_link(dentry, nd, NULL); dput(dentry); + mntput(mnt); if (err) - goto return_err; -@@ -563,7 +599,7 @@ +@@ -565,7 +601,7 @@ nd->dentry = dentry; } err = -ENOTDIR; @@ -266,7 +266,7 @@ Index: linux-2.4.21/fs/namei.c break; continue; /* here ends the main loop */ -@@ -590,12 +626,12 @@ +@@ -592,12 +628,12 @@ if (err < 0) break; } @@ -281,16 +281,16 @@ Index: linux-2.4.21/fs/namei.c err = PTR_ERR(dentry); if (IS_ERR(dentry)) break; -@@ -605,7 +641,7 @@ - inode = dentry->d_inode; +@@ -608,7 +644,7 @@ if ((lookup_flags & LOOKUP_FOLLOW) && inode && inode->i_op && inode->i_op->follow_link) { + struct vfsmount *mnt = mntget(nd->mnt); - err = do_follow_link(dentry, nd); + err = do_follow_link(dentry, nd, it); dput(dentry); + mntput(mnt); if (err) - goto return_err; -@@ -619,7 +655,8 @@ +@@ -623,7 +659,8 @@ goto no_inode; if (lookup_flags & LOOKUP_DIRECTORY) { err = -ENOTDIR; @@ -300,7 +300,7 @@ Index: linux-2.4.21/fs/namei.c break; } goto return_base; -@@ -637,12 +672,42 @@ return_reval: +@@ -641,12 +678,42 @@ nd->last_type = LAST_DOT; else if (this.len == 2 && this.name[1] == '.') nd->last_type = LAST_DOTDOT; @@ -343,7 +343,7 @@ Index: linux-2.4.21/fs/namei.c if (dentry && dentry->d_op && dentry->d_op->d_revalidate) { err = -ESTALE; if (!dentry->d_op->d_revalidate(dentry, 0)) { -@@ -656,15 +721,28 @@ +@@ -660,15 +727,28 @@ dput(dentry); break; } @@ -373,7 +373,7 @@ Index: linux-2.4.21/fs/namei.c } /* SMP-safe */ -@@ -749,6 +827,17 @@ +@@ -753,6 +833,17 @@ } /* SMP-safe */ @@ -391,7 +391,7 @@ Index: linux-2.4.21/fs/namei.c int path_lookup(const char *path, unsigned flags, struct nameidata *nd) { int error = 0; -@@ -763,6 +852,7 @@ +@@ -767,6 +858,7 @@ { nd->last_type = LAST_ROOT; /* if there are only slashes... */ nd->flags = flags; @@ -399,7 +399,7 @@ Index: linux-2.4.21/fs/namei.c if (*name=='/') return walk_init_root(name,nd); read_lock(¤t->fs->lock); -@@ -777,7 +867,8 @@ +@@ -781,7 +873,8 @@ * needs parent already locked. Doesn't follow mounts. * SMP-safe. */ @@ -409,7 +409,7 @@ Index: linux-2.4.21/fs/namei.c { struct dentry * dentry; struct inode *inode; -@@ -800,13 +891,16 @@ +@@ -804,13 +897,16 @@ goto out; } @@ -427,7 +427,7 @@ Index: linux-2.4.21/fs/namei.c dentry = inode->i_op->lookup(inode, new); unlock_kernel(); if (!dentry) -@@ -818,6 +912,12 @@ +@@ -822,6 +918,12 @@ return dentry; } @@ -440,7 +440,7 @@ Index: linux-2.4.21/fs/namei.c /* SMP-safe */ struct dentry * lookup_one_len(const char * name, struct dentry * base, int len) { -@@ -839,7 +939,7 @@ +@@ -843,7 +945,7 @@ } this.hash = end_name_hash(hash); @@ -449,7 +449,7 @@ Index: linux-2.4.21/fs/namei.c access: return ERR_PTR(-EACCES); } -@@ -870,6 +970,23 @@ +@@ -874,6 +976,23 @@ return err; } @@ -473,7 +473,7 @@ Index: linux-2.4.21/fs/namei.c /* * It's inline, so penalty for filesystems that don't use sticky bit is * minimal. -@@ -967,7 +1084,8 @@ +@@ -971,7 +1090,8 @@ return retval; } @@ -483,7 +483,7 @@ Index: linux-2.4.21/fs/namei.c { int error; -@@ -980,12 +1098,15 @@ +@@ -984,12 +1104,15 @@ goto exit_lock; error = -EACCES; /* shouldn't it be ENOSYS? */ @@ -501,7 +501,7 @@ Index: linux-2.4.21/fs/namei.c unlock_kernel(); exit_lock: up(&dir->i_zombie); -@@ -994,6 +1115,11 @@ +@@ -998,6 +1121,11 @@ return error; } @@ -513,7 +513,7 @@ Index: linux-2.4.21/fs/namei.c /* * open_namei() * -@@ -1008,7 +1134,8 @@ +@@ -1012,7 +1140,8 @@ * for symlinks (where the permissions are checked later). * SMP-safe */ @@ -523,7 +523,7 @@ Index: linux-2.4.21/fs/namei.c { int acc_mode, error = 0; struct inode *inode; -@@ -1018,11 +1145,14 @@ +@@ -1023,11 +1152,14 @@ acc_mode = ACC_MODE(flag); @@ -539,7 +539,7 @@ Index: linux-2.4.21/fs/namei.c if (error) return error; dentry = nd->dentry; -@@ -1032,6 +1162,10 @@ +@@ -1037,6 +1169,10 @@ /* * Create - we need to know the parent. */ @@ -550,7 +550,7 @@ Index: linux-2.4.21/fs/namei.c error = path_lookup(pathname, LOOKUP_PARENT, nd); if (error) return error; -@@ -1047,7 +1181,7 @@ +@@ -1052,7 +1188,7 @@ dir = nd->dentry; down(&dir->d_inode->i_sem); @@ -559,7 +559,7 @@ Index: linux-2.4.21/fs/namei.c do_last: error = PTR_ERR(dentry); -@@ -1056,11 +1190,12 @@ +@@ -1061,11 +1197,12 @@ goto exit; } @@ -573,7 +573,7 @@ Index: linux-2.4.21/fs/namei.c up(&dir->d_inode->i_sem); dput(nd->dentry); nd->dentry = dentry; -@@ -1164,7 +1299,7 @@ +@@ -1169,7 +1306,7 @@ if (!error) { DQUOT_INIT(inode); @@ -582,7 +582,7 @@ Index: linux-2.4.21/fs/namei.c } put_write_access(inode); if (error) -@@ -1176,8 +1311,10 @@ +@@ -1181,8 +1318,10 @@ return 0; exit_dput: @@ -593,18 +593,18 @@ Index: linux-2.4.21/fs/namei.c path_release(nd); return error; -@@ -1196,7 +1333,10 @@ - * are done. Procfs-like symlinks just set LAST_BIND. +@@ -1202,7 +1341,10 @@ */ UPDATE_ATIME(dentry->d_inode); + mnt = mntget(nd->mnt); + nd->intent = it; error = dentry->d_inode->i_op->follow_link(dentry, nd); + if (error) + intent_release(it); dput(dentry); + mntput(mnt); if (error) - return error; -@@ -1218,13 +1358,20 @@ +@@ -1225,13 +1367,20 @@ } dir = nd->dentry; down(&dir->d_inode->i_sem); @@ -627,7 +627,7 @@ Index: linux-2.4.21/fs/namei.c { struct dentry *dentry; -@@ -1232,7 +1379,7 @@ +@@ -1239,7 +1388,7 @@ dentry = ERR_PTR(-EEXIST); if (nd->last_type != LAST_NORM) goto fail; @@ -636,7 +636,7 @@ Index: linux-2.4.21/fs/namei.c if (IS_ERR(dentry)) goto fail; if (!is_dir && nd->last.name[nd->last.len] && !dentry->d_inode) -@@ -1288,7 +1435,20 @@ +@@ -1295,7 +1444,20 @@ error = path_lookup(tmp, LOOKUP_PARENT, &nd); if (error) goto out; @@ -658,7 +658,7 @@ Index: linux-2.4.21/fs/namei.c error = PTR_ERR(dentry); if (!IS_POSIXACL(nd.dentry->d_inode)) -@@ -1310,6 +1470,7 @@ +@@ -1317,6 +1479,7 @@ dput(dentry); } up(&nd.dentry->d_inode->i_sem); @@ -666,7 +666,7 @@ Index: linux-2.4.21/fs/namei.c path_release(&nd); out: putname(tmp); -@@ -1357,7 +1518,18 @@ +@@ -1364,7 +1527,18 @@ error = path_lookup(tmp, LOOKUP_PARENT, &nd); if (error) goto out; @@ -686,7 +686,7 @@ Index: linux-2.4.21/fs/namei.c error = PTR_ERR(dentry); if (!IS_ERR(dentry)) { if (!IS_POSIXACL(nd.dentry->d_inode)) -@@ -1366,6 +1538,7 @@ +@@ -1373,6 +1547,7 @@ dput(dentry); } up(&nd.dentry->d_inode->i_sem); @@ -694,7 +694,7 @@ Index: linux-2.4.21/fs/namei.c path_release(&nd); out: putname(tmp); -@@ -1466,8 +1639,16 @@ +@@ -1473,8 +1648,16 @@ error = -EBUSY; goto exit1; } @@ -712,7 +712,7 @@ Index: linux-2.4.21/fs/namei.c error = PTR_ERR(dentry); if (!IS_ERR(dentry)) { error = vfs_rmdir(nd.dentry->d_inode, dentry); -@@ -1525,8 +1706,15 @@ +@@ -1532,8 +1715,15 @@ error = -EISDIR; if (nd.last_type != LAST_NORM) goto exit1; @@ -729,7 +729,7 @@ Index: linux-2.4.21/fs/namei.c error = PTR_ERR(dentry); if (!IS_ERR(dentry)) { /* Why not before? Because we want correct error value */ -@@ -1593,15 +1781,27 @@ +@@ -1600,15 +1790,27 @@ error = path_lookup(to, LOOKUP_PARENT, &nd); if (error) goto out; @@ -759,7 +759,7 @@ Index: linux-2.4.21/fs/namei.c putname(to); } putname(from); -@@ -1677,7 +1877,18 @@ +@@ -1684,7 +1886,18 @@ error = -EXDEV; if (old_nd.mnt != nd.mnt) goto out_release; @@ -779,7 +779,7 @@ Index: linux-2.4.21/fs/namei.c error = PTR_ERR(new_dentry); if (!IS_ERR(new_dentry)) { error = vfs_link(old_nd.dentry, nd.dentry->d_inode, new_dentry); -@@ -1721,7 +1932,7 @@ +@@ -1728,7 +1941,7 @@ * locking]. */ int vfs_rename_dir(struct inode *old_dir, struct dentry *old_dentry, @@ -788,7 +788,7 @@ Index: linux-2.4.21/fs/namei.c { int error; struct inode *target; -@@ -1800,7 +2011,7 @@ +@@ -1807,7 +2020,7 @@ } int vfs_rename_other(struct inode *old_dir, struct dentry *old_dentry, @@ -797,7 +797,7 @@ Index: linux-2.4.21/fs/namei.c { int error; -@@ -1888,9 +2099,18 @@ +@@ -1895,9 +2108,18 @@ if (newnd.last_type != LAST_NORM) goto exit2; @@ -817,7 +817,7 @@ Index: linux-2.4.21/fs/namei.c error = PTR_ERR(old_dentry); if (IS_ERR(old_dentry)) goto exit3; -@@ -1906,16 +2126,16 @@ +@@ -1913,16 +2135,16 @@ if (newnd.last.name[newnd.last.len]) goto exit4; } @@ -836,7 +836,7 @@ Index: linux-2.4.21/fs/namei.c dput(new_dentry); exit4: dput(old_dentry); -@@ -1966,20 +2186,26 @@ +@@ -1973,20 +2195,26 @@ } static inline int @@ -865,7 +865,7 @@ Index: linux-2.4.21/fs/namei.c out: if (current->link_count || res || nd->last_type!=LAST_NORM) return res; -@@ -2003,7 +2229,13 @@ +@@ -2010,7 +2238,13 @@ int vfs_follow_link(struct nameidata *nd, const char *link) { @@ -880,7 +880,7 @@ Index: linux-2.4.21/fs/namei.c } /* get the link contents into pagecache */ -@@ -2045,7 +2277,7 @@ +@@ -2052,7 +2286,7 @@ { struct page *page = NULL; char *s = page_getlink(dentry, &page); @@ -891,8 +891,8 @@ Index: linux-2.4.21/fs/namei.c page_cache_release(page); Index: linux-2.4.21/fs/namespace.c =================================================================== ---- linux-2.4.21.orig/fs/namespace.c 2004-09-11 10:16:15.000000000 -0400 -+++ linux-2.4.21/fs/namespace.c 2004-09-16 19:32:11.000000000 -0400 +--- linux-2.4.21.orig/fs/namespace.c 2005-06-01 22:51:42.000000000 -0400 ++++ linux-2.4.21/fs/namespace.c 2005-06-01 22:58:09.048063376 -0400 @@ -98,6 +98,7 @@ { old_nd->dentry = mnt->mnt_mountpoint; @@ -1007,8 +1007,8 @@ Index: linux-2.4.21/fs/namespace.c unlock_kernel(); Index: linux-2.4.21/fs/open.c =================================================================== ---- linux-2.4.21.orig/fs/open.c 2004-09-11 10:16:19.000000000 -0400 -+++ linux-2.4.21/fs/open.c 2004-09-16 19:32:11.000000000 -0400 +--- linux-2.4.21.orig/fs/open.c 2005-06-01 22:51:55.000000000 -0400 ++++ linux-2.4.21/fs/open.c 2005-06-01 22:58:09.050063072 -0400 @@ -19,6 +19,8 @@ #include @@ -1018,7 +1018,7 @@ Index: linux-2.4.21/fs/open.c int vfs_statfs(struct super_block *sb, struct statfs *buf) { -@@ -95,9 +97,10 @@ +@@ -169,9 +171,10 @@ write_unlock(&files->file_lock); } @@ -1030,7 +1030,7 @@ Index: linux-2.4.21/fs/open.c int error; struct iattr newattrs; -@@ -109,7 +112,13 @@ +@@ -183,7 +186,13 @@ down(&inode->i_sem); newattrs.ia_size = length; newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME; @@ -1045,7 +1045,7 @@ Index: linux-2.4.21/fs/open.c up(&inode->i_sem); up_write(&inode->i_alloc_sem); return error; -@@ -120,12 +129,13 @@ +@@ -194,12 +203,13 @@ struct nameidata nd; struct inode * inode; int error; @@ -1060,7 +1060,7 @@ Index: linux-2.4.21/fs/open.c if (error) goto out; inode = nd.dentry->d_inode; -@@ -165,11 +175,13 @@ +@@ -239,11 +249,13 @@ error = locks_verify_truncate(inode, NULL, length); if (!error) { DQUOT_INIT(inode); @@ -1075,7 +1075,7 @@ Index: linux-2.4.21/fs/open.c path_release(&nd); out: return error; -@@ -217,7 +229,7 @@ +@@ -291,7 +303,7 @@ error = locks_verify_truncate(inode, file, length); if (!error) @@ -1084,7 +1084,7 @@ Index: linux-2.4.21/fs/open.c out_putf: fput(file); out: -@@ -262,11 +274,13 @@ +@@ -336,11 +348,13 @@ struct inode * inode; struct iattr newattrs; @@ -1099,7 +1099,7 @@ Index: linux-2.4.21/fs/open.c error = -EROFS; if (IS_RDONLY(inode)) goto dput_and_out; -@@ -281,11 +295,25 @@ +@@ -355,11 +369,25 @@ goto dput_and_out; newattrs.ia_valid |= ATTR_ATIME_SET | ATTR_MTIME_SET; @@ -1126,7 +1126,7 @@ Index: linux-2.4.21/fs/open.c error = notify_change(nd.dentry, &newattrs); dput_and_out: path_release(&nd); -@@ -306,12 +334,14 @@ +@@ -380,12 +408,14 @@ struct inode * inode; struct iattr newattrs; @@ -1142,7 +1142,7 @@ Index: linux-2.4.21/fs/open.c error = -EROFS; if (IS_RDONLY(inode)) goto dput_and_out; -@@ -326,7 +356,20 @@ +@@ -400,7 +430,20 @@ newattrs.ia_atime = times[0].tv_sec; newattrs.ia_mtime = times[1].tv_sec; newattrs.ia_valid |= ATTR_ATIME_SET | ATTR_MTIME_SET; @@ -1164,7 +1164,7 @@ Index: linux-2.4.21/fs/open.c if (current->fsuid != inode->i_uid && (error = permission(inode,MAY_WRITE)) != 0) goto dput_and_out; -@@ -349,6 +392,7 @@ +@@ -423,6 +466,7 @@ int old_fsuid, old_fsgid; kernel_cap_t old_cap; int res; @@ -1172,7 +1172,7 @@ Index: linux-2.4.21/fs/open.c if (mode & ~S_IRWXO) /* where's F_OK, X_OK, W_OK, R_OK? */ return -EINVAL; -@@ -366,13 +410,14 @@ +@@ -440,13 +484,14 @@ else current->cap_effective = current->cap_permitted; @@ -1188,7 +1188,7 @@ Index: linux-2.4.21/fs/open.c path_release(&nd); } -@@ -387,8 +432,9 @@ +@@ -461,8 +506,9 @@ { int error; struct nameidata nd; @@ -1199,7 +1199,7 @@ Index: linux-2.4.21/fs/open.c if (error) goto out; -@@ -399,6 +445,7 @@ +@@ -473,6 +519,7 @@ set_fs_pwd(current->fs, nd.mnt, nd.dentry); dput_and_out: @@ -1207,7 +1207,7 @@ Index: linux-2.4.21/fs/open.c path_release(&nd); out: return error; -@@ -438,9 +485,10 @@ +@@ -512,9 +559,10 @@ { int error; struct nameidata nd; @@ -1220,7 +1220,7 @@ Index: linux-2.4.21/fs/open.c if (error) goto out; -@@ -456,39 +504,56 @@ +@@ -530,39 +578,56 @@ set_fs_altroot(); error = 0; dput_and_out: @@ -1291,7 +1291,7 @@ Index: linux-2.4.21/fs/open.c fput(file); out: return err; -@@ -497,30 +562,14 @@ +@@ -571,30 +636,14 @@ asmlinkage long sys_chmod(const char * filename, mode_t mode) { struct nameidata nd; @@ -1307,23 +1307,23 @@ Index: linux-2.4.21/fs/open.c - error = -EROFS; - if (IS_RDONLY(inode)) - goto dput_and_out; - +- - error = -EPERM; - if (IS_IMMUTABLE(inode) || IS_APPEND(inode)) - goto dput_and_out; -+ error = chmod_common(nd.dentry, mode); - if (mode == (mode_t) -1) - mode = inode->i_mode; - newattrs.ia_mode = (mode & S_IALLUGO) | (inode->i_mode & ~S_IALLUGO); - newattrs.ia_valid = ATTR_MODE | ATTR_CTIME; - error = notify_change(nd.dentry, &newattrs); -- ++ error = chmod_common(nd.dentry, mode); + -dput_and_out: path_release(&nd); out: return error; -@@ -540,6 +589,20 @@ +@@ -614,6 +663,20 @@ error = -EROFS; if (IS_RDONLY(inode)) goto out; @@ -1344,7 +1344,7 @@ Index: linux-2.4.21/fs/open.c error = -EPERM; if (IS_IMMUTABLE(inode) || IS_APPEND(inode)) goto out; -@@ -644,6 +707,7 @@ +@@ -718,6 +781,7 @@ { int namei_flags, error; struct nameidata nd; @@ -1352,7 +1352,7 @@ Index: linux-2.4.21/fs/open.c namei_flags = flags; if ((namei_flags+1) & O_ACCMODE) -@@ -651,14 +715,15 @@ +@@ -725,14 +789,15 @@ if (namei_flags & O_TRUNC) namei_flags |= 2; @@ -1373,7 +1373,7 @@ Index: linux-2.4.21/fs/open.c { struct file * f; struct inode *inode; -@@ -695,7 +760,9 @@ +@@ -769,7 +834,9 @@ } if (f->f_op && f->f_op->open) { @@ -1383,7 +1383,7 @@ Index: linux-2.4.21/fs/open.c if (error) goto cleanup_all; } -@@ -711,6 +778,7 @@ +@@ -785,6 +852,7 @@ } } @@ -1391,7 +1391,7 @@ Index: linux-2.4.21/fs/open.c return f; cleanup_all: -@@ -725,11 +793,17 @@ +@@ -799,11 +867,17 @@ cleanup_file: put_filp(f); cleanup_dentry: @@ -1411,8 +1411,8 @@ Index: linux-2.4.21/fs/open.c */ Index: linux-2.4.21/fs/stat.c =================================================================== ---- linux-2.4.21.orig/fs/stat.c 2004-09-11 10:16:30.000000000 -0400 -+++ linux-2.4.21/fs/stat.c 2004-09-16 19:38:49.000000000 -0400 +--- linux-2.4.21.orig/fs/stat.c 2005-06-01 22:51:55.000000000 -0400 ++++ linux-2.4.21/fs/stat.c 2005-06-01 22:58:09.051062920 -0400 @@ -17,10 +17,12 @@ * Revalidate the inode. This is required for proper NFS attribute caching. */ @@ -1580,8 +1580,8 @@ Index: linux-2.4.21/fs/stat.c fput(f); Index: linux-2.4.21/include/linux/dcache.h =================================================================== ---- linux-2.4.21.orig/include/linux/dcache.h 2004-09-11 10:16:39.000000000 -0400 -+++ linux-2.4.21/include/linux/dcache.h 2004-09-16 19:32:11.000000000 -0400 +--- linux-2.4.21.orig/include/linux/dcache.h 2005-06-01 22:52:05.000000000 -0400 ++++ linux-2.4.21/include/linux/dcache.h 2005-06-01 22:58:09.051062920 -0400 @@ -6,6 +6,51 @@ #include #include @@ -1667,8 +1667,8 @@ Index: linux-2.4.21/include/linux/dcache.h Index: linux-2.4.21/include/linux/fs.h =================================================================== ---- linux-2.4.21.orig/include/linux/fs.h 2004-09-16 19:21:00.000000000 -0400 -+++ linux-2.4.21/include/linux/fs.h 2004-09-16 19:32:11.000000000 -0400 +--- linux-2.4.21.orig/include/linux/fs.h 2005-06-01 22:57:59.887456000 -0400 ++++ linux-2.4.21/include/linux/fs.h 2005-06-01 22:58:09.053062616 -0400 @@ -73,6 +73,7 @@ #define FMODE_READ 1 @@ -1677,7 +1677,7 @@ Index: linux-2.4.21/include/linux/fs.h #define READ 0 #define WRITE 1 -@@ -362,6 +363,9 @@ +@@ -365,6 +366,9 @@ #define ATTR_MTIME_SET 256 #define ATTR_FORCE 512 /* Not a change, but a change it */ #define ATTR_ATTR_FLAG 1024 @@ -1687,7 +1687,7 @@ Index: linux-2.4.21/include/linux/fs.h /* * This is the Inode Attributes structure, used for notify_change(). It -@@ -499,6 +503,7 @@ +@@ -502,6 +506,7 @@ struct pipe_inode_info *i_pipe; struct block_device *i_bdev; struct char_device *i_cdev; @@ -1695,7 +1695,7 @@ Index: linux-2.4.21/include/linux/fs.h unsigned long i_dnotify_mask; /* Directory notify events */ struct dnotify_struct *i_dnotify; /* for directory notifications */ -@@ -601,6 +606,7 @@ +@@ -604,6 +609,7 @@ /* needed for tty driver, and maybe others */ void *private_data; @@ -1703,7 +1703,7 @@ Index: linux-2.4.21/include/linux/fs.h /* preallocated helper kiobuf to speedup O_DIRECT */ struct kiobuf *f_iobuf; -@@ -729,6 +735,7 @@ +@@ -736,6 +742,7 @@ struct qstr last; unsigned int flags; int last_type; @@ -1711,7 +1711,7 @@ Index: linux-2.4.21/include/linux/fs.h }; /* -@@ -849,7 +856,8 @@ +@@ -856,7 +863,8 @@ extern int vfs_link(struct dentry *, struct inode *, struct dentry *); extern int vfs_rmdir(struct inode *, struct dentry *); extern int vfs_unlink(struct inode *, struct dentry *); @@ -1721,7 +1721,7 @@ Index: linux-2.4.21/include/linux/fs.h /* * File types -@@ -928,21 +936,32 @@ +@@ -935,21 +943,32 @@ struct inode_operations { int (*create) (struct inode *,struct dentry *,int); @@ -1754,7 +1754,7 @@ Index: linux-2.4.21/include/linux/fs.h int (*getattr) (struct dentry *, struct iattr *); int (*setxattr) (struct dentry *, const char *, const void *, size_t, int); ssize_t (*getxattr) (struct dentry *, const char *, void *, size_t); -@@ -1139,10 +1158,14 @@ +@@ -1151,10 +1170,14 @@ asmlinkage long sys_open(const char *, int, int); asmlinkage long sys_close(unsigned int); /* yes, it's really unsigned */ @@ -1770,7 +1770,7 @@ Index: linux-2.4.21/include/linux/fs.h extern int filp_close(struct file *, fl_owner_t id); extern char * getname(const char *); -@@ -1434,6 +1457,7 @@ +@@ -1446,6 +1469,7 @@ extern loff_t default_llseek(struct file *file, loff_t offset, int origin); extern int FASTCALL(__user_walk(const char *, unsigned, struct nameidata *)); @@ -1778,7 +1778,7 @@ Index: linux-2.4.21/include/linux/fs.h extern int FASTCALL(path_init(const char *, unsigned, struct nameidata *)); extern int FASTCALL(path_walk(const char *, struct nameidata *)); extern int FASTCALL(path_lookup(const char *, unsigned, struct nameidata *)); -@@ -1445,6 +1469,8 @@ +@@ -1457,6 +1481,8 @@ extern struct dentry * lookup_hash(struct qstr *, struct dentry *); #define user_path_walk(name,nd) __user_walk(name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, nd) #define user_path_walk_link(name,nd) __user_walk(name, LOOKUP_POSITIVE, nd) @@ -1787,7 +1787,7 @@ Index: linux-2.4.21/include/linux/fs.h extern void inode_init_once(struct inode *); extern void iput(struct inode *); -@@ -1609,6 +1635,8 @@ +@@ -1625,6 +1651,8 @@ extern int vfs_readlink(struct dentry *, char *, int, const char *); extern int vfs_follow_link(struct nameidata *, const char *); @@ -1798,8 +1798,8 @@ Index: linux-2.4.21/include/linux/fs.h extern struct inode_operations page_symlink_inode_operations; Index: linux-2.4.21/include/linux/fs_struct.h =================================================================== ---- linux-2.4.21.orig/include/linux/fs_struct.h 2004-09-11 10:16:14.000000000 -0400 -+++ linux-2.4.21/include/linux/fs_struct.h 2004-09-16 19:32:11.000000000 -0400 +--- linux-2.4.21.orig/include/linux/fs_struct.h 2005-06-01 22:51:40.000000000 -0400 ++++ linux-2.4.21/include/linux/fs_struct.h 2005-06-01 22:58:09.054062464 -0400 @@ -37,10 +37,12 @@ write_lock(&fs->lock); old_root = fs->root; @@ -1828,8 +1828,8 @@ Index: linux-2.4.21/include/linux/fs_struct.h } Index: linux-2.4.21/kernel/exit.c =================================================================== ---- linux-2.4.21.orig/kernel/exit.c 2004-09-11 10:16:35.000000000 -0400 -+++ linux-2.4.21/kernel/exit.c 2004-09-16 19:32:11.000000000 -0400 +--- linux-2.4.21.orig/kernel/exit.c 2005-06-01 22:52:04.000000000 -0400 ++++ linux-2.4.21/kernel/exit.c 2005-06-01 22:58:09.055062312 -0400 @@ -367,11 +367,14 @@ { /* No need to hold fs->lock if we are killing it */ @@ -1847,9 +1847,9 @@ Index: linux-2.4.21/kernel/exit.c } Index: linux-2.4.21/kernel/fork.c =================================================================== ---- linux-2.4.21.orig/kernel/fork.c 2004-09-11 10:16:39.000000000 -0400 -+++ linux-2.4.21/kernel/fork.c 2004-09-16 19:32:11.000000000 -0400 -@@ -472,10 +472,13 @@ +--- linux-2.4.21.orig/kernel/fork.c 2005-06-01 22:52:05.000000000 -0400 ++++ linux-2.4.21/kernel/fork.c 2005-06-01 22:58:09.055062312 -0400 +@@ -473,10 +473,13 @@ fs->umask = old->umask; read_lock(&old->lock); fs->rootmnt = mntget(old->rootmnt); @@ -1865,9 +1865,9 @@ Index: linux-2.4.21/kernel/fork.c } else { Index: linux-2.4.21/kernel/ksyms.c =================================================================== ---- linux-2.4.21.orig/kernel/ksyms.c 2004-09-16 19:21:00.000000000 -0400 -+++ linux-2.4.21/kernel/ksyms.c 2004-09-16 19:32:11.000000000 -0400 -@@ -317,6 +317,7 @@ +--- linux-2.4.21.orig/kernel/ksyms.c 2005-06-01 22:57:59.891455392 -0400 ++++ linux-2.4.21/kernel/ksyms.c 2005-06-01 22:58:09.056062160 -0400 +@@ -318,6 +318,7 @@ EXPORT_SYMBOL(set_page_dirty); EXPORT_SYMBOL(vfs_readlink); EXPORT_SYMBOL(vfs_follow_link); diff --git a/lustre/kernel_patches/series/rhel-2.4.21 b/lustre/kernel_patches/series/rhel-2.4.21 index adbed63..2482df4 100644 --- a/lustre/kernel_patches/series/rhel-2.4.21 +++ b/lustre/kernel_patches/series/rhel-2.4.21 @@ -29,14 +29,13 @@ ext3-raw-lookup.patch nfs_export_kernel-2.4.21-chaos.patch ext3-ea-in-inode-2.4.21-chaos.patch listman-2.4.21-chaos.patch -ext3-xattr-ptr-arith-fix.patch pagecache-lock-2.4.21-chaos.patch ext3-truncate-buffer-head.patch inode-max-readahead-2.4.24.patch dcache_refcount_debug.patch ext3-extents-2.4.21-chaos.patch ext3-extents-asyncdel-2.4.21-chaos.patch -blkdev_tunables-2.4.21-chaos.patch +blkdev_tunables-2.4.21-chaos.patch small_scatterlist-2.4.21-rhel.patch ext3-nlinks-2.4.21-chaos.patch sd_iostats-2.4.21-chaos.patch @@ -46,6 +45,8 @@ export-show_task-2.4-rhel.patch compile-fixes-2.4.21-rhel.patch grab_cache_page_nowait_gfp-rh-2.4.patch remove-suid-2.4-rhel.patch -qsnet-rhel-2.4.patch +qsnet-rhel-2.4.patch +nfs_statfs-toomanyfiles-rhel-2.4.patch +statfs64-cast-unsigned-2.4-rhel.patch fsprivate-2.4.patch nfsd_iallocsem.patch diff --git a/lustre/kernel_patches/targets/rhel-2.4.target.in b/lustre/kernel_patches/targets/rhel-2.4.target.in index d578029..8982d8f 100644 --- a/lustre/kernel_patches/targets/rhel-2.4.target.in +++ b/lustre/kernel_patches/targets/rhel-2.4.target.in @@ -1,5 +1,5 @@ lnxmaj="2.4.21" -lnxrel="27.0.4.EL" +lnxrel="32.0.1.EL" KERNEL=linux-${lnxmaj}-${lnxrel}.tar.bz2 SERIES=rhel-2.4.21 @@ -15,7 +15,7 @@ JENSEN_ARCHS="" SMP_ARCHS="i686 x86_64 ia64" UP_ARCHS="" -# the modules in this kernel do not build with gcc 3.3 or 2.96 +# the modules in this kernel do not build with gcc 4, 3.4, or 2.96 for cc in gcc32 gcc33 ; do if which $cc >/dev/null 2>/dev/null ; then export CC=$cc diff --git a/lustre/lvfs/lvfs_linux.c b/lustre/lvfs/lvfs_linux.c index 19268e6..52f0f0d 100644 --- a/lustre/lvfs/lvfs_linux.c +++ b/lustre/lvfs/lvfs_linux.c @@ -392,6 +392,16 @@ EXPORT_SYMBOL(l_readdir); EXPORT_SYMBOL(obd_memory); EXPORT_SYMBOL(obd_memmax); +#ifdef HAVE_OLD_DEV_SET_RDONLY +void dev_set_rdonly(lvfs_sbdev_type dev, int no_write); +void dev_clear_rdonly(int no_write); +int dev_check_rdonly(lvfs_sbdev_type dev); +#elif !defined(HAVE_CLEAR_RDONLY_ON_PUT) +void dev_set_rdonly(lvfs_sbdev_type dev); +void dev_clear_rdonly(lvfs_sbdev_type dev); +int dev_check_rdonly(lvfs_sbdev_type dev); +#endif + void lvfs_set_rdonly(lvfs_sbdev_type dev) { CDEBUG(D_IOCTL | D_HA, "set dev %lx rdonly\n", (long)dev); diff --git a/lustre/obdclass/class_obd.c b/lustre/obdclass/class_obd.c index 9e473b4..71f6c8d 100644 --- a/lustre/obdclass/class_obd.c +++ b/lustre/obdclass/class_obd.c @@ -448,11 +448,51 @@ int obd_proc_read_pinger(char *page, char **start, off_t off, int count, ); } +static int obd_proc_read_health(char *page, char **start, off_t off, + int count, int *eof, void *data) +{ + int rc = 0; //, i; + *eof = 1; + + if (portals_catastrophe) + rc += snprintf(page + rc, count - rc, "LBUG\n"); + +#if 0 + spin_lock(&obd_dev_lock); + for (i = 0; i < MAX_OBD_DEVICES; i++) { + struct obd_device *obd; + + obd = &obd_dev[i]; + if (obd->obd_type == NULL) + continue; + + atomic_inc(&obd->obd_refcount); + spin_unlock(&obd_dev_lock); + + if (obd_health_check(obd)) { + rc += snprintf(page + rc, count - rc, + "device %s reported unhealthy\n", + obd->obd_name); + } + class_decref(obd); + spin_lock(&obd_dev_lock); + } + spin_unlock(&obd_dev_lock); +#endif + + if (rc == 0) + return snprintf(page, count, "healthy\n"); + + rc += snprintf(page + rc, count - rc, "NOT HEALTHY\n"); + return rc; +} + /* Root for /proc/fs/lustre */ struct lprocfs_vars lprocfs_base[] = { { "version", obd_proc_read_version, NULL, NULL }, { "kernel_version", obd_proc_read_kernel_version, NULL, NULL }, { "pinger", obd_proc_read_pinger, NULL, NULL }, + { "health_check", obd_proc_read_health, NULL, NULL }, { 0 } }; #else diff --git a/lustre/obdfilter/filter.c b/lustre/obdfilter/filter.c index e1a1a0c..93d4996 100644 --- a/lustre/obdfilter/filter.c +++ b/lustre/obdfilter/filter.c @@ -1198,7 +1198,7 @@ static int filter_intent_policy(struct ldlm_namespace *ns, /* mount the file system (secretly) */ int filter_common_setup(struct obd_device *obd, obd_count len, void *buf, - char *option) + void *option) { struct lustre_cfg* lcfg = buf; struct filter_obd *filter = &obd->u.filter; @@ -1217,8 +1217,8 @@ int filter_common_setup(struct obd_device *obd, obd_count len, void *buf, if (IS_ERR(obd->obd_fsops)) RETURN(PTR_ERR(obd->obd_fsops)); - mnt = do_kern_mount(lustre_cfg_string(lcfg, 2), MS_NOATIME | MS_NODIRATIME, - lustre_cfg_string(lcfg, 1), (void *)option); + mnt = do_kern_mount(lustre_cfg_string(lcfg, 2),MS_NOATIME|MS_NODIRATIME, + lustre_cfg_string(lcfg, 1), option); rc = PTR_ERR(mnt); if (IS_ERR(mnt)) GOTO(err_ops, rc); @@ -1344,12 +1344,21 @@ static int filter_setup(struct obd_device *obd, obd_count len, void *buf) { struct lprocfs_static_vars lvars; struct lustre_cfg* lcfg = buf; + unsigned long page; int rc; if (!LUSTRE_CFG_BUFLEN(lcfg, 1) || !LUSTRE_CFG_BUFLEN(lcfg, 2)) RETURN(-EINVAL); - rc = filter_common_setup(obd, len, buf, lustre_cfg_buf(lcfg, 4)); + /* 2.6.9 selinux wants a full option page for do_kern_mount (bug6471) */ + page = get_zeroed_page(GFP_KERNEL); + if (!page) + RETURN(-ENOMEM); + + memcpy((void *)page, lustre_cfg_buf(lcfg, 4), + LUSTRE_CFG_BUFLEN(lcfg, 4)); + rc = filter_common_setup(obd, len, buf, (void *)page); + free_page(page); lprocfs_init_vars(filter, &lvars); if (rc == 0 && lprocfs_obd_setup(obd, lvars.obd_vars) == 0 && diff --git a/lustre/obdfilter/filter_internal.h b/lustre/obdfilter/filter_internal.h index 63ec838..05419a1 100644 --- a/lustre/obdfilter/filter_internal.h +++ b/lustre/obdfilter/filter_internal.h @@ -110,7 +110,7 @@ int filter_update_server_data(struct obd_device *, struct file *, struct filter_server_data *, int force_sync); int filter_update_last_objid(struct obd_device *, obd_gr, int force_sync); int filter_common_setup(struct obd_device *, obd_count len, void *buf, - char *option); + void *option); int filter_destroy(struct obd_export *exp, struct obdo *oa, struct lov_stripe_md *md, struct obd_trans_info *); int filter_setattr(struct obd_export *exp, struct obdo *oa, diff --git a/lustre/obdfilter/filter_san.c b/lustre/obdfilter/filter_san.c index 4b1e14d..0340d6b 100644 --- a/lustre/obdfilter/filter_san.c +++ b/lustre/obdfilter/filter_san.c @@ -38,20 +38,29 @@ int filter_san_setup(struct obd_device *obd, obd_count len, void *buf) { struct lustre_cfg* lcfg = buf; - char *option = NULL; + unsigned long page; + int rc; if (lcfg->lcfg_bufcount < 3 || LUSTRE_CFG_BUFLEN(lcfg, 2) < 1) RETURN(-EINVAL); + /* 2.6.9 selinux wants a full option page for do_kern_mount (bug6471) */ + page = get_zeroed_page(GFP_KERNEL); + if (!page) + RETURN(-ENOMEM); + /* for extN/ext3 filesystem, we must mount it with 'writeback' mode */ if (!strcmp(lustre_cfg_string(lcfg, 2), "ldiskfs")) - option = "data=writeback"; + strcpy((void *)page, "data=writeback"); else if (!strcmp(lustre_cfg_string(lcfg, 2), "ext3")) - option = "data=writeback,asyncdel"; + strcpy((void *)page, "data=writeback,asyncdel"); else LBUG(); /* just a reminder */ - return filter_common_setup(obd, len, buf, option); + rc = filter_common_setup(obd, len, buf, (void *)page); + free_page(page); + + return rc; } int filter_san_preprw(int cmd, struct obd_export *exp, struct obdo *oa, diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh index 184b18c..2e2e477 100644 --- a/lustre/tests/test-framework.sh +++ b/lustre/tests/test-framework.sh @@ -309,10 +309,9 @@ change_active() { do_node() { HOST=$1 shift - if $VERBOSE; then - echo "CMD: $HOST $@" - $PDSH $HOST $LCTL mark "$@" > /dev/null 2>&1 || : + echo "CMD: $HOST $@" + $PDSH $HOST $LCTL mark "$@" > /dev/null 2>&1 || : fi $PDSH $HOST "(PATH=\$PATH:$RLUSTRE/utils:$RLUSTRE/tests; cd $RPWD; sh -c \"$@\")" } @@ -433,55 +432,55 @@ absolute_path() { drop_request() { # OBD_FAIL_MDS_ALL_REQUEST_NET RC=0 - do_facet mds "echo 0x123 > /proc/sys/lustre/fail_loc" + do_facet mds sysctl -w lustre.fail_loc=0x123 do_facet client "$1" || RC=$? - do_facet mds "echo 0 > /proc/sys/lustre/fail_loc" + do_facet mds sysctl -w lustre.fail_loc=0 return $RC } drop_reply() { # OBD_FAIL_MDS_ALL_REPLY_NET RC=0 - do_facet mds "echo 0x122 > /proc/sys/lustre/fail_loc" + do_facet mds sysctl -w lustre.fail_loc=0x122 do_facet client "$@" || RC=$? - do_facet mds "echo 0 > /proc/sys/lustre/fail_loc" + do_facet mds sysctl -w lustre.fail_loc=0 return $RC } drop_reint_reply() { # OBD_FAIL_MDS_REINT_NET_REP RC=0 - do_facet mds "echo 0x119 > /proc/sys/lustre/fail_loc" + do_facet mds sysctl -w lustre.fail_loc=0x119 do_facet client "$@" || RC=$? - do_facet mds "echo 0 > /proc/sys/lustre/fail_loc" + do_facet mds sysctl -w lustre.fail_loc=0 return $RC } pause_bulk() { #define OBD_FAIL_OST_BRW_PAUSE_BULK 0x214 RC=0 - do_facet ost "echo 0x214 > /proc/sys/lustre/fail_loc" + do_facet ost sysctl -w lustre.fail_loc=0x214 do_facet client "$1" || RC=$? do_facet client "sync" - do_facet ost "echo 0 > /proc/sys/lustre/fail_loc" + do_facet ost sysctl -w lustre.fail_loc=0 return $RC } drop_ldlm_cancel() { #define OBD_FAIL_LDLM_CANCEL 0x304 RC=0 - do_facet client "echo 0x304 > /proc/sys/lustre/fail_loc" + do_facet client sysctl -w lustre.fail_loc=0x304 do_facet client "$@" || RC=$? - do_facet client "echo 0 > /proc/sys/lustre/fail_loc" + do_facet client sysctl -w lustre.fail_loc=0 return $RC } drop_bl_callback() { #define OBD_FAIL_LDLM_BL_CALLBACK 0x305 RC=0 - do_facet client "echo 0x305 > /proc/sys/lustre/fail_loc" + do_facet client sysctl -w lustre.fail_loc=0x305 do_facet client "$@" || RC=$? - do_facet client "echo 0 > /proc/sys/lustre/fail_loc" + do_facet client sysctl -w lustre.fail_loc=0 return $RC } -- 1.8.3.1