diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 27e6f5e01a18c4e11fbf1bac957d3664c38b202a..2cdfe8290461e0c023d2e4d8ba018491732bfba1 100644
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -3,7 +3,7 @@ tbd Cluster File Systems, Inc. <info@clusterfs.com>
* Support for kernels:
2.4.21-47.0.1.EL (RHEL 3)
2.6.5-7.283 (SLES 9)
- 2.6.9-42.0.10.EL (RHEL 4)
+ 2.6.9-55.EL (RHEL 4)
2.6.12.6 vanilla (kernel.org)
2.6.16.27-0.9 (SLES 10)
* Client support for unpatched kernels:
@@ -14,6 +14,26 @@ tbd Cluster File Systems, Inc. <info@clusterfs.com>
* Note that reiserfs quotas are disabled on SLES 10 in this kernel.
* bug fixes
+Severity : normal
+Frequency : only for i686
+Bugzilla : 12695
+Description: 1.4.11 RC1 build fails for RHEL 4, i686
+Details : Fixed config variable for build.
+
+Severity : normal
+Frequency : rare
+Bugzilla : 12415
+Description: Updated patchess for new RHEL4 kernel
+Details : Updated patch inode-nr_unused-2.6.9-rhel4.patch
+ Updated patch jbd-stats-2.6.9.patch
+ Updated patch qsnet-rhel4-2.6.patch
+ Updated patch quota-deadlock-on-pagelock-core.patch
+ Updated patch vfs_intent-2.6-rhel4.patch
+ Updated patch vfs_races-2.6-rhel4.patch
+ Updated series file 2.6-rhel4-titech.series
+ Updated series file 2.6-rhel4.series
+ Updated kernel config files
+
Severity : normal
Frequency : when qunit size is too small(less than 20M)
Bugzilla : 12588
diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-i686-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-i686-smp.config
index a74b21ab5f8c723ac3dff9ac42a01554e3be6d8a..ab89ad2709b18d10120847121e122fd607beab21 100644
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-i686-smp.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-i686-smp.config
@@ -128,6 +128,7 @@ CONFIG_I8K=m
CONFIG_MICROCODE=m
CONFIG_X86_MSR=m
CONFIG_X86_CPUID=m
+# CONFIG_HOTPLUG_CPU is not set
#
# Firmware Drivers
@@ -227,7 +228,7 @@ CONFIG_X86_P4_CLOCKMOD=m
CONFIG_X86_SPEEDSTEP_LIB=y
# CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK is not set
CONFIG_X86_LONGRUN=y
-CONFIG_X86_LONGHAUL=y
+# CONFIG_X86_LONGHAUL is not set
#
# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
@@ -571,23 +572,6 @@ CONFIG_MEGARAID_NEWGEN=y
CONFIG_MEGARAID_MM=m
CONFIG_MEGARAID_MAILBOX=m
CONFIG_MEGARAID_SAS=m
-CONFIG_SCSI_SATA=y
-CONFIG_SCSI_SATA_AHCI=m
-CONFIG_SCSI_SATA_SVW=m
-CONFIG_SCSI_ATA_PIIX=m
-CONFIG_SCSI_SATA_MV=m
-CONFIG_SCSI_SATA_NV=m
-CONFIG_SCSI_PDC_ADMA=m
-CONFIG_SCSI_SATA_QSTOR=m
-CONFIG_SCSI_SATA_PROMISE=m
-CONFIG_SCSI_SATA_SX4=m
-CONFIG_SCSI_SATA_SIL=m
-CONFIG_SCSI_SATA_SIL24=m
-CONFIG_SCSI_SATA_SIS=m
-CONFIG_SCSI_SATA_ULI=m
-CONFIG_SCSI_SATA_VIA=m
-CONFIG_SCSI_SATA_VITESSE=m
-CONFIG_SCSI_SATA_INTEL_COMBINED=y
# CONFIG_SCSI_BUSLOGIC is not set
# CONFIG_SCSI_DMX3191D is not set
# CONFIG_SCSI_DTC3280 is not set
@@ -628,6 +612,8 @@ CONFIG_SCSI_QLA2300=m
CONFIG_SCSI_QLA2322=m
CONFIG_SCSI_QLA6312=m
CONFIG_SCSI_QLA24XX=m
+CONFIG_QLA3XXX=m
+CONFIG_SCSI_QLA4XXX=m
# CONFIG_SCSI_SYM53C416 is not set
# CONFIG_SCSI_DC395x is not set
# CONFIG_SCSI_DC390T is not set
@@ -646,6 +632,27 @@ CONFIG_PCMCIA_FDOMAIN=m
# CONFIG_PCMCIA_QLOGIC is not set
# CONFIG_PCMCIA_SYM53C500 is not set
+#
+# Serial ATA (prod) and Parallel ATA (experimental) drivers
+#
+CONFIG_ATA=y
+CONFIG_SATA_AHCI=m
+CONFIG_SATA_SVW=m
+CONFIG_ATA_PIIX=m
+CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_PDC_ADMA=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_SX4=m
+CONFIG_SATA_SIL=m
+CONFIG_SATA_SIL24=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
+CONFIG_SATA_INTEL_COMBINED=y
+
#
# Old CD-ROM drivers (not SCSI, not IDE)
#
@@ -1521,7 +1528,7 @@ CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_SERIAL_8250_CS=m
# CONFIG_SERIAL_8250_ACPI is not set
-CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_NR_UARTS=64
CONFIG_SERIAL_8250_EXTENDED=y
# CONFIG_SERIAL_8250_MANY_PORTS is not set
CONFIG_SERIAL_8250_SHARE_IRQ=y
@@ -1726,6 +1733,7 @@ CONFIG_HWMON=m
CONFIG_HWMON_VID=m
CONFIG_SENSORS_ADM1026=m
CONFIG_SENSORS_LM87=m
+CONFIG_SENSORS_SMSC47B397=m
# CONFIG_HWMON_DEBUG_CHIP is not set
#
@@ -2171,8 +2179,9 @@ CONFIG_INFINIBAND_SDP=m
# CONFIG_INFINIBAND_SDP_DEBUG is not set
CONFIG_INFINIBAND_SRP=m
# CONFIG_INFINIBAND_ISER is not set
-CONFIG_INFINIBAND_RDS=m
+# CONFIG_INFINIBAND_RDS
# CONFIG_INFINIBAND_RDS_DEBUG is not set
+CONFIG_INFINIBAND_MADEYE=m
#
# EDAC - error detection and reporting (RAS)
@@ -2191,6 +2200,7 @@ CONFIG_EDAC_I82875P=m
CONFIG_EDAC_I82860=m
CONFIG_EDAC_R82600=m
CONFIG_EDAC_POLL=y
+CONFIG_EDAC_K8=m
#
# File systems
@@ -2290,7 +2300,7 @@ CONFIG_NFS_V3_ACL=y
CONFIG_NFS_V4=y
CONFIG_NFS_DIRECTIO=y
CONFIG_NFSD=m
-CONFIG_NFSD_V2_ACL=y
+# CONFIG_NFSD_V2_ACL is not set
CONFIG_NFSD_V3=y
CONFIG_NFSD_V3_ACL=y
CONFIG_NFSD_V4=y
diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-i686.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-i686.config
index bcd56a08932425147e5c4735192a4c321b2ed8b5..bdd4563190b93a7b66145bef1b6f37e786136ebc 100644
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-i686.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-i686.config
@@ -121,6 +121,7 @@ CONFIG_I8K=m
CONFIG_MICROCODE=m
CONFIG_X86_MSR=m
CONFIG_X86_CPUID=m
+# CONFIG_HOTPLUG_CPU is not set
#
# Firmware Drivers
@@ -216,7 +217,7 @@ CONFIG_X86_P4_CLOCKMOD=m
CONFIG_X86_SPEEDSTEP_LIB=y
# CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK is not set
CONFIG_X86_LONGRUN=y
-CONFIG_X86_LONGHAUL=y
+# CONFIG_X86_LONGHAUL is not set
#
# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
@@ -558,23 +559,6 @@ CONFIG_MEGARAID_NEWGEN=y
CONFIG_MEGARAID_MM=m
CONFIG_MEGARAID_MAILBOX=m
CONFIG_MEGARAID_SAS=m
-CONFIG_SCSI_SATA=y
-CONFIG_SCSI_SATA_AHCI=m
-CONFIG_SCSI_SATA_SVW=m
-CONFIG_SCSI_ATA_PIIX=m
-CONFIG_SCSI_SATA_MV=m
-CONFIG_SCSI_SATA_NV=m
-CONFIG_SCSI_PDC_ADMA=m
-CONFIG_SCSI_SATA_QSTOR=m
-CONFIG_SCSI_SATA_PROMISE=m
-CONFIG_SCSI_SATA_SX4=m
-CONFIG_SCSI_SATA_SIL=m
-CONFIG_SCSI_SATA_SIL24=m
-CONFIG_SCSI_SATA_SIS=m
-CONFIG_SCSI_SATA_ULI=m
-CONFIG_SCSI_SATA_VIA=m
-CONFIG_SCSI_SATA_VITESSE=m
-CONFIG_SCSI_SATA_INTEL_COMBINED=y
# CONFIG_SCSI_BUSLOGIC is not set
# CONFIG_SCSI_DMX3191D is not set
# CONFIG_SCSI_DTC3280 is not set
@@ -615,6 +599,8 @@ CONFIG_SCSI_QLA2300=m
CONFIG_SCSI_QLA2322=m
CONFIG_SCSI_QLA6312=m
CONFIG_SCSI_QLA24XX=m
+CONFIG_QLA3XXX=m
+CONFIG_SCSI_QLA4XXX=m
# CONFIG_SCSI_SYM53C416 is not set
# CONFIG_SCSI_DC395x is not set
# CONFIG_SCSI_DC390T is not set
@@ -633,6 +619,27 @@ CONFIG_PCMCIA_FDOMAIN=m
# CONFIG_PCMCIA_QLOGIC is not set
# CONFIG_PCMCIA_SYM53C500 is not set
+#
+# Serial ATA (prod) and Parallel ATA (experimental) drivers
+#
+CONFIG_ATA=y
+CONFIG_SATA_AHCI=m
+CONFIG_SATA_SVW=m
+CONFIG_ATA_PIIX=m
+CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_PDC_ADMA=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_SX4=m
+CONFIG_SATA_SIL=m
+CONFIG_SATA_SIL24=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
+CONFIG_SATA_INTEL_COMBINED=y
+
#
# Old CD-ROM drivers (not SCSI, not IDE)
#
@@ -1526,7 +1533,7 @@ CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_SERIAL_8250_CS=m
# CONFIG_SERIAL_8250_ACPI is not set
-CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_NR_UARTS=64
CONFIG_SERIAL_8250_EXTENDED=y
# CONFIG_SERIAL_8250_MANY_PORTS is not set
CONFIG_SERIAL_8250_SHARE_IRQ=y
@@ -1733,6 +1740,7 @@ CONFIG_HWMON=m
CONFIG_HWMON_VID=m
CONFIG_SENSORS_ADM1026=m
CONFIG_SENSORS_LM87=m
+CONFIG_SENSORS_SMSC47B397=m
# CONFIG_HWMON_DEBUG_CHIP is not set
#
@@ -2180,8 +2188,9 @@ CONFIG_INFINIBAND_SDP=m
# CONFIG_INFINIBAND_SDP_DEBUG is not set
CONFIG_INFINIBAND_SRP=m
# CONFIG_INFINIBAND_ISER is not set
-CONFIG_INFINIBAND_RDS=m
+# CONFIG_INFINIBAND_RDS
# CONFIG_INFINIBAND_RDS_DEBUG is not set
+CONFIG_INFINIBAND_MADEYE=m
#
# EDAC - error detection and reporting (RAS)
@@ -2200,6 +2209,7 @@ CONFIG_EDAC_I82875P=m
CONFIG_EDAC_I82860=m
CONFIG_EDAC_R82600=m
CONFIG_EDAC_POLL=y
+CONFIG_EDAC_K8=m
#
# File systems
@@ -2299,7 +2309,7 @@ CONFIG_NFS_V3_ACL=y
CONFIG_NFS_V4=y
CONFIG_NFS_DIRECTIO=y
CONFIG_NFSD=m
-CONFIG_NFSD_V2_ACL=y
+# CONFIG_NFSD_V2_ACL is not set
CONFIG_NFSD_V3=y
CONFIG_NFSD_V3_ACL=y
CONFIG_NFSD_V4=y
diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-ia64-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-ia64-smp.config
index 2672ec32aa0c2a5d7e910e9946ac2d574d8c2479..39926280b747f6af0924759f6480c40145a951e6 100644
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-ia64-smp.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-ia64-smp.config
@@ -93,6 +93,7 @@ CONFIG_PERFMON=y
CONFIG_IA64_PALINFO=y
CONFIG_IOPROC=y
CONFIG_PTRACK=y
+CONFIG_IA64_LOCAL_APIC_INFO_MOD=m
#
# Firmware Drivers
@@ -339,23 +340,6 @@ CONFIG_MEGARAID_NEWGEN=y
CONFIG_MEGARAID_MM=m
CONFIG_MEGARAID_MAILBOX=m
CONFIG_MEGARAID_SAS=m
-CONFIG_SCSI_SATA=y
-CONFIG_SCSI_SATA_AHCI=m
-CONFIG_SCSI_SATA_SVW=m
-CONFIG_SCSI_ATA_PIIX=m
-CONFIG_SCSI_SATA_MV=m
-CONFIG_SCSI_SATA_NV=m
-CONFIG_SCSI_PDC_ADMA=m
-CONFIG_SCSI_SATA_QSTOR=m
-CONFIG_SCSI_SATA_PROMISE=m
-CONFIG_SCSI_SATA_SX4=m
-CONFIG_SCSI_SATA_SIL=m
-CONFIG_SCSI_SATA_SIL24=m
-CONFIG_SCSI_SATA_SIS=m
-CONFIG_SCSI_SATA_ULI=m
-CONFIG_SCSI_SATA_VIA=m
-CONFIG_SCSI_SATA_VITESSE=m
-CONFIG_SCSI_SATA_INTEL_COMBINED=y
# CONFIG_SCSI_BUSLOGIC is not set
# CONFIG_SCSI_DMX3191D is not set
# CONFIG_SCSI_EATA is not set
@@ -389,6 +373,8 @@ CONFIG_SCSI_QLA2300=m
CONFIG_SCSI_QLA2322=m
CONFIG_SCSI_QLA6312=m
CONFIG_SCSI_QLA24XX=m
+CONFIG_QLA3XXX=m
+CONFIG_SCSI_QLA4XXX=m
# CONFIG_SCSI_DC395x is not set
# CONFIG_SCSI_DC390T is not set
# CONFIG_SCSI_DEBUG is not set
@@ -400,6 +386,27 @@ CONFIG_SCSI_QLA24XX=m
# CONFIG_PCMCIA_QLOGIC is not set
# CONFIG_PCMCIA_SYM53C500 is not set
+#
+# Serial ATA (prod) and Parallel ATA (experimental) drivers
+#
+CONFIG_ATA=y
+CONFIG_SATA_AHCI=m
+CONFIG_SATA_SVW=m
+CONFIG_ATA_PIIX=m
+CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_PDC_ADMA=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_SX4=m
+CONFIG_SATA_SIL=m
+CONFIG_SATA_SIL24=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
+CONFIG_SATA_INTEL_COMBINED=y
+
#
# Multi-device support (RAID and LVM)
#
@@ -1194,7 +1201,7 @@ CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_SERIAL_8250_CS=m
CONFIG_SERIAL_8250_ACPI=y
-CONFIG_SERIAL_8250_NR_UARTS=20
+CONFIG_SERIAL_8250_NR_UARTS=64
CONFIG_SERIAL_8250_EXTENDED=y
CONFIG_SERIAL_8250_SHARE_IRQ=y
CONFIG_SERIAL_8250_DETECT_IRQ=y
@@ -1361,6 +1368,7 @@ CONFIG_HWMON=m
CONFIG_HWMON_VID=m
CONFIG_SENSORS_ADM1026=m
CONFIG_SENSORS_LM87=m
+CONFIG_SENSORS_SMSC47B397=m
# CONFIG_HWMON_DEBUG_CHIP is not set
#
@@ -1757,8 +1765,8 @@ CONFIG_INFINIBAND_SDP=m
# CONFIG_INFINIBAND_SDP_DEBUG is not set
CONFIG_INFINIBAND_SRP=m
# CONFIG_INFINIBAND_ISER is not set
-CONFIG_INFINIBAND_RDS=m
# CONFIG_INFINIBAND_RDS_DEBUG is not set
+CONFIG_INFINIBAND_MADEYE=m
#
# EDAC - error detection and reporting (RAS)
@@ -1855,7 +1863,7 @@ CONFIG_NFS_V3_ACL=y
CONFIG_NFS_V4=y
CONFIG_NFS_DIRECTIO=y
CONFIG_NFSD=m
-CONFIG_NFSD_V2_ACL=y
+# CONFIG_NFSD_V2_ACL is not set
CONFIG_NFSD_V3=y
CONFIG_NFSD_V3_ACL=y
CONFIG_NFSD_V4=y
diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-ia64.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-ia64.config
index c27cc504e5bc9b89c553ec158afe634d18333050..eb5e7e5929000b5033f021452357f9e2bac06075 100644
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-ia64.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-ia64.config
@@ -93,6 +93,7 @@ CONFIG_PERFMON=y
CONFIG_IA64_PALINFO=y
CONFIG_IOPROC=y
CONFIG_PTRACK=y
+CONFIG_IA64_LOCAL_APIC_INFO_MOD=m
#
# Firmware Drivers
@@ -339,23 +340,6 @@ CONFIG_MEGARAID_NEWGEN=y
CONFIG_MEGARAID_MM=m
CONFIG_MEGARAID_MAILBOX=m
CONFIG_MEGARAID_SAS=m
-CONFIG_SCSI_SATA=y
-CONFIG_SCSI_SATA_AHCI=m
-CONFIG_SCSI_SATA_SVW=m
-CONFIG_SCSI_ATA_PIIX=m
-CONFIG_SCSI_SATA_MV=m
-CONFIG_SCSI_SATA_NV=m
-CONFIG_SCSI_PDC_ADMA=m
-CONFIG_SCSI_SATA_QSTOR=m
-CONFIG_SCSI_SATA_PROMISE=m
-CONFIG_SCSI_SATA_SX4=m
-CONFIG_SCSI_SATA_SIL=m
-CONFIG_SCSI_SATA_SIL24=m
-CONFIG_SCSI_SATA_SIS=m
-CONFIG_SCSI_SATA_ULI=m
-CONFIG_SCSI_SATA_VIA=m
-CONFIG_SCSI_SATA_VITESSE=m
-CONFIG_SCSI_SATA_INTEL_COMBINED=y
# CONFIG_SCSI_BUSLOGIC is not set
# CONFIG_SCSI_DMX3191D is not set
# CONFIG_SCSI_EATA is not set
@@ -389,6 +373,8 @@ CONFIG_SCSI_QLA2300=m
CONFIG_SCSI_QLA2322=m
CONFIG_SCSI_QLA6312=m
CONFIG_SCSI_QLA24XX=m
+CONFIG_QLA3XXX=m
+CONFIG_SCSI_QLA4XXX=m
# CONFIG_SCSI_DC395x is not set
# CONFIG_SCSI_DC390T is not set
# CONFIG_SCSI_DEBUG is not set
@@ -400,6 +386,27 @@ CONFIG_SCSI_QLA24XX=m
# CONFIG_PCMCIA_QLOGIC is not set
# CONFIG_PCMCIA_SYM53C500 is not set
+#
+# Serial ATA (prod) and Parallel ATA (experimental) drivers
+#
+CONFIG_ATA=y
+CONFIG_SATA_AHCI=m
+CONFIG_SATA_SVW=m
+CONFIG_ATA_PIIX=m
+CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_PDC_ADMA=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_SX4=m
+CONFIG_SATA_SIL=m
+CONFIG_SATA_SIL24=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
+CONFIG_SATA_INTEL_COMBINED=y
+
#
# Multi-device support (RAID and LVM)
#
@@ -1194,7 +1201,7 @@ CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_SERIAL_8250_CS=m
CONFIG_SERIAL_8250_ACPI=y
-CONFIG_SERIAL_8250_NR_UARTS=20
+CONFIG_SERIAL_8250_NR_UARTS=64
CONFIG_SERIAL_8250_EXTENDED=y
CONFIG_SERIAL_8250_SHARE_IRQ=y
CONFIG_SERIAL_8250_DETECT_IRQ=y
@@ -1361,6 +1368,7 @@ CONFIG_HWMON=y
CONFIG_HWMON_VID=m
CONFIG_SENSORS_ADM1026=m
CONFIG_SENSORS_LM87=m
+CONFIG_SENSORS_SMSC47B397=m
# CONFIG_HWMON_DEBUG_CHIP is not set
#
@@ -1757,8 +1765,8 @@ CONFIG_INFINIBAND_SDP=m
# CONFIG_INFINIBAND_SDP_DEBUG is not set
CONFIG_INFINIBAND_SRP=m
# CONFIG_INFINIBAND_ISER is not set
-CONFIG_INFINIBAND_RDS=m
# CONFIG_INFINIBAND_RDS_DEBUG is not set
+CONFIG_INFINIBAND_MADEYE=m
#
# EDAC - error detection and reporting (RAS)
@@ -1855,7 +1863,7 @@ CONFIG_NFS_V3_ACL=y
CONFIG_NFS_V4=y
CONFIG_NFS_DIRECTIO=y
CONFIG_NFSD=m
-CONFIG_NFSD_V2_ACL=y
+# CONFIG_NFSD_V2_ACL is not set
CONFIG_NFSD_V3=y
CONFIG_NFSD_V3_ACL=y
CONFIG_NFSD_V4=y
diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64-smp.config
index ea0569e42b8354f653c2f19eebb99b0cd4a53fba..f862c63d26b890026199c04824bdc4a502d274c1 100644
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64-smp.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64-smp.config
@@ -98,7 +98,8 @@ CONFIG_X86_MCE=y
CONFIG_X86_MCE_AMD=y
CONFIG_IOPROC=y
CONFIG_PTRACK=y
-
+# CONFIG_X86_64_XEN is not set
+
#
# Power management options
#
@@ -161,6 +162,7 @@ CONFIG_PCI=y
CONFIG_PCI_DIRECT=y
CONFIG_PCI_MMCONFIG=y
# CONFIG_UNORDERED_IO is not set
+# CONFIG_HOTPLUG_CPU is not set
CONFIG_PCI_MSI=y
CONFIG_PCI_LEGACY_PROC=y
# CONFIG_PCI_NAMES is not set
@@ -471,23 +473,6 @@ CONFIG_MEGARAID_NEWGEN=y
CONFIG_MEGARAID_MM=m
CONFIG_MEGARAID_MAILBOX=m
CONFIG_MEGARAID_SAS=m
-CONFIG_SCSI_SATA=y
-CONFIG_SCSI_SATA_AHCI=m
-CONFIG_SCSI_SATA_SVW=m
-CONFIG_SCSI_ATA_PIIX=m
-CONFIG_SCSI_SATA_MV=m
-CONFIG_SCSI_SATA_NV=m
-CONFIG_SCSI_PDC_ADMA=m
-CONFIG_SCSI_SATA_QSTOR=m
-CONFIG_SCSI_SATA_PROMISE=m
-CONFIG_SCSI_SATA_SX4=m
-CONFIG_SCSI_SATA_SIL=m
-CONFIG_SCSI_SATA_SIL24=m
-CONFIG_SCSI_SATA_SIS=m
-CONFIG_SCSI_SATA_ULI=m
-CONFIG_SCSI_SATA_VIA=m
-CONFIG_SCSI_SATA_VITESSE=m
-CONFIG_SCSI_SATA_INTEL_COMBINED=y
# CONFIG_SCSI_BUSLOGIC is not set
# CONFIG_SCSI_DMX3191D is not set
# CONFIG_SCSI_EATA is not set
@@ -521,6 +506,9 @@ CONFIG_SCSI_QLA2300=m
CONFIG_SCSI_QLA2322=m
CONFIG_SCSI_QLA6312=m
CONFIG_SCSI_QLA24XX=m
+CONFIG_QLA3XXX=m
+CONFIG_SCSI_QLA4XXX=m
+
# CONFIG_SCSI_DC395x is not set
# CONFIG_SCSI_DC390T is not set
# CONFIG_SCSI_DEBUG is not set
@@ -532,6 +520,28 @@ CONFIG_SCSI_QLA24XX=m
# CONFIG_PCMCIA_QLOGIC is not set
# CONFIG_PCMCIA_SYM53C500 is not set
+#
+# Serial ATA (prod) and Parallel ATA (experimental) drivers
+#
+CONFIG_ATA=y
+CONFIG_SATA_AHCI=m
+CONFIG_SATA_SVW=m
+CONFIG_ATA_PIIX=m
+CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_PDC_ADMA=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_SX4=m
+CONFIG_SATA_SIL=m
+CONFIG_SATA_SIL24=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
+CONFIG_SATA_INTEL_COMBINED=y
+
+
#
# Multi-device support (RAID and LVM)
#
@@ -1337,7 +1347,7 @@ CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_SERIAL_8250_CS=m
# CONFIG_SERIAL_8250_ACPI is not set
-CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_NR_UARTS=64
CONFIG_SERIAL_8250_EXTENDED=y
# CONFIG_SERIAL_8250_MANY_PORTS is not set
CONFIG_SERIAL_8250_SHARE_IRQ=y
@@ -1524,6 +1534,7 @@ CONFIG_HWMON=m
CONFIG_HWMON_VID=m
CONFIG_SENSORS_ADM1026=m
CONFIG_SENSORS_LM87=m
+CONFIG_SENSORS_SMSC47B397=m
# CONFIG_HWMON_DEBUG_CHIP is not set
#
@@ -1928,8 +1939,8 @@ CONFIG_INFINIBAND_SDP=m
# CONFIG_INFINIBAND_SDP_DEBUG is not set
CONFIG_INFINIBAND_SRP=m
# CONFIG_INFINIBAND_ISER is not set
-CONFIG_INFINIBAND_RDS=m
# CONFIG_INFINIBAND_RDS_DEBUG is not set
+CONFIG_INFINIBAND_MADEYE=m
#
# EDAC - error detection and reporting (RAS)
@@ -1948,6 +1959,7 @@ CONFIG_EDAC_I82875P=m
CONFIG_EDAC_I82860=m
CONFIG_EDAC_R82600=m
CONFIG_EDAC_POLL=y
+CONFIG_EDAC_K8=m
#
# Firmware Drivers
@@ -2054,7 +2066,7 @@ CONFIG_NFS_V3_ACL=y
CONFIG_NFS_V4=y
CONFIG_NFS_DIRECTIO=y
CONFIG_NFSD=m
-CONFIG_NFSD_V2_ACL=y
+# CONFIG_NFSD_V2_ACL is not set
CONFIG_NFSD_V3=y
CONFIG_NFSD_V3_ACL=y
CONFIG_NFSD_V4=y
diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64.config
index 818e8c693cf47ed281cd253b34cae2c1cdb293a3..ecc896636534ac20831d62e98fe8055d1d415770 100644
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64.config
@@ -98,7 +98,8 @@ CONFIG_X86_MCE=y
CONFIG_X86_MCE_AMD=y
CONFIG_IOPROC=y
CONFIG_PTRACK=y
-
+# CONFIG_X86_64_XEN is not set
+
#
# Power management options
#
@@ -471,23 +472,6 @@ CONFIG_MEGARAID_NEWGEN=y
CONFIG_MEGARAID_MM=m
CONFIG_MEGARAID_MAILBOX=m
CONFIG_MEGARAID_SAS=m
-CONFIG_SCSI_SATA=y
-CONFIG_SCSI_SATA_AHCI=m
-CONFIG_SCSI_SATA_SVW=m
-CONFIG_SCSI_ATA_PIIX=m
-CONFIG_SCSI_SATA_MV=m
-CONFIG_SCSI_SATA_NV=m
-CONFIG_SCSI_PDC_ADMA=m
-CONFIG_SCSI_SATA_QSTOR=m
-CONFIG_SCSI_SATA_PROMISE=m
-CONFIG_SCSI_SATA_SX4=m
-CONFIG_SCSI_SATA_SIL=m
-CONFIG_SCSI_SATA_SIL24=m
-CONFIG_SCSI_SATA_SIS=m
-CONFIG_SCSI_SATA_ULI=m
-CONFIG_SCSI_SATA_VIA=m
-CONFIG_SCSI_SATA_VITESSE=m
-CONFIG_SCSI_SATA_INTEL_COMBINED=y
# CONFIG_SCSI_BUSLOGIC is not set
# CONFIG_SCSI_DMX3191D is not set
# CONFIG_SCSI_EATA is not set
@@ -521,6 +505,9 @@ CONFIG_SCSI_QLA2300=m
CONFIG_SCSI_QLA2322=m
CONFIG_SCSI_QLA6312=m
CONFIG_SCSI_QLA24XX=m
+CONFIG_QLA3XXX=m
+CONFIG_SCSI_QLA4XXX=m
+
# CONFIG_SCSI_DC395x is not set
# CONFIG_SCSI_DC390T is not set
# CONFIG_SCSI_DEBUG is not set
@@ -532,6 +519,27 @@ CONFIG_SCSI_QLA24XX=m
# CONFIG_PCMCIA_QLOGIC is not set
# CONFIG_PCMCIA_SYM53C500 is not set
+#
+# Serial ATA (prod) and Parallel ATA (experimental) drivers
+#
+CONFIG_ATA=y
+CONFIG_SATA_AHCI=m
+CONFIG_SATA_SVW=m
+CONFIG_ATA_PIIX=m
+CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_PDC_ADMA=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_SX4=m
+CONFIG_SATA_SIL=m
+CONFIG_SATA_SIL24=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
+CONFIG_SATA_INTEL_COMBINED=y
+
#
# Multi-device support (RAID and LVM)
#
@@ -1337,7 +1345,7 @@ CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_SERIAL_8250_CS=m
# CONFIG_SERIAL_8250_ACPI is not set
-CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_NR_UARTS=64
CONFIG_SERIAL_8250_EXTENDED=y
# CONFIG_SERIAL_8250_MANY_PORTS is not set
CONFIG_SERIAL_8250_SHARE_IRQ=y
@@ -1524,6 +1532,7 @@ CONFIG_HWMON=m
CONFIG_HWMON_VID=m
CONFIG_SENSORS_ADM1026=m
CONFIG_SENSORS_LM87=m
+CONFIG_SENSORS_SMSC47B397=m
# CONFIG_HWMON_DEBUG_CHIP is not set
#
@@ -1928,8 +1937,8 @@ CONFIG_INFINIBAND_SDP=m
# CONFIG_INFINIBAND_SDP_DEBUG is not set
CONFIG_INFINIBAND_SRP=m
# CONFIG_INFINIBAND_ISER is not set
-CONFIG_INFINIBAND_RDS=m
# CONFIG_INFINIBAND_RDS_DEBUG is not set
+CONFIG_INFINIBAND_MADEYE=m
#
# EDAC - error detection and reporting (RAS)
@@ -1948,6 +1957,7 @@ CONFIG_EDAC_I82875P=m
CONFIG_EDAC_I82860=m
CONFIG_EDAC_R82600=m
CONFIG_EDAC_POLL=y
+CONFIG_EDAC_K8=m
#
# Firmware Drivers
@@ -2054,7 +2064,7 @@ CONFIG_NFS_V3_ACL=y
CONFIG_NFS_V4=y
CONFIG_NFS_DIRECTIO=y
CONFIG_NFSD=m
-CONFIG_NFSD_V2_ACL=y
+# CONFIG_NFSD_V2_ACL is not set
CONFIG_NFSD_V3=y
CONFIG_NFSD_V3_ACL=y
CONFIG_NFSD_V4=y
diff --git a/lustre/kernel_patches/patches/inode-nr_unused-2.6.9-rhel4.patch b/lustre/kernel_patches/patches/inode-nr_unused-2.6.9-rhel4.patch
index a325629e66627ff3e3ae0649644c0939de223fc7..250822123e0de82f822c43d45c3413c2cd141326 100644
--- a/lustre/kernel_patches/patches/inode-nr_unused-2.6.9-rhel4.patch
+++ b/lustre/kernel_patches/patches/inode-nr_unused-2.6.9-rhel4.patch
@@ -1,7 +1,8 @@
-diff -urp b1_4.RH_2_6_9_42_0_3.old/fs/fs-writeback.c b1_4.RH_2_6_9_42_0_3/fs/fs-writeback.c
---- b1_4.RH_2_6_9_42_0_3.old/fs/fs-writeback.c 2006-10-23 13:33:05.000000000 +0300
-+++ b1_4.RH_2_6_9_42_0_3/fs/fs-writeback.c 2007-04-15 00:31:43.000000000 +0300
-@@ -230,7 +230,6 @@ __sync_single_inode(struct inode *inode,
+Index: RH_2_6_9_55/fs/fs-writeback.c
+===================================================================
+--- RH_2_6_9_55.orig/fs/fs-writeback.c
++++ RH_2_6_9_55/fs/fs-writeback.c
+@@ -230,7 +230,6 @@
* The inode is clean, unused
*/
list_move(&inode->i_list, &inode_unused);
@@ -9,7 +10,7 @@ diff -urp b1_4.RH_2_6_9_42_0_3.old/fs/fs-writeback.c b1_4.RH_2_6_9_42_0_3/fs/fs-
}
}
wake_up_inode(inode);
-@@ -244,6 +243,11 @@ static int
+@@ -244,6 +243,11 @@
__writeback_single_inode(struct inode *inode,
struct writeback_control *wbc)
{
@@ -21,7 +22,7 @@ diff -urp b1_4.RH_2_6_9_42_0_3.old/fs/fs-writeback.c b1_4.RH_2_6_9_42_0_3/fs/fs-
if ((wbc->sync_mode != WB_SYNC_ALL) && (inode->i_state & I_LOCK)) {
list_move(&inode->i_list, &inode->i_sb->s_dirty);
return 0;
-@@ -253,10 +257,8 @@ __writeback_single_inode(struct inode *i
+@@ -253,10 +257,8 @@
* It's a data-integrity sync. We must wait.
*/
while (inode->i_state & I_LOCK) {
@@ -32,11 +33,11 @@ diff -urp b1_4.RH_2_6_9_42_0_3.old/fs/fs-writeback.c b1_4.RH_2_6_9_42_0_3/fs/fs-
spin_lock(&inode_lock);
}
return __sync_single_inode(inode, wbc);
-Двоичные файлы b1_4.RH_2_6_9_42_0_3.old/fs/fs-writeback.o и b1_4.RH_2_6_9_42_0_3/fs/fs-writeback.o различаются
-diff -urp b1_4.RH_2_6_9_42_0_3.old/fs/inode.c b1_4.RH_2_6_9_42_0_3/fs/inode.c
---- b1_4.RH_2_6_9_42_0_3.old/fs/inode.c 2006-12-14 15:20:40.000000000 +0200
-+++ b1_4.RH_2_6_9_42_0_3/fs/inode.c 2007-04-15 00:31:28.000000000 +0300
-@@ -1054,6 +1054,7 @@ static void generic_forget_inode(struct
+Index: RH_2_6_9_55/fs/inode.c
+===================================================================
+--- RH_2_6_9_55.orig/fs/inode.c
++++ RH_2_6_9_55/fs/inode.c
+@@ -1056,6 +1056,7 @@
if (inode->i_data.nrpages)
truncate_inode_pages(&inode->i_data, 0);
clear_inode(inode);
diff --git a/lustre/kernel_patches/patches/jbd-stats-2.6.9.patch b/lustre/kernel_patches/patches/jbd-stats-2.6.9.patch
index 7a4837568fa9bd274ec6a908aee03d39c63d844b..3847e1e49911695e5340ef7abebb5581f8c88290 100644
--- a/lustre/kernel_patches/patches/jbd-stats-2.6.9.patch
+++ b/lustre/kernel_patches/patches/jbd-stats-2.6.9.patch
@@ -1,7 +1,7 @@
Index: linux-2.6.9/include/linux/jbd.h
===================================================================
---- linux-2.6.9.orig/include/linux/jbd.h 2006-03-10 18:20:03.000000000 +0300
-+++ linux-2.6.9/include/linux/jbd.h 2006-07-28 02:32:18.000000000 +0400
+--- linux-2.6.9.orig/include/linux/jbd.h
++++ linux-2.6.9/include/linux/jbd.h
@@ -422,6 +422,16 @@ struct handle_s
};
@@ -118,14 +118,14 @@ Index: linux-2.6.9/include/linux/jbd.h
*/
Index: linux-2.6.9/fs/jbd/commit.c
===================================================================
---- linux-2.6.9.orig/fs/jbd/commit.c 2006-03-10 18:20:39.000000000 +0300
-+++ linux-2.6.9/fs/jbd/commit.c 2006-07-28 02:32:18.000000000 +0400
+--- linux-2.6.9.orig/fs/jbd/commit.c
++++ linux-2.6.9/fs/jbd/commit.c
@@ -21,6 +21,7 @@
#include <linux/mm.h>
#include <linux/pagemap.h>
#include <linux/smp_lock.h>
+#include <linux/jiffies.h>
-
+
/*
* Default IO end handler for temporary BJ_IO buffer_heads.
@@ -101,6 +102,7 @@ static int inverted_lock(journal_t *jour
@@ -133,66 +133,67 @@ Index: linux-2.6.9/fs/jbd/commit.c
void journal_commit_transaction(journal_t *journal)
{
+ struct transaction_stats_s stats;
- transaction_t *commit_transaction;
- struct journal_head *jh, *new_jh, *descriptor;
- struct buffer_head *wbuf[64];
+ transaction_t *commit_transaction;
+ struct journal_head *jh, *new_jh, *descriptor;
+ struct buffer_head *wbuf[64];
@@ -147,6 +149,11 @@ void journal_commit_transaction(journal_
- spin_lock(&journal->j_state_lock);
- commit_transaction->t_state = T_LOCKED;
-
+ spin_lock(&journal->j_state_lock);
+ commit_transaction->t_state = T_LOCKED;
+
+ stats.ts_wait = commit_transaction->t_max_wait;
+ stats.ts_locked = CURRENT_MSECS;
+ stats.ts_running = jbd_time_diff(commit_transaction->t_start,
+ stats.ts_locked);
+
- spin_lock(&commit_transaction->t_handle_lock);
- while (commit_transaction->t_updates) {
- DEFINE_WAIT(wait);
+ spin_lock(&commit_transaction->t_handle_lock);
+ while (commit_transaction->t_updates) {
+ DEFINE_WAIT(wait);
@@ -219,6 +226,9 @@ void journal_commit_transaction(journal_
- */
- journal_switch_revoke_table(journal);
-
+ */
+ journal_switch_revoke_table(journal);
+
+ stats.ts_flushing = CURRENT_MSECS;
+ stats.ts_locked = jbd_time_diff(stats.ts_locked, stats.ts_flushing);
+
- commit_transaction->t_state = T_FLUSH;
- journal->j_committing_transaction = commit_transaction;
- journal->j_running_transaction = NULL;
+ commit_transaction->t_state = T_FLUSH;
+ journal->j_committing_transaction = commit_transaction;
+ journal->j_running_transaction = NULL;
@@ -365,6 +375,11 @@ write_out_data:
- */
- commit_transaction->t_state = T_COMMIT;
-
+ */
+ commit_transaction->t_state = T_COMMIT;
+
+ stats.ts_logging = CURRENT_MSECS;
+ stats.ts_flushing = jbd_time_diff(stats.ts_flushing, stats.ts_logging);
+ stats.ts_blocks = commit_transaction->t_outstanding_credits;
+ stats.ts_blocks_logged = 0;
+
- descriptor = NULL;
- bufs = 0;
- while (commit_transaction->t_buffers) {
+ descriptor = NULL;
+ bufs = 0;
+ while (commit_transaction->t_buffers) {
@@ -513,6 +528,7 @@ start_journal_io:
- submit_bh(WRITE, bh);
- }
- cond_resched();
+ submit_bh(WRITE, bh);
+ }
+ cond_resched();
+ stats.ts_blocks_logged += bufs;
-
- /* Force a new descriptor to be generated next
+
+ /* Force a new descriptor to be generated next
time round the loop. */
-@@ -760,6 +776,7 @@ skip_commit: /* The journal should be un
- cp_transaction = jh->b_cp_transaction;
- if (cp_transaction) {
- JBUFFER_TRACE(jh, "remove from old cp transaction");
+@@ -767,6 +783,7 @@ restart_loop:
+ cp_transaction = jh->b_cp_transaction;
+ if (cp_transaction) {
+ JBUFFER_TRACE(jh, "remove from old cp transaction");
+ cp_transaction->t_chp_stats.cs_dropped++;
- __journal_remove_checkpoint(jh);
- }
-
-@@ -806,6 +823,36 @@ skip_commit: /* The journal should be un
-
- J_ASSERT(commit_transaction->t_state == T_COMMIT);
-
+ __journal_remove_checkpoint(jh);
+ }
+
+@@ -816,6 +833,37 @@ restart_loop:
+ }
+ cond_resched_lock(&journal->j_list_lock);
+ }
++
+ commit_transaction->t_start = CURRENT_MSECS;
+ stats.ts_logging = jbd_time_diff(stats.ts_logging,
-+ commit_transaction->t_start);
++ commit_transaction->t_start);
+
+ /*
+ * File the transaction for history
@@ -202,7 +203,7 @@ Index: linux-2.6.9/fs/jbd/commit.c
+ stats.ts_handle_count = commit_transaction->t_handle_count;
+ spin_lock(&journal->j_history_lock);
+ memcpy(journal->j_history + journal->j_history_cur, &stats,
-+ sizeof(stats));
++ sizeof(stats));
+ if (++journal->j_history_cur == journal->j_history_max)
+ journal->j_history_cur = 0;
+
@@ -220,70 +221,70 @@ Index: linux-2.6.9/fs/jbd/commit.c
+ journal->j_stats.ts_blocks_logged += stats.ts_blocks_logged;
+ spin_unlock(&journal->j_history_lock);
+
- /*
- * This is a bit sleazy. We borrow j_list_lock to protect
- * journal->j_committing_transaction in __journal_remove_checkpoint.
+ spin_unlock(&journal->j_list_lock);
+ /*
+ * This is a bit sleazy. We borrow j_list_lock to protect
Index: linux-2.6.9/fs/jbd/checkpoint.c
===================================================================
---- linux-2.6.9.orig/fs/jbd/checkpoint.c 2006-03-10 18:20:03.000000000 +0300
-+++ linux-2.6.9/fs/jbd/checkpoint.c 2006-07-28 02:35:21.000000000 +0400
+--- linux-2.6.9.orig/fs/jbd/checkpoint.c
++++ linux-2.6.9/fs/jbd/checkpoint.c
@@ -166,6 +166,7 @@ static int __cleanup_transaction(journal
- transaction_t *t = jh->b_transaction;
- tid_t tid = t->t_tid;
-
+ transaction_t *t = jh->b_transaction;
+ tid_t tid = t->t_tid;
+
+ transaction->t_chp_stats.cs_forced_to_close++;
- spin_unlock(&journal->j_list_lock);
- jbd_unlock_bh_state(bh);
- log_start_commit(journal, tid);
-@@ -227,7 +228,7 @@ __flush_batch(journal_t *journal, struct
+ spin_unlock(&journal->j_list_lock);
+ jbd_unlock_bh_state(bh);
+ log_start_commit(journal, tid);
+@@ -226,7 +227,7 @@ __flush_batch(journal_t *journal, struct
*/
static int __flush_buffer(journal_t *journal, struct journal_head *jh,
- struct buffer_head **bhs, int *batch_count,
+ struct buffer_head **bhs, int *batch_count,
- int *drop_count)
+ int *drop_count, transaction_t *transaction)
{
- struct buffer_head *bh = jh2bh(jh);
- int ret = 0;
-@@ -248,6 +249,7 @@ static int __flush_buffer(journal_t *jou
- set_buffer_jwrite(bh);
- bhs[*batch_count] = bh;
- jbd_unlock_bh_state(bh);
+ struct buffer_head *bh = jh2bh(jh);
+ int ret = 0;
+@@ -247,6 +248,7 @@ static int __flush_buffer(journal_t *jou
+ set_buffer_jwrite(bh);
+ bhs[*batch_count] = bh;
+ jbd_unlock_bh_state(bh);
+ transaction->t_chp_stats.cs_written++;
- (*batch_count)++;
- if (*batch_count == NR_BATCH) {
- __flush_batch(journal, bhs, batch_count);
-@@ -316,6 +318,8 @@ int log_do_checkpoint(journal_t *journal
- tid_t this_tid;
-
- transaction = journal->j_checkpoint_transactions;
+ (*batch_count)++;
+ if (*batch_count == NR_BATCH) {
+ __flush_batch(journal, bhs, batch_count);
+@@ -315,6 +317,8 @@ int log_do_checkpoint(journal_t *journal
+ tid_t this_tid;
+
+ transaction = journal->j_checkpoint_transactions;
+ if (transaction->t_chp_stats.cs_chp_time == 0)
+ transaction->t_chp_stats.cs_chp_time = CURRENT_MSECS;
- this_tid = transaction->t_tid;
- jh = transaction->t_checkpoint_list;
- last_jh = jh->b_cpprev;
-@@ -332,7 +336,8 @@ int log_do_checkpoint(journal_t *journal
- retry = 1;
- break;
- }
+ this_tid = transaction->t_tid;
+ jh = transaction->t_checkpoint_list;
+ last_jh = jh->b_cpprev;
+@@ -331,7 +335,8 @@ int log_do_checkpoint(journal_t *journal
+ retry = 1;
+ break;
+ }
- retry = __flush_buffer(journal, jh, bhs, &batch_count, &drop_count);
-+ retry = __flush_buffer(journal, jh, bhs, &batch_count,
-+ &drop_count, transaction);
- } while (jh != last_jh && !retry);
-
- if (batch_count) {
-@@ -598,6 +603,8 @@ void __journal_insert_checkpoint(struct
-
++ retry = __flush_buffer(journal, jh, bhs, &batch_count,
++ &drop_count, transaction);
+ } while (jh != last_jh && !retry);
+
+ if (batch_count) {
+@@ -597,6 +602,8 @@ void __journal_insert_checkpoint(struct
+
void __journal_drop_transaction(journal_t *journal, transaction_t *transaction)
{
+ struct transaction_stats_s stats;
+
- assert_spin_locked(&journal->j_list_lock);
- if (transaction->t_cpnext) {
- transaction->t_cpnext->t_cpprev = transaction->t_cpprev;
-@@ -623,5 +630,25 @@ void __journal_drop_transaction(journal_
- J_ASSERT(journal->j_running_transaction != transaction);
-
- jbd_debug(1, "Dropping transaction %d, all done\n", transaction->t_tid);
+ assert_spin_locked(&journal->j_list_lock);
+ if (transaction->t_cpnext) {
+ transaction->t_cpnext->t_cpprev = transaction->t_cpprev;
+@@ -622,5 +629,25 @@ void __journal_drop_transaction(journal_
+ J_ASSERT(journal->j_running_transaction != transaction);
+
+ jbd_debug(1, "Dropping transaction %d, all done\n", transaction->t_tid);
+
+ /*
+ * File the transaction for history
@@ -304,12 +305,12 @@ Index: linux-2.6.9/fs/jbd/checkpoint.c
+ spin_unlock(&journal->j_history_lock);
+ }
+
- kfree(transaction);
+ kfree(transaction);
}
Index: linux-2.6.9/fs/jbd/transaction.c
===================================================================
---- linux-2.6.9.orig/fs/jbd/transaction.c 2006-03-10 18:20:03.000000000 +0300
-+++ linux-2.6.9/fs/jbd/transaction.c 2006-07-28 02:32:18.000000000 +0400
+--- linux-2.6.9.orig/fs/jbd/transaction.c
++++ linux-2.6.9/fs/jbd/transaction.c
@@ -60,6 +60,8 @@ get_transaction(journal_t *journal, tran
J_ASSERT(journal->j_running_transaction == NULL);
@@ -342,8 +343,8 @@ Index: linux-2.6.9/fs/jbd/transaction.c
transaction->t_updates++;
Index: linux-2.6.9/fs/jbd/journal.c
===================================================================
---- linux-2.6.9.orig/fs/jbd/journal.c 2006-06-19 21:31:57.000000000 +0400
-+++ linux-2.6.9/fs/jbd/journal.c 2006-07-28 02:32:18.000000000 +0400
+--- linux-2.6.9.orig/fs/jbd/journal.c
++++ linux-2.6.9/fs/jbd/journal.c
@@ -36,6 +36,7 @@
#include <asm/uaccess.h>
#include <asm/page.h>
@@ -688,7 +689,7 @@ Index: linux-2.6.9/fs/jbd/journal.c
if (journal->j_inode)
iput(journal->j_inode);
if (journal->j_revoke)
-@@ -1895,6 +2197,28 @@ static void __exit remove_jbd_proc_entry
+@@ -1896,6 +2198,28 @@ static void __exit remove_jbd_proc_entry
#endif
@@ -717,7 +718,7 @@ Index: linux-2.6.9/fs/jbd/journal.c
kmem_cache_t *jbd_handle_cache;
static int __init journal_init_handle_cache(void)
-@@ -1949,6 +2273,7 @@ static int __init journal_init(void)
+@@ -1950,6 +2274,7 @@ static int __init journal_init(void)
if (ret != 0)
journal_destroy_caches();
create_jbd_proc_entry();
@@ -725,7 +726,7 @@ Index: linux-2.6.9/fs/jbd/journal.c
return ret;
}
-@@ -1960,6 +2285,7 @@ static void __exit journal_exit(void)
+@@ -1961,6 +2286,7 @@ static void __exit journal_exit(void)
printk(KERN_EMERG "JBD: leaked %d journal_heads!\n", n);
#endif
remove_jbd_proc_entry();
diff --git a/lustre/kernel_patches/patches/qsnet-rhel4-2.6.patch b/lustre/kernel_patches/patches/qsnet-rhel4-2.6.patch
index a17f058154ba0be55ccd71d133a7698ebbade656..971705aa0019934a341e3f515b41716196555c05 100644
--- a/lustre/kernel_patches/patches/qsnet-rhel4-2.6.patch
+++ b/lustre/kernel_patches/patches/qsnet-rhel4-2.6.patch
@@ -1,7 +1,7 @@
-diff -urN clean/arch/i386/defconfig linux-2.6.9/arch/i386/defconfig
---- clean/arch/i386/defconfig 2004-10-18 17:54:38.000000000 -0400
-+++ linux-2.6.9/arch/i386/defconfig 2005-10-10 17:47:17.000000000 -0400
-@@ -119,6 +119,8 @@
+diff -urpN RH_2_6_9_55.HEAD.orig/arch/i386/defconfig RH_2_6_9_55.HEAD/arch/i386/defconfig
+--- RH_2_6_9_55.HEAD.orig/arch/i386/defconfig
++++ RH_2_6_9_55.HEAD/arch/i386/defconfig
+@@ -119,6 +119,8 @@ CONFIG_MTRR=y
CONFIG_IRQBALANCE=y
CONFIG_HAVE_DEC_LOCK=y
# CONFIG_REGPARM is not set
@@ -10,12 +10,12 @@ diff -urN clean/arch/i386/defconfig linux-2.6.9/arch/i386/defconfig
#
# Power management options (ACPI, APM)
-diff -urN clean/arch/i386/Kconfig linux-2.6.9/arch/i386/Kconfig
---- clean/arch/i386/Kconfig 2005-05-13 13:39:03.000000000 -0400
-+++ linux-2.6.9/arch/i386/Kconfig 2005-10-10 17:47:17.000000000 -0400
-@@ -946,6 +946,9 @@
- support. As of this writing the exact hardware interface is
- strongly in flux, so no good recommendation can be made.
+diff -urpN RH_2_6_9_55.HEAD.orig/arch/i386/Kconfig RH_2_6_9_55.HEAD/arch/i386/Kconfig
+--- RH_2_6_9_55.HEAD.orig/arch/i386/Kconfig
++++ RH_2_6_9_55.HEAD/arch/i386/Kconfig
+@@ -960,6 +960,9 @@ config REGPARM
+ generate incorrect output with certain kernel constructs when
+ -mregparm=3 is used.
+source "mm/Kconfig"
+source "kernel/Kconfig"
@@ -23,10 +23,10 @@ diff -urN clean/arch/i386/Kconfig linux-2.6.9/arch/i386/Kconfig
endmenu
-diff -urN clean/arch/ia64/defconfig linux-2.6.9/arch/ia64/defconfig
---- clean/arch/ia64/defconfig 2004-10-18 17:53:12.000000000 -0400
-+++ linux-2.6.9/arch/ia64/defconfig 2005-10-10 17:47:17.000000000 -0400
-@@ -83,6 +83,8 @@
+diff -urpN RH_2_6_9_55.HEAD.orig/arch/ia64/defconfig RH_2_6_9_55.HEAD/arch/ia64/defconfig
+--- RH_2_6_9_55.HEAD.orig/arch/ia64/defconfig
++++ RH_2_6_9_55.HEAD/arch/ia64/defconfig
+@@ -83,6 +83,8 @@ CONFIG_IA32_SUPPORT=y
CONFIG_COMPAT=y
CONFIG_PERFMON=y
CONFIG_IA64_PALINFO=y
@@ -35,10 +35,10 @@ diff -urN clean/arch/ia64/defconfig linux-2.6.9/arch/ia64/defconfig
#
# Firmware Drivers
-diff -urN clean/arch/ia64/Kconfig linux-2.6.9/arch/ia64/Kconfig
---- clean/arch/ia64/Kconfig 2005-05-13 13:39:00.000000000 -0400
-+++ linux-2.6.9/arch/ia64/Kconfig 2005-10-10 17:47:17.000000000 -0400
-@@ -299,6 +299,9 @@
+diff -urpN RH_2_6_9_55.HEAD.orig/arch/ia64/Kconfig RH_2_6_9_55.HEAD/arch/ia64/Kconfig
+--- RH_2_6_9_55.HEAD.orig/arch/ia64/Kconfig
++++ RH_2_6_9_55.HEAD/arch/ia64/Kconfig
+@@ -316,6 +316,9 @@ config IA64_PALINFO
To use this option, you have to ensure that the "/proc file system
support" (CONFIG_PROC_FS) is enabled, too.
@@ -48,10 +48,10 @@ diff -urN clean/arch/ia64/Kconfig linux-2.6.9/arch/ia64/Kconfig
source "drivers/firmware/Kconfig"
source "fs/Kconfig.binfmt"
-diff -urN clean/arch/x86_64/defconfig linux-2.6.9/arch/x86_64/defconfig
---- clean/arch/x86_64/defconfig 2004-10-18 17:54:39.000000000 -0400
-+++ linux-2.6.9/arch/x86_64/defconfig 2005-10-10 17:47:17.000000000 -0400
-@@ -87,6 +87,8 @@
+diff -urpN RH_2_6_9_55.HEAD.orig/arch/x86_64/defconfig RH_2_6_9_55.HEAD/arch/x86_64/defconfig
+--- RH_2_6_9_55.HEAD.orig/arch/x86_64/defconfig
++++ RH_2_6_9_55.HEAD/arch/x86_64/defconfig
+@@ -87,6 +87,8 @@ CONFIG_NR_CPUS=8
CONFIG_GART_IOMMU=y
CONFIG_SWIOTLB=y
CONFIG_X86_MCE=y
@@ -60,12 +60,12 @@ diff -urN clean/arch/x86_64/defconfig linux-2.6.9/arch/x86_64/defconfig
#
# Power management options
-diff -urN clean/arch/x86_64/Kconfig linux-2.6.9/arch/x86_64/Kconfig
---- clean/arch/x86_64/Kconfig 2005-05-13 13:39:03.000000000 -0400
-+++ linux-2.6.9/arch/x86_64/Kconfig 2005-10-10 17:47:17.000000000 -0400
-@@ -327,6 +327,9 @@
- machine check error logs. See
- ftp://ftp.x86-64.org/pub/linux/tools/mcelog
+diff -urpN RH_2_6_9_55.HEAD.orig/arch/x86_64/Kconfig RH_2_6_9_55.HEAD/arch/x86_64/Kconfig
+--- RH_2_6_9_55.HEAD.orig/arch/x86_64/Kconfig
++++ RH_2_6_9_55.HEAD/arch/x86_64/Kconfig
+@@ -401,6 +401,9 @@ config X86_MCE_AMD
+ Additional support for AMD specific MCE features such as
+ the DRAM Error Threshold.
+source "mm/Kconfig"
+source "kernel/Kconfig"
@@ -73,9 +73,9 @@ diff -urN clean/arch/x86_64/Kconfig linux-2.6.9/arch/x86_64/Kconfig
endmenu
-diff -urN clean/Documentation/vm/ioproc.txt linux-2.6.9/Documentation/vm/ioproc.txt
---- clean/Documentation/vm/ioproc.txt 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/Documentation/vm/ioproc.txt 2005-10-10 17:47:17.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/Documentation/vm/ioproc.txt RH_2_6_9_55.HEAD/Documentation/vm/ioproc.txt
+--- RH_2_6_9_55.HEAD.orig/Documentation/vm/ioproc.txt 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/Documentation/vm/ioproc.txt
@@ -0,0 +1,468 @@
+Linux IOPROC patch overview
+===========================
@@ -545,9 +545,29 @@ diff -urN clean/Documentation/vm/ioproc.txt linux-2.6.9/Documentation/vm/ioproc.
+
+
+-- Last update DavidAddison - 17 Aug 2004
-diff -urN clean/drivers/net/qsnet/eip/eip_linux.c linux-2.6.9/drivers/net/qsnet/eip/eip_linux.c
---- clean/drivers/net/qsnet/eip/eip_linux.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/eip/eip_linux.c 2005-09-07 10:34:58.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/Kconfig RH_2_6_9_55.HEAD/drivers/net/Kconfig
+--- RH_2_6_9_55.HEAD.orig/drivers/net/Kconfig
++++ RH_2_6_9_55.HEAD/drivers/net/Kconfig
+@@ -2320,6 +2320,8 @@ endmenu
+
+ source "drivers/net/tokenring/Kconfig"
+
++source "drivers/net/qsnet/Kconfig"
++
+ source "drivers/net/wireless/Kconfig"
+
+ source "drivers/net/pcmcia/Kconfig"
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/Makefile RH_2_6_9_55.HEAD/drivers/net/Makefile
+--- RH_2_6_9_55.HEAD.orig/drivers/net/Makefile
++++ RH_2_6_9_55.HEAD/drivers/net/Makefile
+@@ -202,3 +202,4 @@ obj-$(CONFIG_IRDA) += irda/
+
+ obj-$(CONFIG_NETCONSOLE) += netconsole.o
+ obj-$(CONFIG_NETDUMP) += netdump.o
++obj-$(CONFIG_QSNET) += qsnet/
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/eip/eip_linux.c RH_2_6_9_55.HEAD/drivers/net/qsnet/eip/eip_linux.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/eip/eip_linux.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/eip/eip_linux.c
@@ -0,0 +1,1575 @@
+/*
+ * Copyright (c) 2003 by Quadrics Ltd.
@@ -2124,9 +2144,9 @@ diff -urN clean/drivers/net/qsnet/eip/eip_linux.c linux-2.6.9/drivers/net/qsnet/
+ * c-file-style: "linux"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/eip/eip_linux.h linux-2.6.9/drivers/net/qsnet/eip/eip_linux.h
---- clean/drivers/net/qsnet/eip/eip_linux.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/eip/eip_linux.h 2004-10-01 06:49:29.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/eip/eip_linux.h RH_2_6_9_55.HEAD/drivers/net/qsnet/eip/eip_linux.h
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/eip/eip_linux.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/eip/eip_linux.h
@@ -0,0 +1,399 @@
+/*
+ * Copyright (c) 2003 by Quadrics Ltd.
@@ -2527,9 +2547,9 @@ diff -urN clean/drivers/net/qsnet/eip/eip_linux.h linux-2.6.9/drivers/net/qsnet/
+ * c-file-style: "linux"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/eip/eip_stats.c linux-2.6.9/drivers/net/qsnet/eip/eip_stats.c
---- clean/drivers/net/qsnet/eip/eip_stats.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/eip/eip_stats.c 2005-09-07 10:34:58.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/eip/eip_stats.c RH_2_6_9_55.HEAD/drivers/net/qsnet/eip/eip_stats.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/eip/eip_stats.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/eip/eip_stats.c
@@ -0,0 +1,374 @@
+/*
+ * Copyright (c) 2003 by Quadrics Ltd.
@@ -2905,9 +2925,9 @@ diff -urN clean/drivers/net/qsnet/eip/eip_stats.c linux-2.6.9/drivers/net/qsnet/
+ * c-file-style: "linux"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/eip/eip_stats.h linux-2.6.9/drivers/net/qsnet/eip/eip_stats.h
---- clean/drivers/net/qsnet/eip/eip_stats.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/eip/eip_stats.h 2004-05-10 10:47:47.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/eip/eip_stats.h RH_2_6_9_55.HEAD/drivers/net/qsnet/eip/eip_stats.h
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/eip/eip_stats.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/eip/eip_stats.h
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2003 by Quadrics Ltd.
@@ -2931,9 +2951,9 @@ diff -urN clean/drivers/net/qsnet/eip/eip_stats.h linux-2.6.9/drivers/net/qsnet/
+void eip_stats_dump(void);
+
+#endif /* __EIP_STATS_H */
-diff -urN clean/drivers/net/qsnet/eip/Makefile linux-2.6.9/drivers/net/qsnet/eip/Makefile
---- clean/drivers/net/qsnet/eip/Makefile 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/eip/Makefile 2005-10-10 17:47:30.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/eip/Makefile RH_2_6_9_55.HEAD/drivers/net/qsnet/eip/Makefile
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/eip/Makefile 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/eip/Makefile
@@ -0,0 +1,15 @@
+#
+# Makefile for Quadrics QsNet
@@ -2950,9 +2970,9 @@ diff -urN clean/drivers/net/qsnet/eip/Makefile linux-2.6.9/drivers/net/qsnet/eip
+eip-objs := eip_linux.o eip_stats.o
+
+EXTRA_CFLAGS += -DDEBUG -DDEBUG_PRINTF -DDEBUG_ASSERT
-diff -urN clean/drivers/net/qsnet/eip/Makefile.conf linux-2.6.9/drivers/net/qsnet/eip/Makefile.conf
---- clean/drivers/net/qsnet/eip/Makefile.conf 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/eip/Makefile.conf 2005-09-07 10:39:48.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/eip/Makefile.conf RH_2_6_9_55.HEAD/drivers/net/qsnet/eip/Makefile.conf
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/eip/Makefile.conf 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/eip/Makefile.conf
@@ -0,0 +1,10 @@
+# Flags for generating QsNet Linux Kernel Makefiles
+MODNAME = eip.o
@@ -2964,14 +2984,14 @@ diff -urN clean/drivers/net/qsnet/eip/Makefile.conf linux-2.6.9/drivers/net/qsne
+# EXTRALINES START
+
+# EXTRALINES END
-diff -urN clean/drivers/net/qsnet/eip/quadrics_version.h linux-2.6.9/drivers/net/qsnet/eip/quadrics_version.h
---- clean/drivers/net/qsnet/eip/quadrics_version.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/eip/quadrics_version.h 2005-09-07 10:39:49.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/eip/quadrics_version.h RH_2_6_9_55.HEAD/drivers/net/qsnet/eip/quadrics_version.h
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/eip/quadrics_version.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/eip/quadrics_version.h
@@ -0,0 +1 @@
+#define QUADRICS_VERSION "5.11.3qsnet"
-diff -urN clean/drivers/net/qsnet/elan/bitmap.c linux-2.6.9/drivers/net/qsnet/elan/bitmap.c
---- clean/drivers/net/qsnet/elan/bitmap.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/elan/bitmap.c 2004-01-20 12:32:17.000000000 -0500
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan/bitmap.c RH_2_6_9_55.HEAD/drivers/net/qsnet/elan/bitmap.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan/bitmap.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/elan/bitmap.c
@@ -0,0 +1,287 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -3260,9 +3280,9 @@ diff -urN clean/drivers/net/qsnet/elan/bitmap.c linux-2.6.9/drivers/net/qsnet/el
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/elan/capability.c linux-2.6.9/drivers/net/qsnet/elan/capability.c
---- clean/drivers/net/qsnet/elan/capability.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/elan/capability.c 2005-07-21 06:42:36.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan/capability.c RH_2_6_9_55.HEAD/drivers/net/qsnet/elan/capability.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan/capability.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/elan/capability.c
@@ -0,0 +1,796 @@
+/*
+ * Copyright (c) 2003 by Quadrics Ltd.
@@ -4060,9 +4080,9 @@ diff -urN clean/drivers/net/qsnet/elan/capability.c linux-2.6.9/drivers/net/qsne
+ * c-file-style: "linux"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/elan/capability_general.c linux-2.6.9/drivers/net/qsnet/elan/capability_general.c
---- clean/drivers/net/qsnet/elan/capability_general.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/elan/capability_general.c 2004-02-25 08:47:59.000000000 -0500
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan/capability_general.c RH_2_6_9_55.HEAD/drivers/net/qsnet/elan/capability_general.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan/capability_general.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/elan/capability_general.c
@@ -0,0 +1,446 @@
+/*
+ * Copyright (c) 2003 by Quadrics Ltd.
@@ -4510,9 +4530,9 @@ diff -urN clean/drivers/net/qsnet/elan/capability_general.c linux-2.6.9/drivers/
+ * c-file-style: "linux"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/elan/device.c linux-2.6.9/drivers/net/qsnet/elan/device.c
---- clean/drivers/net/qsnet/elan/device.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/elan/device.c 2005-04-13 05:31:47.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan/device.c RH_2_6_9_55.HEAD/drivers/net/qsnet/elan/device.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan/device.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/elan/device.c
@@ -0,0 +1,147 @@
+/*
+ * Copyright (c) 2003 by Quadrics Ltd.
@@ -4661,9 +4681,9 @@ diff -urN clean/drivers/net/qsnet/elan/device.c linux-2.6.9/drivers/net/qsnet/el
+ * c-file-style: "linux"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/elan/devinfo.c linux-2.6.9/drivers/net/qsnet/elan/devinfo.c
---- clean/drivers/net/qsnet/elan/devinfo.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/elan/devinfo.c 2005-04-13 05:31:47.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan/devinfo.c RH_2_6_9_55.HEAD/drivers/net/qsnet/elan/devinfo.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan/devinfo.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/elan/devinfo.c
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2003 by Quadrics Ltd.
@@ -4743,9 +4763,9 @@ diff -urN clean/drivers/net/qsnet/elan/devinfo.c linux-2.6.9/drivers/net/qsnet/e
+ * c-file-style: "linux"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/elan/elanmod.c linux-2.6.9/drivers/net/qsnet/elan/elanmod.c
---- clean/drivers/net/qsnet/elan/elanmod.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/elan/elanmod.c 2005-04-13 05:31:47.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan/elanmod.c RH_2_6_9_55.HEAD/drivers/net/qsnet/elan/elanmod.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan/elanmod.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/elan/elanmod.c
@@ -0,0 +1,149 @@
+/*
+ * Copyright (c) 2003 by Quadrics Ltd.
@@ -4896,9 +4916,9 @@ diff -urN clean/drivers/net/qsnet/elan/elanmod.c linux-2.6.9/drivers/net/qsnet/e
+ * c-file-style: "linux"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/elan/elanmod_linux.c linux-2.6.9/drivers/net/qsnet/elan/elanmod_linux.c
---- clean/drivers/net/qsnet/elan/elanmod_linux.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/elan/elanmod_linux.c 2005-09-07 10:35:03.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan/elanmod_linux.c RH_2_6_9_55.HEAD/drivers/net/qsnet/elan/elanmod_linux.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan/elanmod_linux.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/elan/elanmod_linux.c
@@ -0,0 +1,544 @@
+/*
+ * Copyright (c) 2003 by Quadrics Ltd.
@@ -5444,9 +5464,9 @@ diff -urN clean/drivers/net/qsnet/elan/elanmod_linux.c linux-2.6.9/drivers/net/q
+ * c-file-style: "linux"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/elan/Makefile linux-2.6.9/drivers/net/qsnet/elan/Makefile
---- clean/drivers/net/qsnet/elan/Makefile 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/elan/Makefile 2005-10-10 17:47:30.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan/Makefile RH_2_6_9_55.HEAD/drivers/net/qsnet/elan/Makefile
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan/Makefile 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/elan/Makefile
@@ -0,0 +1,15 @@
+#
+# Makefile for Quadrics QsNet
@@ -5463,9 +5483,9 @@ diff -urN clean/drivers/net/qsnet/elan/Makefile linux-2.6.9/drivers/net/qsnet/el
+elan-objs := elanmod.o device.o stats.o devinfo.o capability.o usercopy.o elanmod_linux.o capability_general.o bitmap.o
+
+EXTRA_CFLAGS += -DDEBUG -DDEBUG_PRINTF -DDEBUG_ASSERT
-diff -urN clean/drivers/net/qsnet/elan/Makefile.conf linux-2.6.9/drivers/net/qsnet/elan/Makefile.conf
---- clean/drivers/net/qsnet/elan/Makefile.conf 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/elan/Makefile.conf 2005-09-07 10:39:36.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan/Makefile.conf RH_2_6_9_55.HEAD/drivers/net/qsnet/elan/Makefile.conf
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan/Makefile.conf 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/elan/Makefile.conf
@@ -0,0 +1,10 @@
+# Flags for generating QsNet Linux Kernel Makefiles
+MODNAME = elan.o
@@ -5477,14 +5497,14 @@ diff -urN clean/drivers/net/qsnet/elan/Makefile.conf linux-2.6.9/drivers/net/qsn
+# EXTRALINES START
+
+# EXTRALINES END
-diff -urN clean/drivers/net/qsnet/elan/quadrics_version.h linux-2.6.9/drivers/net/qsnet/elan/quadrics_version.h
---- clean/drivers/net/qsnet/elan/quadrics_version.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/elan/quadrics_version.h 2005-09-07 10:39:49.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan/quadrics_version.h RH_2_6_9_55.HEAD/drivers/net/qsnet/elan/quadrics_version.h
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan/quadrics_version.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/elan/quadrics_version.h
@@ -0,0 +1 @@
+#define QUADRICS_VERSION "5.11.3qsnet"
-diff -urN clean/drivers/net/qsnet/elan/stats.c linux-2.6.9/drivers/net/qsnet/elan/stats.c
---- clean/drivers/net/qsnet/elan/stats.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/elan/stats.c 2005-04-13 05:31:47.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan/stats.c RH_2_6_9_55.HEAD/drivers/net/qsnet/elan/stats.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan/stats.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/elan/stats.c
@@ -0,0 +1,277 @@
+/*
+ * Copyright (c) 2003 by Quadrics Ltd.
@@ -5763,9 +5783,9 @@ diff -urN clean/drivers/net/qsnet/elan/stats.c linux-2.6.9/drivers/net/qsnet/ela
+ * c-file-style: "linux"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/elan/usercopy.c linux-2.6.9/drivers/net/qsnet/elan/usercopy.c
---- clean/drivers/net/qsnet/elan/usercopy.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/elan/usercopy.c 2005-09-06 05:06:58.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan/usercopy.c RH_2_6_9_55.HEAD/drivers/net/qsnet/elan/usercopy.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan/usercopy.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/elan/usercopy.c
@@ -0,0 +1,198 @@
+/*
+ * Copyright (c) 2005 by Quadrics Ltd.
@@ -5965,9 +5985,9 @@ diff -urN clean/drivers/net/qsnet/elan/usercopy.c linux-2.6.9/drivers/net/qsnet/
+ * c-file-style: "linux"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/elan3/context.c linux-2.6.9/drivers/net/qsnet/elan3/context.c
---- clean/drivers/net/qsnet/elan3/context.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/elan3/context.c 2005-07-20 07:35:36.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan3/context.c RH_2_6_9_55.HEAD/drivers/net/qsnet/elan3/context.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan3/context.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/elan3/context.c
@@ -0,0 +1,2101 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -8070,9 +8090,9 @@ diff -urN clean/drivers/net/qsnet/elan3/context.c linux-2.6.9/drivers/net/qsnet/
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/elan3/context_linux.c linux-2.6.9/drivers/net/qsnet/elan3/context_linux.c
---- clean/drivers/net/qsnet/elan3/context_linux.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/elan3/context_linux.c 2004-10-28 07:51:00.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan3/context_linux.c RH_2_6_9_55.HEAD/drivers/net/qsnet/elan3/context_linux.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan3/context_linux.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/elan3/context_linux.c
@@ -0,0 +1,229 @@
+/*
+ * Copyright (c) 2003 by Quadrics Limited.
@@ -8303,9 +8323,9 @@ diff -urN clean/drivers/net/qsnet/elan3/context_linux.c linux-2.6.9/drivers/net/
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/elan3/cproc.c linux-2.6.9/drivers/net/qsnet/elan3/cproc.c
---- clean/drivers/net/qsnet/elan3/cproc.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/elan3/cproc.c 2004-02-10 10:05:10.000000000 -0500
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan3/cproc.c RH_2_6_9_55.HEAD/drivers/net/qsnet/elan3/cproc.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan3/cproc.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/elan3/cproc.c
@@ -0,0 +1,539 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -8846,9 +8866,9 @@ diff -urN clean/drivers/net/qsnet/elan3/cproc.c linux-2.6.9/drivers/net/qsnet/el
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/elan3/dproc.c linux-2.6.9/drivers/net/qsnet/elan3/dproc.c
---- clean/drivers/net/qsnet/elan3/dproc.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/elan3/dproc.c 2003-09-24 09:57:25.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan3/dproc.c RH_2_6_9_55.HEAD/drivers/net/qsnet/elan3/dproc.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan3/dproc.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/elan3/dproc.c
@@ -0,0 +1,553 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -9403,9 +9423,9 @@ diff -urN clean/drivers/net/qsnet/elan3/dproc.c linux-2.6.9/drivers/net/qsnet/el
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/elan3/elan3mmu_generic.c linux-2.6.9/drivers/net/qsnet/elan3/elan3mmu_generic.c
---- clean/drivers/net/qsnet/elan3/elan3mmu_generic.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/elan3/elan3mmu_generic.c 2004-12-14 05:19:38.000000000 -0500
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan3/elan3mmu_generic.c RH_2_6_9_55.HEAD/drivers/net/qsnet/elan3/elan3mmu_generic.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan3/elan3mmu_generic.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/elan3/elan3mmu_generic.c
@@ -0,0 +1,3255 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -12662,9 +12682,9 @@ diff -urN clean/drivers/net/qsnet/elan3/elan3mmu_generic.c linux-2.6.9/drivers/n
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/elan3/elan3mmu_linux.c linux-2.6.9/drivers/net/qsnet/elan3/elan3mmu_linux.c
---- clean/drivers/net/qsnet/elan3/elan3mmu_linux.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/elan3/elan3mmu_linux.c 2004-12-14 05:19:38.000000000 -0500
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan3/elan3mmu_linux.c RH_2_6_9_55.HEAD/drivers/net/qsnet/elan3/elan3mmu_linux.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan3/elan3mmu_linux.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/elan3/elan3mmu_linux.c
@@ -0,0 +1,284 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -12950,9 +12970,9 @@ diff -urN clean/drivers/net/qsnet/elan3/elan3mmu_linux.c linux-2.6.9/drivers/net
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/elan3/elan3ops.c linux-2.6.9/drivers/net/qsnet/elan3/elan3ops.c
---- clean/drivers/net/qsnet/elan3/elan3ops.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/elan3/elan3ops.c 2003-09-24 09:57:25.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan3/elan3ops.c RH_2_6_9_55.HEAD/drivers/net/qsnet/elan3/elan3ops.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan3/elan3ops.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/elan3/elan3ops.c
@@ -0,0 +1,170 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -13124,9 +13144,9 @@ diff -urN clean/drivers/net/qsnet/elan3/elan3ops.c linux-2.6.9/drivers/net/qsnet
+ * c-file-style: "linux"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/elan3/elandebug.c linux-2.6.9/drivers/net/qsnet/elan3/elandebug.c
---- clean/drivers/net/qsnet/elan3/elandebug.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/elan3/elandebug.c 2003-09-24 09:57:25.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan3/elandebug.c RH_2_6_9_55.HEAD/drivers/net/qsnet/elan3/elandebug.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan3/elandebug.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/elan3/elandebug.c
@@ -0,0 +1,151 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -13279,9 +13299,9 @@ diff -urN clean/drivers/net/qsnet/elan3/elandebug.c linux-2.6.9/drivers/net/qsne
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/elan3/elandev_generic.c linux-2.6.9/drivers/net/qsnet/elan3/elandev_generic.c
---- clean/drivers/net/qsnet/elan3/elandev_generic.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/elan3/elandev_generic.c 2005-07-20 07:35:36.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan3/elandev_generic.c RH_2_6_9_55.HEAD/drivers/net/qsnet/elan3/elandev_generic.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan3/elandev_generic.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/elan3/elandev_generic.c
@@ -0,0 +1,1867 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -15150,9 +15170,9 @@ diff -urN clean/drivers/net/qsnet/elan3/elandev_generic.c linux-2.6.9/drivers/ne
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/elan3/elandev_linux.c linux-2.6.9/drivers/net/qsnet/elan3/elandev_linux.c
---- clean/drivers/net/qsnet/elan3/elandev_linux.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/elan3/elandev_linux.c 2005-09-07 10:35:03.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan3/elandev_linux.c RH_2_6_9_55.HEAD/drivers/net/qsnet/elan3/elandev_linux.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan3/elandev_linux.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/elan3/elandev_linux.c
@@ -0,0 +1,2395 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -17549,9 +17569,9 @@ diff -urN clean/drivers/net/qsnet/elan3/elandev_linux.c linux-2.6.9/drivers/net/
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/elan3/elansyscall.c linux-2.6.9/drivers/net/qsnet/elan3/elansyscall.c
---- clean/drivers/net/qsnet/elan3/elansyscall.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/elan3/elansyscall.c 2004-11-01 13:01:51.000000000 -0500
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan3/elansyscall.c RH_2_6_9_55.HEAD/drivers/net/qsnet/elan3/elansyscall.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan3/elansyscall.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/elan3/elansyscall.c
@@ -0,0 +1,1230 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -18783,9 +18803,9 @@ diff -urN clean/drivers/net/qsnet/elan3/elansyscall.c linux-2.6.9/drivers/net/qs
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/elan3/eventcookie.c linux-2.6.9/drivers/net/qsnet/elan3/eventcookie.c
---- clean/drivers/net/qsnet/elan3/eventcookie.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/elan3/eventcookie.c 2003-08-13 06:03:03.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan3/eventcookie.c RH_2_6_9_55.HEAD/drivers/net/qsnet/elan3/eventcookie.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan3/eventcookie.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/elan3/eventcookie.c
@@ -0,0 +1,324 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -19111,9 +19131,9 @@ diff -urN clean/drivers/net/qsnet/elan3/eventcookie.c linux-2.6.9/drivers/net/qs
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/elan3/iproc.c linux-2.6.9/drivers/net/qsnet/elan3/iproc.c
---- clean/drivers/net/qsnet/elan3/iproc.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/elan3/iproc.c 2003-09-24 09:57:25.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan3/iproc.c RH_2_6_9_55.HEAD/drivers/net/qsnet/elan3/iproc.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan3/iproc.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/elan3/iproc.c
@@ -0,0 +1,925 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -20040,9 +20060,9 @@ diff -urN clean/drivers/net/qsnet/elan3/iproc.c linux-2.6.9/drivers/net/qsnet/el
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/elan3/Makefile linux-2.6.9/drivers/net/qsnet/elan3/Makefile
---- clean/drivers/net/qsnet/elan3/Makefile 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/elan3/Makefile 2005-10-10 17:47:30.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan3/Makefile RH_2_6_9_55.HEAD/drivers/net/qsnet/elan3/Makefile
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan3/Makefile 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/elan3/Makefile
@@ -0,0 +1,15 @@
+#
+# Makefile for Quadrics QsNet
@@ -20059,9 +20079,9 @@ diff -urN clean/drivers/net/qsnet/elan3/Makefile linux-2.6.9/drivers/net/qsnet/e
+elan3-objs := context.o cproc.o dproc.o elandebug.o elandev_generic.o elansyscall.o eventcookie.o iproc.o sdram.o minames.o network_error.o route_table.o tproc.o tprocinsts.o routecheck.o virtual_process.o elan3ops.o context_linux.o elandev_linux.o procfs_linux.o tproc_linux.o elan3mmu_generic.o elan3mmu_linux.o
+
+EXTRA_CFLAGS += -DDEBUG -DDEBUG_PRINTF -DDEBUG_ASSERT
-diff -urN clean/drivers/net/qsnet/elan3/Makefile.conf linux-2.6.9/drivers/net/qsnet/elan3/Makefile.conf
---- clean/drivers/net/qsnet/elan3/Makefile.conf 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/elan3/Makefile.conf 2005-09-07 10:39:38.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan3/Makefile.conf RH_2_6_9_55.HEAD/drivers/net/qsnet/elan3/Makefile.conf
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan3/Makefile.conf 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/elan3/Makefile.conf
@@ -0,0 +1,10 @@
+# Flags for generating QsNet Linux Kernel Makefiles
+MODNAME = elan3.o
@@ -20073,9 +20093,9 @@ diff -urN clean/drivers/net/qsnet/elan3/Makefile.conf linux-2.6.9/drivers/net/qs
+# EXTRALINES START
+
+# EXTRALINES END
-diff -urN clean/drivers/net/qsnet/elan3/minames.c linux-2.6.9/drivers/net/qsnet/elan3/minames.c
---- clean/drivers/net/qsnet/elan3/minames.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/elan3/minames.c 2003-06-07 11:57:49.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan3/minames.c RH_2_6_9_55.HEAD/drivers/net/qsnet/elan3/minames.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan3/minames.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/elan3/minames.c
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -20115,9 +20135,9 @@ diff -urN clean/drivers/net/qsnet/elan3/minames.c linux-2.6.9/drivers/net/qsnet/
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/elan3/network_error.c linux-2.6.9/drivers/net/qsnet/elan3/network_error.c
---- clean/drivers/net/qsnet/elan3/network_error.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/elan3/network_error.c 2004-10-28 07:51:00.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan3/network_error.c RH_2_6_9_55.HEAD/drivers/net/qsnet/elan3/network_error.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan3/network_error.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/elan3/network_error.c
@@ -0,0 +1,777 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -20896,9 +20916,9 @@ diff -urN clean/drivers/net/qsnet/elan3/network_error.c linux-2.6.9/drivers/net/
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/elan3/procfs_linux.c linux-2.6.9/drivers/net/qsnet/elan3/procfs_linux.c
---- clean/drivers/net/qsnet/elan3/procfs_linux.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/elan3/procfs_linux.c 2005-09-07 10:35:03.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan3/procfs_linux.c RH_2_6_9_55.HEAD/drivers/net/qsnet/elan3/procfs_linux.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan3/procfs_linux.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/elan3/procfs_linux.c
@@ -0,0 +1,195 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -21095,14 +21115,14 @@ diff -urN clean/drivers/net/qsnet/elan3/procfs_linux.c linux-2.6.9/drivers/net/q
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/elan3/quadrics_version.h linux-2.6.9/drivers/net/qsnet/elan3/quadrics_version.h
---- clean/drivers/net/qsnet/elan3/quadrics_version.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/elan3/quadrics_version.h 2005-09-07 10:39:49.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan3/quadrics_version.h RH_2_6_9_55.HEAD/drivers/net/qsnet/elan3/quadrics_version.h
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan3/quadrics_version.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/elan3/quadrics_version.h
@@ -0,0 +1 @@
+#define QUADRICS_VERSION "5.11.3qsnet"
-diff -urN clean/drivers/net/qsnet/elan3/routecheck.c linux-2.6.9/drivers/net/qsnet/elan3/routecheck.c
---- clean/drivers/net/qsnet/elan3/routecheck.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/elan3/routecheck.c 2003-09-24 09:57:25.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan3/routecheck.c RH_2_6_9_55.HEAD/drivers/net/qsnet/elan3/routecheck.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan3/routecheck.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/elan3/routecheck.c
@@ -0,0 +1,313 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -21417,9 +21437,9 @@ diff -urN clean/drivers/net/qsnet/elan3/routecheck.c linux-2.6.9/drivers/net/qsn
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/elan3/route_table.c linux-2.6.9/drivers/net/qsnet/elan3/route_table.c
---- clean/drivers/net/qsnet/elan3/route_table.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/elan3/route_table.c 2003-09-24 09:57:25.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan3/route_table.c RH_2_6_9_55.HEAD/drivers/net/qsnet/elan3/route_table.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan3/route_table.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/elan3/route_table.c
@@ -0,0 +1,560 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -21981,9 +22001,9 @@ diff -urN clean/drivers/net/qsnet/elan3/route_table.c linux-2.6.9/drivers/net/qs
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/elan3/sdram.c linux-2.6.9/drivers/net/qsnet/elan3/sdram.c
---- clean/drivers/net/qsnet/elan3/sdram.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/elan3/sdram.c 2003-09-24 09:57:25.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan3/sdram.c RH_2_6_9_55.HEAD/drivers/net/qsnet/elan3/sdram.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan3/sdram.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/elan3/sdram.c
@@ -0,0 +1,807 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -22792,9 +22812,9 @@ diff -urN clean/drivers/net/qsnet/elan3/sdram.c linux-2.6.9/drivers/net/qsnet/el
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/elan3/tproc.c linux-2.6.9/drivers/net/qsnet/elan3/tproc.c
---- clean/drivers/net/qsnet/elan3/tproc.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/elan3/tproc.c 2004-11-15 06:14:12.000000000 -0500
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan3/tproc.c RH_2_6_9_55.HEAD/drivers/net/qsnet/elan3/tproc.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan3/tproc.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/elan3/tproc.c
@@ -0,0 +1,778 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -23574,9 +23594,9 @@ diff -urN clean/drivers/net/qsnet/elan3/tproc.c linux-2.6.9/drivers/net/qsnet/el
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/elan3/tprocinsts.c linux-2.6.9/drivers/net/qsnet/elan3/tprocinsts.c
---- clean/drivers/net/qsnet/elan3/tprocinsts.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/elan3/tprocinsts.c 2003-09-24 09:57:25.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan3/tprocinsts.c RH_2_6_9_55.HEAD/drivers/net/qsnet/elan3/tprocinsts.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan3/tprocinsts.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/elan3/tprocinsts.c
@@ -0,0 +1,401 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -23979,9 +23999,9 @@ diff -urN clean/drivers/net/qsnet/elan3/tprocinsts.c linux-2.6.9/drivers/net/qsn
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/elan3/tproc_linux.c linux-2.6.9/drivers/net/qsnet/elan3/tproc_linux.c
---- clean/drivers/net/qsnet/elan3/tproc_linux.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/elan3/tproc_linux.c 2005-05-31 06:29:07.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan3/tproc_linux.c RH_2_6_9_55.HEAD/drivers/net/qsnet/elan3/tproc_linux.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan3/tproc_linux.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/elan3/tproc_linux.c
@@ -0,0 +1,223 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -24206,9 +24226,9 @@ diff -urN clean/drivers/net/qsnet/elan3/tproc_linux.c linux-2.6.9/drivers/net/qs
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/elan3/virtual_process.c linux-2.6.9/drivers/net/qsnet/elan3/virtual_process.c
---- clean/drivers/net/qsnet/elan3/virtual_process.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/elan3/virtual_process.c 2004-06-07 09:50:10.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan3/virtual_process.c RH_2_6_9_55.HEAD/drivers/net/qsnet/elan3/virtual_process.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan3/virtual_process.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/elan3/virtual_process.c
@@ -0,0 +1,884 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -25094,9 +25114,9 @@ diff -urN clean/drivers/net/qsnet/elan3/virtual_process.c linux-2.6.9/drivers/ne
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/elan4/debug.c linux-2.6.9/drivers/net/qsnet/elan4/debug.c
---- clean/drivers/net/qsnet/elan4/debug.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/elan4/debug.c 2005-03-23 06:06:15.000000000 -0500
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan4/debug.c RH_2_6_9_55.HEAD/drivers/net/qsnet/elan4/debug.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan4/debug.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/elan4/debug.c
@@ -0,0 +1,146 @@
+/*
+ * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd.
@@ -25244,9 +25264,9 @@ diff -urN clean/drivers/net/qsnet/elan4/debug.c linux-2.6.9/drivers/net/qsnet/el
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/elan4/device.c linux-2.6.9/drivers/net/qsnet/elan4/device.c
---- clean/drivers/net/qsnet/elan4/device.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/elan4/device.c 2005-08-09 05:57:04.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan4/device.c RH_2_6_9_55.HEAD/drivers/net/qsnet/elan4/device.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan4/device.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/elan4/device.c
@@ -0,0 +1,3127 @@
+/*
+ * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd.
@@ -28375,9 +28395,9 @@ diff -urN clean/drivers/net/qsnet/elan4/device.c linux-2.6.9/drivers/net/qsnet/e
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/elan4/device_Linux.c linux-2.6.9/drivers/net/qsnet/elan4/device_Linux.c
---- clean/drivers/net/qsnet/elan4/device_Linux.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/elan4/device_Linux.c 2005-09-07 10:35:03.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan4/device_Linux.c RH_2_6_9_55.HEAD/drivers/net/qsnet/elan4/device_Linux.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan4/device_Linux.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/elan4/device_Linux.c
@@ -0,0 +1,3034 @@
+/*
+ * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd.
@@ -31413,9 +31433,9 @@ diff -urN clean/drivers/net/qsnet/elan4/device_Linux.c linux-2.6.9/drivers/net/q
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/elan4/i2c.c linux-2.6.9/drivers/net/qsnet/elan4/i2c.c
---- clean/drivers/net/qsnet/elan4/i2c.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/elan4/i2c.c 2004-01-07 08:37:45.000000000 -0500
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan4/i2c.c RH_2_6_9_55.HEAD/drivers/net/qsnet/elan4/i2c.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan4/i2c.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/elan4/i2c.c
@@ -0,0 +1,248 @@
+/*
+ * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd.
@@ -31665,9 +31685,9 @@ diff -urN clean/drivers/net/qsnet/elan4/i2c.c linux-2.6.9/drivers/net/qsnet/elan
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/elan4/intcookie.c linux-2.6.9/drivers/net/qsnet/elan4/intcookie.c
---- clean/drivers/net/qsnet/elan4/intcookie.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/elan4/intcookie.c 2005-02-03 11:24:44.000000000 -0500
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan4/intcookie.c RH_2_6_9_55.HEAD/drivers/net/qsnet/elan4/intcookie.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan4/intcookie.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/elan4/intcookie.c
@@ -0,0 +1,371 @@
+/*
+ * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd.
@@ -32040,9 +32060,9 @@ diff -urN clean/drivers/net/qsnet/elan4/intcookie.c linux-2.6.9/drivers/net/qsne
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/elan4/Makefile linux-2.6.9/drivers/net/qsnet/elan4/Makefile
---- clean/drivers/net/qsnet/elan4/Makefile 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/elan4/Makefile 2005-10-10 17:47:30.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan4/Makefile RH_2_6_9_55.HEAD/drivers/net/qsnet/elan4/Makefile
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan4/Makefile 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/elan4/Makefile
@@ -0,0 +1,15 @@
+#
+# Makefile for Quadrics QsNet
@@ -32059,9 +32079,9 @@ diff -urN clean/drivers/net/qsnet/elan4/Makefile linux-2.6.9/drivers/net/qsnet/e
+elan4-objs := device.o i2c.o mmu.o sdram.o debug.o routetable.o trap.o user.o user_ddcq.o regions.o intcookie.o neterr.o device_Linux.o user_Linux.o procfs_Linux.o mmu_Linux.o
+
+EXTRA_CFLAGS += -DDEBUG -DDEBUG_PRINTF -DDEBUG_ASSERT
-diff -urN clean/drivers/net/qsnet/elan4/Makefile.conf linux-2.6.9/drivers/net/qsnet/elan4/Makefile.conf
---- clean/drivers/net/qsnet/elan4/Makefile.conf 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/elan4/Makefile.conf 2005-09-07 10:39:42.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan4/Makefile.conf RH_2_6_9_55.HEAD/drivers/net/qsnet/elan4/Makefile.conf
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan4/Makefile.conf 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/elan4/Makefile.conf
@@ -0,0 +1,10 @@
+# Flags for generating QsNet Linux Kernel Makefiles
+MODNAME = elan4.o
@@ -32073,9 +32093,9 @@ diff -urN clean/drivers/net/qsnet/elan4/Makefile.conf linux-2.6.9/drivers/net/qs
+# EXTRALINES START
+
+# EXTRALINES END
-diff -urN clean/drivers/net/qsnet/elan4/mmu.c linux-2.6.9/drivers/net/qsnet/elan4/mmu.c
---- clean/drivers/net/qsnet/elan4/mmu.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/elan4/mmu.c 2005-07-14 09:34:12.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan4/mmu.c RH_2_6_9_55.HEAD/drivers/net/qsnet/elan4/mmu.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan4/mmu.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/elan4/mmu.c
@@ -0,0 +1,1552 @@
+/*
+ * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd.
@@ -33629,9 +33649,9 @@ diff -urN clean/drivers/net/qsnet/elan4/mmu.c linux-2.6.9/drivers/net/qsnet/elan
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/elan4/mmu_Linux.c linux-2.6.9/drivers/net/qsnet/elan4/mmu_Linux.c
---- clean/drivers/net/qsnet/elan4/mmu_Linux.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/elan4/mmu_Linux.c 2005-07-14 09:34:12.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan4/mmu_Linux.c RH_2_6_9_55.HEAD/drivers/net/qsnet/elan4/mmu_Linux.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan4/mmu_Linux.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/elan4/mmu_Linux.c
@@ -0,0 +1,262 @@
+/*
+ * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd.
@@ -33895,9 +33915,9 @@ diff -urN clean/drivers/net/qsnet/elan4/mmu_Linux.c linux-2.6.9/drivers/net/qsne
+
+EXPORT_SYMBOL(elan4mmu_phys2pte);
+EXPORT_SYMBOL(elan4mmu_pte2phys);
-diff -urN clean/drivers/net/qsnet/elan4/neterr.c linux-2.6.9/drivers/net/qsnet/elan4/neterr.c
---- clean/drivers/net/qsnet/elan4/neterr.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/elan4/neterr.c 2005-07-20 07:35:36.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan4/neterr.c RH_2_6_9_55.HEAD/drivers/net/qsnet/elan4/neterr.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan4/neterr.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/elan4/neterr.c
@@ -0,0 +1,270 @@
+/*
+ * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd.
@@ -34169,9 +34189,9 @@ diff -urN clean/drivers/net/qsnet/elan4/neterr.c linux-2.6.9/drivers/net/qsnet/e
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/elan4/procfs_Linux.c linux-2.6.9/drivers/net/qsnet/elan4/procfs_Linux.c
---- clean/drivers/net/qsnet/elan4/procfs_Linux.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/elan4/procfs_Linux.c 2005-09-07 10:35:03.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan4/procfs_Linux.c RH_2_6_9_55.HEAD/drivers/net/qsnet/elan4/procfs_Linux.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan4/procfs_Linux.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/elan4/procfs_Linux.c
@@ -0,0 +1,1426 @@
+/*
+ * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd.
@@ -35599,14 +35619,14 @@ diff -urN clean/drivers/net/qsnet/elan4/procfs_Linux.c linux-2.6.9/drivers/net/q
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/elan4/quadrics_version.h linux-2.6.9/drivers/net/qsnet/elan4/quadrics_version.h
---- clean/drivers/net/qsnet/elan4/quadrics_version.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/elan4/quadrics_version.h 2005-09-07 10:39:49.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan4/quadrics_version.h RH_2_6_9_55.HEAD/drivers/net/qsnet/elan4/quadrics_version.h
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan4/quadrics_version.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/elan4/quadrics_version.h
@@ -0,0 +1 @@
+#define QUADRICS_VERSION "5.11.3qsnet"
-diff -urN clean/drivers/net/qsnet/elan4/regions.c linux-2.6.9/drivers/net/qsnet/elan4/regions.c
---- clean/drivers/net/qsnet/elan4/regions.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/elan4/regions.c 2004-10-21 11:31:12.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan4/regions.c RH_2_6_9_55.HEAD/drivers/net/qsnet/elan4/regions.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan4/regions.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/elan4/regions.c
@@ -0,0 +1,609 @@
+/*
+ * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd.
@@ -36217,9 +36237,9 @@ diff -urN clean/drivers/net/qsnet/elan4/regions.c linux-2.6.9/drivers/net/qsnet/
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/elan4/routetable.c linux-2.6.9/drivers/net/qsnet/elan4/routetable.c
---- clean/drivers/net/qsnet/elan4/routetable.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/elan4/routetable.c 2005-04-15 08:38:22.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan4/routetable.c RH_2_6_9_55.HEAD/drivers/net/qsnet/elan4/routetable.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan4/routetable.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/elan4/routetable.c
@@ -0,0 +1,254 @@
+/*
+ * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd.
@@ -36475,9 +36495,9 @@ diff -urN clean/drivers/net/qsnet/elan4/routetable.c linux-2.6.9/drivers/net/qsn
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/elan4/sdram.c linux-2.6.9/drivers/net/qsnet/elan4/sdram.c
---- clean/drivers/net/qsnet/elan4/sdram.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/elan4/sdram.c 2005-07-20 07:35:36.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan4/sdram.c RH_2_6_9_55.HEAD/drivers/net/qsnet/elan4/sdram.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan4/sdram.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/elan4/sdram.c
@@ -0,0 +1,1039 @@
+/*
+ * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd.
@@ -37518,9 +37538,9 @@ diff -urN clean/drivers/net/qsnet/elan4/sdram.c linux-2.6.9/drivers/net/qsnet/el
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/elan4/trap.c linux-2.6.9/drivers/net/qsnet/elan4/trap.c
---- clean/drivers/net/qsnet/elan4/trap.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/elan4/trap.c 2005-07-20 07:35:36.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan4/trap.c RH_2_6_9_55.HEAD/drivers/net/qsnet/elan4/trap.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan4/trap.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/elan4/trap.c
@@ -0,0 +1,781 @@
+/*
+ * Copyright (c) 2002-2003 by Quadrics Ltd.
@@ -38303,9 +38323,9 @@ diff -urN clean/drivers/net/qsnet/elan4/trap.c linux-2.6.9/drivers/net/qsnet/ela
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/elan4/user.c linux-2.6.9/drivers/net/qsnet/elan4/user.c
---- clean/drivers/net/qsnet/elan4/user.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/elan4/user.c 2005-07-19 09:45:36.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan4/user.c RH_2_6_9_55.HEAD/drivers/net/qsnet/elan4/user.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan4/user.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/elan4/user.c
@@ -0,0 +1,3443 @@
+/*
+ * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd.
@@ -41750,9 +41770,9 @@ diff -urN clean/drivers/net/qsnet/elan4/user.c linux-2.6.9/drivers/net/qsnet/ela
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/elan4/user_ddcq.c linux-2.6.9/drivers/net/qsnet/elan4/user_ddcq.c
---- clean/drivers/net/qsnet/elan4/user_ddcq.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/elan4/user_ddcq.c 2005-07-20 07:35:36.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan4/user_ddcq.c RH_2_6_9_55.HEAD/drivers/net/qsnet/elan4/user_ddcq.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan4/user_ddcq.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/elan4/user_ddcq.c
@@ -0,0 +1,230 @@
+/*
+ * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd.
@@ -41984,9 +42004,9 @@ diff -urN clean/drivers/net/qsnet/elan4/user_ddcq.c linux-2.6.9/drivers/net/qsne
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/elan4/user_Linux.c linux-2.6.9/drivers/net/qsnet/elan4/user_Linux.c
---- clean/drivers/net/qsnet/elan4/user_Linux.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/elan4/user_Linux.c 2005-06-09 10:46:55.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan4/user_Linux.c RH_2_6_9_55.HEAD/drivers/net/qsnet/elan4/user_Linux.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/elan4/user_Linux.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/elan4/user_Linux.c
@@ -0,0 +1,349 @@
+/*
+ * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd.
@@ -42337,9 +42357,9 @@ diff -urN clean/drivers/net/qsnet/elan4/user_Linux.c linux-2.6.9/drivers/net/qsn
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/ep/asm_elan4_thread.S linux-2.6.9/drivers/net/qsnet/ep/asm_elan4_thread.S
---- clean/drivers/net/qsnet/ep/asm_elan4_thread.S 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/asm_elan4_thread.S 2003-09-23 09:55:11.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/asm_elan4_thread.S RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/asm_elan4_thread.S
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/asm_elan4_thread.S 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/asm_elan4_thread.S
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -42419,9 +42439,9 @@ diff -urN clean/drivers/net/qsnet/ep/asm_elan4_thread.S linux-2.6.9/drivers/net/
+ jmpl %r2+8, %r0 // and return
+ add %sp, 192, %sp
+
-diff -urN clean/drivers/net/qsnet/ep/assym_elan4.h linux-2.6.9/drivers/net/qsnet/ep/assym_elan4.h
---- clean/drivers/net/qsnet/ep/assym_elan4.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/assym_elan4.h 2005-09-07 10:39:44.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/assym_elan4.h RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/assym_elan4.h
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/assym_elan4.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/assym_elan4.h
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -42443,9 +42463,9 @@ diff -urN clean/drivers/net/qsnet/ep/assym_elan4.h linux-2.6.9/drivers/net/qsnet
+#define EP4_RXD_NEXT 664
+#define EP4_RXD_QUEUED 728
+#define EP4_RXD_DEBUG 944
-diff -urN clean/drivers/net/qsnet/ep/cm.c linux-2.6.9/drivers/net/qsnet/ep/cm.c
---- clean/drivers/net/qsnet/ep/cm.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/cm.c 2005-05-24 05:19:12.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/cm.c RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/cm.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/cm.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/cm.c
@@ -0,0 +1,2835 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -45282,9 +45302,9 @@ diff -urN clean/drivers/net/qsnet/ep/cm.c linux-2.6.9/drivers/net/qsnet/ep/cm.c
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/ep/cm.h linux-2.6.9/drivers/net/qsnet/ep/cm.h
---- clean/drivers/net/qsnet/ep/cm.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/cm.h 2005-03-30 09:06:34.000000000 -0500
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/cm.h RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/cm.h
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/cm.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/cm.h
@@ -0,0 +1,396 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -45682,9 +45702,9 @@ diff -urN clean/drivers/net/qsnet/ep/cm.h linux-2.6.9/drivers/net/qsnet/ep/cm.h
+ */
+#endif /* __ELAN_CM_H */
+
-diff -urN clean/drivers/net/qsnet/ep/cm_procfs.c linux-2.6.9/drivers/net/qsnet/ep/cm_procfs.c
---- clean/drivers/net/qsnet/ep/cm_procfs.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/cm_procfs.c 2004-05-14 05:23:13.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/cm_procfs.c RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/cm_procfs.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/cm_procfs.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/cm_procfs.c
@@ -0,0 +1,254 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -45940,9 +45960,9 @@ diff -urN clean/drivers/net/qsnet/ep/cm_procfs.c linux-2.6.9/drivers/net/qsnet/e
+
+ remove_proc_entry ("machine_id", ep_config_root);
+}
-diff -urN clean/drivers/net/qsnet/ep/commands_elan4.c linux-2.6.9/drivers/net/qsnet/ep/commands_elan4.c
---- clean/drivers/net/qsnet/ep/commands_elan4.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/commands_elan4.c 2005-07-20 08:01:33.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/commands_elan4.c RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/commands_elan4.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/commands_elan4.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/commands_elan4.c
@@ -0,0 +1,173 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -46117,9 +46137,9 @@ diff -urN clean/drivers/net/qsnet/ep/commands_elan4.c linux-2.6.9/drivers/net/qs
+ elan4_command_write (cq, *ptr++, i);
+}
+
-diff -urN clean/drivers/net/qsnet/ep/conf_linux.c linux-2.6.9/drivers/net/qsnet/ep/conf_linux.c
---- clean/drivers/net/qsnet/ep/conf_linux.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/conf_linux.c 2005-09-07 10:35:03.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/conf_linux.c RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/conf_linux.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/conf_linux.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/conf_linux.c
@@ -0,0 +1,311 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -46432,9 +46452,9 @@ diff -urN clean/drivers/net/qsnet/ep/conf_linux.c linux-2.6.9/drivers/net/qsnet/
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/ep/conf_linux.h linux-2.6.9/drivers/net/qsnet/ep/conf_linux.h
---- clean/drivers/net/qsnet/ep/conf_linux.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/conf_linux.h 2003-10-02 10:16:07.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/conf_linux.h RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/conf_linux.h
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/conf_linux.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/conf_linux.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -46465,9 +46485,9 @@ diff -urN clean/drivers/net/qsnet/ep/conf_linux.h linux-2.6.9/drivers/net/qsnet/
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/ep/debug.c linux-2.6.9/drivers/net/qsnet/ep/debug.c
---- clean/drivers/net/qsnet/ep/debug.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/debug.c 2004-11-12 05:55:03.000000000 -0500
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/debug.c RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/debug.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/debug.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/debug.c
@@ -0,0 +1,145 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -46614,9 +46634,9 @@ diff -urN clean/drivers/net/qsnet/ep/debug.c linux-2.6.9/drivers/net/qsnet/ep/de
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/ep/debug_elan4.c linux-2.6.9/drivers/net/qsnet/ep/debug_elan4.c
---- clean/drivers/net/qsnet/ep/debug_elan4.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/debug_elan4.c 2004-05-19 06:21:04.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/debug_elan4.c RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/debug_elan4.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/debug_elan4.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/debug_elan4.c
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -46677,9 +46697,9 @@ diff -urN clean/drivers/net/qsnet/ep/debug_elan4.c linux-2.6.9/drivers/net/qsnet
+ ep_display_rmap (rail->r_generic.ElanAllocator.ResourceMap);
+}
+
-diff -urN clean/drivers/net/qsnet/ep/debug.h linux-2.6.9/drivers/net/qsnet/ep/debug.h
---- clean/drivers/net/qsnet/ep/debug.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/debug.h 2005-04-05 12:36:28.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/debug.h RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/debug.h
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/debug.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/debug.h
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -46792,9 +46812,9 @@ diff -urN clean/drivers/net/qsnet/ep/debug.h linux-2.6.9/drivers/net/qsnet/ep/de
+ */
+#endif /* _ELAN3_EPDEBUG_H */
+
-diff -urN clean/drivers/net/qsnet/ep/epcomms_asm_elan4_thread.S linux-2.6.9/drivers/net/qsnet/ep/epcomms_asm_elan4_thread.S
---- clean/drivers/net/qsnet/ep/epcomms_asm_elan4_thread.S 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/epcomms_asm_elan4_thread.S 2004-04-25 07:25:43.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/epcomms_asm_elan4_thread.S RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/epcomms_asm_elan4_thread.S
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/epcomms_asm_elan4_thread.S 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/epcomms_asm_elan4_thread.S
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -46929,9 +46949,9 @@ diff -urN clean/drivers/net/qsnet/ep/epcomms_asm_elan4_thread.S linux-2.6.9/driv
+ jmpl %r7+8, %r0 // and return
+ add %sp, 192, %sp
+
-diff -urN clean/drivers/net/qsnet/ep/epcomms.c linux-2.6.9/drivers/net/qsnet/ep/epcomms.c
---- clean/drivers/net/qsnet/ep/epcomms.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/epcomms.c 2004-11-30 07:02:06.000000000 -0500
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/epcomms.c RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/epcomms.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/epcomms.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/epcomms.c
@@ -0,0 +1,484 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -47417,9 +47437,9 @@ diff -urN clean/drivers/net/qsnet/ep/epcomms.c linux-2.6.9/drivers/net/qsnet/ep/
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/ep/epcomms_elan3.c linux-2.6.9/drivers/net/qsnet/ep/epcomms_elan3.c
---- clean/drivers/net/qsnet/ep/epcomms_elan3.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/epcomms_elan3.c 2004-08-03 07:34:34.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/epcomms_elan3.c RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/epcomms_elan3.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/epcomms_elan3.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/epcomms_elan3.c
@@ -0,0 +1,191 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -47612,9 +47632,9 @@ diff -urN clean/drivers/net/qsnet/ep/epcomms_elan3.c linux-2.6.9/drivers/net/qsn
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/ep/epcomms_elan3.h linux-2.6.9/drivers/net/qsnet/ep/epcomms_elan3.h
---- clean/drivers/net/qsnet/ep/epcomms_elan3.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/epcomms_elan3.h 2004-11-12 05:55:03.000000000 -0500
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/epcomms_elan3.h RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/epcomms_elan3.h
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/epcomms_elan3.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/epcomms_elan3.h
@@ -0,0 +1,330 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -47946,9 +47966,9 @@ diff -urN clean/drivers/net/qsnet/ep/epcomms_elan3.h linux-2.6.9/drivers/net/qsn
+ * End:
+ */
+#endif /* __EPCOMMS_ELAN3_H */
-diff -urN clean/drivers/net/qsnet/ep/epcomms_elan3_thread.c linux-2.6.9/drivers/net/qsnet/ep/epcomms_elan3_thread.c
---- clean/drivers/net/qsnet/ep/epcomms_elan3_thread.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/epcomms_elan3_thread.c 2004-01-20 06:03:15.000000000 -0500
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/epcomms_elan3_thread.c RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/epcomms_elan3_thread.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/epcomms_elan3_thread.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/epcomms_elan3_thread.c
@@ -0,0 +1,296 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -48246,9 +48266,9 @@ diff -urN clean/drivers/net/qsnet/ep/epcomms_elan3_thread.c linux-2.6.9/drivers/
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/ep/epcomms_elan4.c linux-2.6.9/drivers/net/qsnet/ep/epcomms_elan4.c
---- clean/drivers/net/qsnet/ep/epcomms_elan4.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/epcomms_elan4.c 2005-08-09 05:57:14.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/epcomms_elan4.c RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/epcomms_elan4.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/epcomms_elan4.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/epcomms_elan4.c
@@ -0,0 +1,393 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -48643,9 +48663,9 @@ diff -urN clean/drivers/net/qsnet/ep/epcomms_elan4.c linux-2.6.9/drivers/net/qsn
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/ep/epcomms_elan4.h linux-2.6.9/drivers/net/qsnet/ep/epcomms_elan4.h
---- clean/drivers/net/qsnet/ep/epcomms_elan4.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/epcomms_elan4.h 2005-03-22 11:47:36.000000000 -0500
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/epcomms_elan4.h RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/epcomms_elan4.h
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/epcomms_elan4.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/epcomms_elan4.h
@@ -0,0 +1,471 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -49118,9 +49138,9 @@ diff -urN clean/drivers/net/qsnet/ep/epcomms_elan4.h linux-2.6.9/drivers/net/qsn
+ * End:
+ */
+#endif /* __EPCOMMS_ELAN4_H */
-diff -urN clean/drivers/net/qsnet/ep/epcomms_elan4_thread.c linux-2.6.9/drivers/net/qsnet/ep/epcomms_elan4_thread.c
---- clean/drivers/net/qsnet/ep/epcomms_elan4_thread.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/epcomms_elan4_thread.c 2005-03-22 09:41:55.000000000 -0500
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/epcomms_elan4_thread.c RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/epcomms_elan4_thread.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/epcomms_elan4_thread.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/epcomms_elan4_thread.c
@@ -0,0 +1,347 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -49469,9 +49489,9 @@ diff -urN clean/drivers/net/qsnet/ep/epcomms_elan4_thread.c linux-2.6.9/drivers/
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/ep/epcommsFwd.c linux-2.6.9/drivers/net/qsnet/ep/epcommsFwd.c
---- clean/drivers/net/qsnet/ep/epcommsFwd.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/epcommsFwd.c 2005-07-20 08:01:34.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/epcommsFwd.c RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/epcommsFwd.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/epcommsFwd.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/epcommsFwd.c
@@ -0,0 +1,310 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -49783,9 +49803,9 @@ diff -urN clean/drivers/net/qsnet/ep/epcommsFwd.c linux-2.6.9/drivers/net/qsnet/
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/ep/epcommsRx.c linux-2.6.9/drivers/net/qsnet/ep/epcommsRx.c
---- clean/drivers/net/qsnet/ep/epcommsRx.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/epcommsRx.c 2004-11-30 07:02:06.000000000 -0500
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/epcommsRx.c RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/epcommsRx.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/epcommsRx.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/epcommsRx.c
@@ -0,0 +1,1205 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -50992,9 +51012,9 @@ diff -urN clean/drivers/net/qsnet/ep/epcommsRx.c linux-2.6.9/drivers/net/qsnet/e
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/ep/epcommsRx_elan3.c linux-2.6.9/drivers/net/qsnet/ep/epcommsRx_elan3.c
---- clean/drivers/net/qsnet/ep/epcommsRx_elan3.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/epcommsRx_elan3.c 2005-03-10 10:25:52.000000000 -0500
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/epcommsRx_elan3.c RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/epcommsRx_elan3.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/epcommsRx_elan3.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/epcommsRx_elan3.c
@@ -0,0 +1,1776 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -52772,9 +52792,9 @@ diff -urN clean/drivers/net/qsnet/ep/epcommsRx_elan3.c linux-2.6.9/drivers/net/q
+ /* EP3_RCVR_RAIL * ep4rcvr_rail = (EP3_RCVR_RAIL *) rcvr_rail; */
+}
+
-diff -urN clean/drivers/net/qsnet/ep/epcommsRx_elan4.c linux-2.6.9/drivers/net/qsnet/ep/epcommsRx_elan4.c
---- clean/drivers/net/qsnet/ep/epcommsRx_elan4.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/epcommsRx_elan4.c 2005-07-20 07:35:37.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/epcommsRx_elan4.c RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/epcommsRx_elan4.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/epcommsRx_elan4.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/epcommsRx_elan4.c
@@ -0,0 +1,1765 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -54541,9 +54561,9 @@ diff -urN clean/drivers/net/qsnet/ep/epcommsRx_elan4.c linux-2.6.9/drivers/net/q
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/ep/epcommsTx.c linux-2.6.9/drivers/net/qsnet/ep/epcommsTx.c
---- clean/drivers/net/qsnet/ep/epcommsTx.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/epcommsTx.c 2005-09-02 07:04:02.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/epcommsTx.c RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/epcommsTx.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/epcommsTx.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/epcommsTx.c
@@ -0,0 +1,919 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -55464,9 +55484,9 @@ diff -urN clean/drivers/net/qsnet/ep/epcommsTx.c linux-2.6.9/drivers/net/qsnet/e
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/ep/epcommsTx_elan3.c linux-2.6.9/drivers/net/qsnet/ep/epcommsTx_elan3.c
---- clean/drivers/net/qsnet/ep/epcommsTx_elan3.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/epcommsTx_elan3.c 2004-11-12 05:55:03.000000000 -0500
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/epcommsTx_elan3.c RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/epcommsTx_elan3.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/epcommsTx_elan3.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/epcommsTx_elan3.c
@@ -0,0 +1,1173 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -56641,9 +56661,9 @@ diff -urN clean/drivers/net/qsnet/ep/epcommsTx_elan3.c linux-2.6.9/drivers/net/q
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/ep/epcommsTx_elan4.c linux-2.6.9/drivers/net/qsnet/ep/epcommsTx_elan4.c
---- clean/drivers/net/qsnet/ep/epcommsTx_elan4.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/epcommsTx_elan4.c 2005-07-20 07:35:37.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/epcommsTx_elan4.c RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/epcommsTx_elan4.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/epcommsTx_elan4.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/epcommsTx_elan4.c
@@ -0,0 +1,1389 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -58034,9 +58054,9 @@ diff -urN clean/drivers/net/qsnet/ep/epcommsTx_elan4.c linux-2.6.9/drivers/net/q
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/ep/ep_procfs.c linux-2.6.9/drivers/net/qsnet/ep/ep_procfs.c
---- clean/drivers/net/qsnet/ep/ep_procfs.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/ep_procfs.c 2005-03-30 09:06:34.000000000 -0500
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/ep_procfs.c RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/ep_procfs.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/ep_procfs.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/ep_procfs.c
@@ -0,0 +1,331 @@
+
+/*
@@ -58369,9 +58389,9 @@ diff -urN clean/drivers/net/qsnet/ep/ep_procfs.c linux-2.6.9/drivers/net/qsnet/e
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/ep/kalloc.c linux-2.6.9/drivers/net/qsnet/ep/kalloc.c
---- clean/drivers/net/qsnet/ep/kalloc.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/kalloc.c 2004-12-14 05:19:23.000000000 -0500
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/kalloc.c RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/kalloc.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/kalloc.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/kalloc.c
@@ -0,0 +1,677 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -59050,9 +59070,9 @@ diff -urN clean/drivers/net/qsnet/ep/kalloc.c linux-2.6.9/drivers/net/qsnet/ep/k
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/ep/kcomm.c linux-2.6.9/drivers/net/qsnet/ep/kcomm.c
---- clean/drivers/net/qsnet/ep/kcomm.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/kcomm.c 2005-07-20 08:01:34.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/kcomm.c RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/kcomm.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/kcomm.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/kcomm.c
@@ -0,0 +1,1447 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -60501,9 +60521,9 @@ diff -urN clean/drivers/net/qsnet/ep/kcomm.c linux-2.6.9/drivers/net/qsnet/ep/kc
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/ep/kcomm_elan3.c linux-2.6.9/drivers/net/qsnet/ep/kcomm_elan3.c
---- clean/drivers/net/qsnet/ep/kcomm_elan3.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/kcomm_elan3.c 2004-11-30 07:02:06.000000000 -0500
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/kcomm_elan3.c RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/kcomm_elan3.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/kcomm_elan3.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/kcomm_elan3.c
@@ -0,0 +1,504 @@
+
+/*
@@ -61009,9 +61029,9 @@ diff -urN clean/drivers/net/qsnet/ep/kcomm_elan3.c linux-2.6.9/drivers/net/qsnet
+ /* no stats here yet */
+ /* EP3_RAIL *ep3rail = (EP3_RAIL *)r; */
+}
-diff -urN clean/drivers/net/qsnet/ep/kcomm_elan3.h linux-2.6.9/drivers/net/qsnet/ep/kcomm_elan3.h
---- clean/drivers/net/qsnet/ep/kcomm_elan3.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/kcomm_elan3.h 2004-12-14 05:19:23.000000000 -0500
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/kcomm_elan3.h RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/kcomm_elan3.h
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/kcomm_elan3.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/kcomm_elan3.h
@@ -0,0 +1,431 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -61444,9 +61464,9 @@ diff -urN clean/drivers/net/qsnet/ep/kcomm_elan3.h linux-2.6.9/drivers/net/qsnet
+#endif /* !defined(__ELAN3__) */
+
+#endif /* __EP_KCOMM_ELAN3_H */
-diff -urN clean/drivers/net/qsnet/ep/kcomm_elan4.c linux-2.6.9/drivers/net/qsnet/ep/kcomm_elan4.c
---- clean/drivers/net/qsnet/ep/kcomm_elan4.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/kcomm_elan4.c 2004-11-30 07:02:06.000000000 -0500
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/kcomm_elan4.c RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/kcomm_elan4.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/kcomm_elan4.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/kcomm_elan4.c
@@ -0,0 +1,526 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -61974,9 +61994,9 @@ diff -urN clean/drivers/net/qsnet/ep/kcomm_elan4.c linux-2.6.9/drivers/net/qsnet
+ /* no stats here yet */
+ /* EP4_RAIL *ep4rail = (EP4_RAIL *)r; */
+}
-diff -urN clean/drivers/net/qsnet/ep/kcomm_elan4.h linux-2.6.9/drivers/net/qsnet/ep/kcomm_elan4.h
---- clean/drivers/net/qsnet/ep/kcomm_elan4.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/kcomm_elan4.h 2005-07-20 08:01:34.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/kcomm_elan4.h RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/kcomm_elan4.h
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/kcomm_elan4.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/kcomm_elan4.h
@@ -0,0 +1,443 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -62421,9 +62441,9 @@ diff -urN clean/drivers/net/qsnet/ep/kcomm_elan4.h linux-2.6.9/drivers/net/qsnet
+#endif /* ! defined(__elan4__) */
+
+#endif /* __EP_KCOMM_ELAN4_H */
-diff -urN clean/drivers/net/qsnet/ep/kcomm_vp.h linux-2.6.9/drivers/net/qsnet/ep/kcomm_vp.h
---- clean/drivers/net/qsnet/ep/kcomm_vp.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/kcomm_vp.h 2004-03-24 06:32:56.000000000 -0500
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/kcomm_vp.h RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/kcomm_vp.h
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/kcomm_vp.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/kcomm_vp.h
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -62461,9 +62481,9 @@ diff -urN clean/drivers/net/qsnet/ep/kcomm_vp.h linux-2.6.9/drivers/net/qsnet/ep
+#endif /* __EP_KCOMM_VP_H */
+
+
-diff -urN clean/drivers/net/qsnet/ep/kmap.c linux-2.6.9/drivers/net/qsnet/ep/kmap.c
---- clean/drivers/net/qsnet/ep/kmap.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/kmap.c 2004-12-14 05:19:23.000000000 -0500
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/kmap.c RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/kmap.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/kmap.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/kmap.c
@@ -0,0 +1,561 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -63026,9 +63046,9 @@ diff -urN clean/drivers/net/qsnet/ep/kmap.c linux-2.6.9/drivers/net/qsnet/ep/kma
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/ep/kmap_elan3.c linux-2.6.9/drivers/net/qsnet/ep/kmap_elan3.c
---- clean/drivers/net/qsnet/ep/kmap_elan3.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/kmap_elan3.c 2004-12-14 05:19:23.000000000 -0500
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/kmap_elan3.c RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/kmap_elan3.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/kmap_elan3.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/kmap_elan3.c
@@ -0,0 +1,209 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -63239,9 +63259,9 @@ diff -urN clean/drivers/net/qsnet/ep/kmap_elan3.c linux-2.6.9/drivers/net/qsnet/
+ for (i = (npages * ELAN3_PTES_PER_PAGE) - 1; i >= 0; i--)
+ elan3_writepte (rail->Device, ptep[i], tpte);
+}
-diff -urN clean/drivers/net/qsnet/ep/kmap_elan4.c linux-2.6.9/drivers/net/qsnet/ep/kmap_elan4.c
---- clean/drivers/net/qsnet/ep/kmap_elan4.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/kmap_elan4.c 2005-07-20 07:35:37.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/kmap_elan4.c RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/kmap_elan4.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/kmap_elan4.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/kmap_elan4.c
@@ -0,0 +1,224 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -63467,9 +63487,9 @@ diff -urN clean/drivers/net/qsnet/ep/kmap_elan4.c linux-2.6.9/drivers/net/qsnet/
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/ep/kmsg_elan3.c linux-2.6.9/drivers/net/qsnet/ep/kmsg_elan3.c
---- clean/drivers/net/qsnet/ep/kmsg_elan3.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/kmsg_elan3.c 2005-07-19 10:26:48.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/kmsg_elan3.c RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/kmsg_elan3.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/kmsg_elan3.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/kmsg_elan3.c
@@ -0,0 +1,348 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -63819,9 +63839,9 @@ diff -urN clean/drivers/net/qsnet/ep/kmsg_elan3.c linux-2.6.9/drivers/net/qsnet/
+
+ return TRUE;
+}
-diff -urN clean/drivers/net/qsnet/ep/kmsg_elan4.c linux-2.6.9/drivers/net/qsnet/ep/kmsg_elan4.c
---- clean/drivers/net/qsnet/ep/kmsg_elan4.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/kmsg_elan4.c 2005-02-28 09:05:38.000000000 -0500
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/kmsg_elan4.c RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/kmsg_elan4.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/kmsg_elan4.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/kmsg_elan4.c
@@ -0,0 +1,418 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -64241,9 +64261,9 @@ diff -urN clean/drivers/net/qsnet/ep/kmsg_elan4.c linux-2.6.9/drivers/net/qsnet/
+
+ return 1;
+}
-diff -urN clean/drivers/net/qsnet/ep/kthread.c linux-2.6.9/drivers/net/qsnet/ep/kthread.c
---- clean/drivers/net/qsnet/ep/kthread.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/kthread.c 2004-05-19 04:54:57.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/kthread.c RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/kthread.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/kthread.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/kthread.c
@@ -0,0 +1,186 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -64431,9 +64451,9 @@ diff -urN clean/drivers/net/qsnet/ep/kthread.c linux-2.6.9/drivers/net/qsnet/ep/
+ * c-file-style: "linux"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/ep/kthread.h linux-2.6.9/drivers/net/qsnet/ep/kthread.h
---- clean/drivers/net/qsnet/ep/kthread.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/kthread.h 2004-05-06 10:24:08.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/kthread.h RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/kthread.h
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/kthread.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/kthread.h
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -64488,9 +64508,9 @@ diff -urN clean/drivers/net/qsnet/ep/kthread.h linux-2.6.9/drivers/net/qsnet/ep/
+ * c-file-style: "linux"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/ep/Makefile linux-2.6.9/drivers/net/qsnet/ep/Makefile
---- clean/drivers/net/qsnet/ep/Makefile 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/Makefile 2005-10-10 17:47:31.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/Makefile RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/Makefile
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/Makefile 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/Makefile
@@ -0,0 +1,17 @@
+#
+# Makefile for Quadrics QsNet
@@ -64509,9 +64529,9 @@ diff -urN clean/drivers/net/qsnet/ep/Makefile linux-2.6.9/drivers/net/qsnet/ep/M
+ep-objs := cm.o debug.o kalloc.o kcomm.o kmap.o kthread.o neterr.o nmh.o probenetwork.o railhints.o rmap.o statemap.o support.o threadcode.o epcomms.o epcommsRx.o epcommsTx.o epcommsFwd.o conf_linux.o procfs_linux.o ep_procfs.o cm_procfs.o $(ep3-$(CONFIG_EP)) $(ep4-$(CONFIG_EP))
+
+EXTRA_CFLAGS += -DDEBUG -DDEBUG_PRINTF -DDEBUG_ASSERT
-diff -urN clean/drivers/net/qsnet/ep/Makefile.conf linux-2.6.9/drivers/net/qsnet/ep/Makefile.conf
---- clean/drivers/net/qsnet/ep/Makefile.conf 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/Makefile.conf 2005-09-07 10:39:44.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/Makefile.conf RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/Makefile.conf
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/Makefile.conf 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/Makefile.conf
@@ -0,0 +1,12 @@
+# Flags for generating QsNet Linux Kernel Makefiles
+MODNAME = ep.o
@@ -64525,9 +64545,9 @@ diff -urN clean/drivers/net/qsnet/ep/Makefile.conf linux-2.6.9/drivers/net/qsnet
+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 -urN clean/drivers/net/qsnet/ep/neterr.c linux-2.6.9/drivers/net/qsnet/ep/neterr.c
---- clean/drivers/net/qsnet/ep/neterr.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/neterr.c 2005-07-20 08:01:34.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/neterr.c RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/neterr.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/neterr.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/neterr.c
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -64608,9 +64628,9 @@ diff -urN clean/drivers/net/qsnet/ep/neterr.c linux-2.6.9/drivers/net/qsnet/ep/n
+ * End:
+ */
+
-diff -urN clean/drivers/net/qsnet/ep/neterr_elan3.c linux-2.6.9/drivers/net/qsnet/ep/neterr_elan3.c
---- clean/drivers/net/qsnet/ep/neterr_elan3.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/neterr_elan3.c 2003-11-17 08:26:45.000000000 -0500
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/neterr_elan3.c RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/neterr_elan3.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/neterr_elan3.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/neterr_elan3.c
@@ -0,0 +1,326 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -64938,9 +64958,9 @@ diff -urN clean/drivers/net/qsnet/ep/neterr_elan3.c linux-2.6.9/drivers/net/qsne
+ * End:
+ */
+
-diff -urN clean/drivers/net/qsnet/ep/neterr_elan4.c linux-2.6.9/drivers/net/qsnet/ep/neterr_elan4.c
---- clean/drivers/net/qsnet/ep/neterr_elan4.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/neterr_elan4.c 2005-07-20 07:35:37.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/neterr_elan4.c RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/neterr_elan4.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/neterr_elan4.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/neterr_elan4.c
@@ -0,0 +1,264 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -65206,9 +65226,9 @@ diff -urN clean/drivers/net/qsnet/ep/neterr_elan4.c linux-2.6.9/drivers/net/qsne
+ * End:
+ */
+
-diff -urN clean/drivers/net/qsnet/ep/nmh.c linux-2.6.9/drivers/net/qsnet/ep/nmh.c
---- clean/drivers/net/qsnet/ep/nmh.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/nmh.c 2004-01-05 08:48:08.000000000 -0500
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/nmh.c RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/nmh.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/nmh.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/nmh.c
@@ -0,0 +1,181 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -65391,9 +65411,9 @@ diff -urN clean/drivers/net/qsnet/ep/nmh.c linux-2.6.9/drivers/net/qsnet/ep/nmh.
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/ep/probenetwork.c linux-2.6.9/drivers/net/qsnet/ep/probenetwork.c
---- clean/drivers/net/qsnet/ep/probenetwork.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/probenetwork.c 2004-04-19 11:43:15.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/probenetwork.c RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/probenetwork.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/probenetwork.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/probenetwork.c
@@ -0,0 +1,446 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -65841,9 +65861,9 @@ diff -urN clean/drivers/net/qsnet/ep/probenetwork.c linux-2.6.9/drivers/net/qsne
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/ep/probenetwork_elan3.c linux-2.6.9/drivers/net/qsnet/ep/probenetwork_elan3.c
---- clean/drivers/net/qsnet/ep/probenetwork_elan3.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/probenetwork_elan3.c 2005-04-26 05:36:19.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/probenetwork_elan3.c RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/probenetwork_elan3.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/probenetwork_elan3.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/probenetwork_elan3.c
@@ -0,0 +1,302 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -66147,9 +66167,9 @@ diff -urN clean/drivers/net/qsnet/ep/probenetwork_elan3.c linux-2.6.9/drivers/ne
+ return updated;
+}
+
-diff -urN clean/drivers/net/qsnet/ep/probenetwork_elan3_thread.c linux-2.6.9/drivers/net/qsnet/ep/probenetwork_elan3_thread.c
---- clean/drivers/net/qsnet/ep/probenetwork_elan3_thread.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/probenetwork_elan3_thread.c 2004-03-24 06:32:56.000000000 -0500
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/probenetwork_elan3_thread.c RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/probenetwork_elan3_thread.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/probenetwork_elan3_thread.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/probenetwork_elan3_thread.c
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -66249,9 +66269,9 @@ diff -urN clean/drivers/net/qsnet/ep/probenetwork_elan3_thread.c linux-2.6.9/dri
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/ep/probenetwork_elan4.c linux-2.6.9/drivers/net/qsnet/ep/probenetwork_elan4.c
---- clean/drivers/net/qsnet/ep/probenetwork_elan4.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/probenetwork_elan4.c 2005-07-20 07:35:37.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/probenetwork_elan4.c RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/probenetwork_elan4.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/probenetwork_elan4.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/probenetwork_elan4.c
@@ -0,0 +1,401 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -66654,9 +66674,9 @@ diff -urN clean/drivers/net/qsnet/ep/probenetwork_elan4.c linux-2.6.9/drivers/ne
+
+ return 0;
+}
-diff -urN clean/drivers/net/qsnet/ep/procfs_linux.c linux-2.6.9/drivers/net/qsnet/ep/procfs_linux.c
---- clean/drivers/net/qsnet/ep/procfs_linux.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/procfs_linux.c 2005-09-07 10:35:03.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/procfs_linux.c RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/procfs_linux.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/procfs_linux.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/procfs_linux.c
@@ -0,0 +1,632 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -67290,14 +67310,14 @@ diff -urN clean/drivers/net/qsnet/ep/procfs_linux.c linux-2.6.9/drivers/net/qsne
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/ep/quadrics_version.h linux-2.6.9/drivers/net/qsnet/ep/quadrics_version.h
---- clean/drivers/net/qsnet/ep/quadrics_version.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/quadrics_version.h 2005-09-07 10:39:49.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/quadrics_version.h RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/quadrics_version.h
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/quadrics_version.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/quadrics_version.h
@@ -0,0 +1 @@
+#define QUADRICS_VERSION "5.11.3qsnet"
-diff -urN clean/drivers/net/qsnet/ep/railhints.c linux-2.6.9/drivers/net/qsnet/ep/railhints.c
---- clean/drivers/net/qsnet/ep/railhints.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/railhints.c 2004-02-06 17:37:06.000000000 -0500
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/railhints.c RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/railhints.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/railhints.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/railhints.c
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -67402,9 +67422,9 @@ diff -urN clean/drivers/net/qsnet/ep/railhints.c linux-2.6.9/drivers/net/qsnet/e
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/ep/rmap.c linux-2.6.9/drivers/net/qsnet/ep/rmap.c
---- clean/drivers/net/qsnet/ep/rmap.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/rmap.c 2004-05-19 06:24:38.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/rmap.c RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/rmap.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/rmap.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/rmap.c
@@ -0,0 +1,365 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -67771,9 +67791,9 @@ diff -urN clean/drivers/net/qsnet/ep/rmap.c linux-2.6.9/drivers/net/qsnet/ep/rma
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/ep/spinlock_elan3_thread.c linux-2.6.9/drivers/net/qsnet/ep/spinlock_elan3_thread.c
---- clean/drivers/net/qsnet/ep/spinlock_elan3_thread.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/spinlock_elan3_thread.c 2003-10-07 09:22:38.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/spinlock_elan3_thread.c RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/spinlock_elan3_thread.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/spinlock_elan3_thread.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/spinlock_elan3_thread.c
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -67819,9 +67839,9 @@ diff -urN clean/drivers/net/qsnet/ep/spinlock_elan3_thread.c linux-2.6.9/drivers
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/ep/statemap.c linux-2.6.9/drivers/net/qsnet/ep/statemap.c
---- clean/drivers/net/qsnet/ep/statemap.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/statemap.c 2004-09-01 12:13:43.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/statemap.c RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/statemap.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/statemap.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/statemap.c
@@ -0,0 +1,385 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -68208,9 +68228,9 @@ diff -urN clean/drivers/net/qsnet/ep/statemap.c linux-2.6.9/drivers/net/qsnet/ep
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/ep/statusmon.h linux-2.6.9/drivers/net/qsnet/ep/statusmon.h
---- clean/drivers/net/qsnet/ep/statusmon.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/statusmon.h 2003-10-07 09:22:38.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/statusmon.h RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/statusmon.h
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/statusmon.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/statusmon.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -68256,9 +68276,9 @@ diff -urN clean/drivers/net/qsnet/ep/statusmon.h linux-2.6.9/drivers/net/qsnet/e
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/ep/support.c linux-2.6.9/drivers/net/qsnet/ep/support.c
---- clean/drivers/net/qsnet/ep/support.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/support.c 2004-09-30 10:59:15.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/support.c RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/support.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/support.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/support.c
@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -68369,9 +68389,9 @@ diff -urN clean/drivers/net/qsnet/ep/support.c linux-2.6.9/drivers/net/qsnet/ep/
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/ep/support_elan3.c linux-2.6.9/drivers/net/qsnet/ep/support_elan3.c
---- clean/drivers/net/qsnet/ep/support_elan3.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/support_elan3.c 2005-07-20 07:35:37.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/support_elan3.c RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/support_elan3.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/support_elan3.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/support_elan3.c
@@ -0,0 +1,2123 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -70496,9 +70516,9 @@ diff -urN clean/drivers/net/qsnet/ep/support_elan3.c linux-2.6.9/drivers/net/qsn
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/ep/support_elan4.c linux-2.6.9/drivers/net/qsnet/ep/support_elan4.c
---- clean/drivers/net/qsnet/ep/support_elan4.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/support_elan4.c 2005-08-09 05:57:14.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/support_elan4.c RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/support_elan4.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/support_elan4.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/support_elan4.c
@@ -0,0 +1,1192 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -71692,9 +71712,9 @@ diff -urN clean/drivers/net/qsnet/ep/support_elan4.c linux-2.6.9/drivers/net/qsn
+ }
+ spin_unlock_irqrestore (&rail->r_dma_lock, flags);
+}
-diff -urN clean/drivers/net/qsnet/ep/threadcode.c linux-2.6.9/drivers/net/qsnet/ep/threadcode.c
---- clean/drivers/net/qsnet/ep/threadcode.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/threadcode.c 2003-10-07 09:22:38.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/threadcode.c RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/threadcode.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/threadcode.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/threadcode.c
@@ -0,0 +1,146 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -71842,9 +71862,9 @@ diff -urN clean/drivers/net/qsnet/ep/threadcode.c linux-2.6.9/drivers/net/qsnet/
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/ep/threadcode_elan3.c linux-2.6.9/drivers/net/qsnet/ep/threadcode_elan3.c
---- clean/drivers/net/qsnet/ep/threadcode_elan3.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/threadcode_elan3.c 2003-10-07 09:22:38.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/threadcode_elan3.c RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/threadcode_elan3.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/threadcode_elan3.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/threadcode_elan3.c
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -71931,9 +71951,9 @@ diff -urN clean/drivers/net/qsnet/ep/threadcode_elan3.c linux-2.6.9/drivers/net/
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/ep/threadcode_elan3_Linux.c linux-2.6.9/drivers/net/qsnet/ep/threadcode_elan3_Linux.c
---- clean/drivers/net/qsnet/ep/threadcode_elan3_Linux.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/threadcode_elan3_Linux.c 2005-09-07 10:39:44.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/threadcode_elan3_Linux.c RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/threadcode_elan3_Linux.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/threadcode_elan3_Linux.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/threadcode_elan3_Linux.c
@@ -0,0 +1,112 @@
+/* --------------------------------------------------------*/
+/* MACHINE GENERATED ELAN CODE */
@@ -72047,9 +72067,9 @@ diff -urN clean/drivers/net/qsnet/ep/threadcode_elan3_Linux.c linux-2.6.9/driver
+ threadcode_elan3_rodata_size,
+ threadcode_elan3_symbols,
+};
-diff -urN clean/drivers/net/qsnet/ep/threadcode_elan3_Linux.code.dis linux-2.6.9/drivers/net/qsnet/ep/threadcode_elan3_Linux.code.dis
---- clean/drivers/net/qsnet/ep/threadcode_elan3_Linux.code.dis 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/threadcode_elan3_Linux.code.dis 2005-09-07 10:39:44.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/threadcode_elan3_Linux.code.dis RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/threadcode_elan3_Linux.code.dis
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/threadcode_elan3_Linux.code.dis 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/threadcode_elan3_Linux.code.dis
@@ -0,0 +1,620 @@
+
+threadcode_elan3_Linux.code: file format elf32-elan
@@ -72671,9 +72691,9 @@ diff -urN clean/drivers/net/qsnet/ep/threadcode_elan3_Linux.code.dis linux-2.6.9
+ff000974: 08 e0 c3 81 retl
+ff000978: 80 a0 03 9c add %sp, 0x80, %sp
+Disassembly of section .data:
-diff -urN clean/drivers/net/qsnet/ep/threadcode_elan4_Linux.c linux-2.6.9/drivers/net/qsnet/ep/threadcode_elan4_Linux.c
---- clean/drivers/net/qsnet/ep/threadcode_elan4_Linux.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/threadcode_elan4_Linux.c 2005-09-07 10:39:44.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/threadcode_elan4_Linux.c RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/threadcode_elan4_Linux.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/threadcode_elan4_Linux.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/threadcode_elan4_Linux.c
@@ -0,0 +1,107 @@
+/* --------------------------------------------------------*/
+/* MACHINE GENERATED ELAN CODE */
@@ -72782,9 +72802,9 @@ diff -urN clean/drivers/net/qsnet/ep/threadcode_elan4_Linux.c linux-2.6.9/driver
+ threadcode_elan4_rodata_size,
+ threadcode_elan4_symbols,
+};
-diff -urN clean/drivers/net/qsnet/ep/threadcode_elan4_Linux.code.dis linux-2.6.9/drivers/net/qsnet/ep/threadcode_elan4_Linux.code.dis
---- clean/drivers/net/qsnet/ep/threadcode_elan4_Linux.code.dis 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/ep/threadcode_elan4_Linux.code.dis 2005-09-07 10:39:44.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/threadcode_elan4_Linux.code.dis RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/threadcode_elan4_Linux.code.dis
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/ep/threadcode_elan4_Linux.code.dis 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/ep/threadcode_elan4_Linux.code.dis
@@ -0,0 +1,628 @@
+
+threadcode_elan4_Linux.code: file format elf64-elan
@@ -73414,9 +73434,9 @@ diff -urN clean/drivers/net/qsnet/ep/threadcode_elan4_Linux.code.dis linux-2.6.9
+ f8000874: 08 e0 01 80 retl
+ f8000878: c0 60 80 01 add %sp, 0xc0, %sp
+Disassembly of section .data:
-diff -urN clean/drivers/net/qsnet/jtag/jtagdrv.c linux-2.6.9/drivers/net/qsnet/jtag/jtagdrv.c
---- clean/drivers/net/qsnet/jtag/jtagdrv.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/jtag/jtagdrv.c 2003-06-07 12:02:35.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/jtag/jtagdrv.c RH_2_6_9_55.HEAD/drivers/net/qsnet/jtag/jtagdrv.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/jtag/jtagdrv.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/jtag/jtagdrv.c
@@ -0,0 +1,451 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -73869,9 +73889,9 @@ diff -urN clean/drivers/net/qsnet/jtag/jtagdrv.c linux-2.6.9/drivers/net/qsnet/j
+ LPT_WRITE_CTRL (dev, 0); DELAY(1); /* strobe low */
+}
+
-diff -urN clean/drivers/net/qsnet/jtag/jtagdrv.h linux-2.6.9/drivers/net/qsnet/jtag/jtagdrv.h
---- clean/drivers/net/qsnet/jtag/jtagdrv.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/jtag/jtagdrv.h 2002-08-09 07:18:37.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/jtag/jtagdrv.h RH_2_6_9_55.HEAD/drivers/net/qsnet/jtag/jtagdrv.h
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/jtag/jtagdrv.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/jtag/jtagdrv.h
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -73930,9 +73950,9 @@ diff -urN clean/drivers/net/qsnet/jtag/jtagdrv.h linux-2.6.9/drivers/net/qsnet/j
+
+
+#endif /* __JTAGDRV_COMMON_H */
-diff -urN clean/drivers/net/qsnet/jtag/jtagdrv_Linux.c linux-2.6.9/drivers/net/qsnet/jtag/jtagdrv_Linux.c
---- clean/drivers/net/qsnet/jtag/jtagdrv_Linux.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/jtag/jtagdrv_Linux.c 2005-09-07 10:35:03.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/jtag/jtagdrv_Linux.c RH_2_6_9_55.HEAD/drivers/net/qsnet/jtag/jtagdrv_Linux.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/jtag/jtagdrv_Linux.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/jtag/jtagdrv_Linux.c
@@ -0,0 +1,326 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -74260,9 +74280,9 @@ diff -urN clean/drivers/net/qsnet/jtag/jtagdrv_Linux.c linux-2.6.9/drivers/net/q
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/jtag/jtagdrv_Linux.h linux-2.6.9/drivers/net/qsnet/jtag/jtagdrv_Linux.h
---- clean/drivers/net/qsnet/jtag/jtagdrv_Linux.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/jtag/jtagdrv_Linux.h 2002-08-09 07:18:37.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/jtag/jtagdrv_Linux.h RH_2_6_9_55.HEAD/drivers/net/qsnet/jtag/jtagdrv_Linux.h
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/jtag/jtagdrv_Linux.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/jtag/jtagdrv_Linux.h
@@ -0,0 +1,174 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -74438,9 +74458,9 @@ diff -urN clean/drivers/net/qsnet/jtag/jtagdrv_Linux.h linux-2.6.9/drivers/net/q
+
+
+#endif /* __JTAGDRV_LINUX_H */
-diff -urN clean/drivers/net/qsnet/jtag/Makefile linux-2.6.9/drivers/net/qsnet/jtag/Makefile
---- clean/drivers/net/qsnet/jtag/Makefile 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/jtag/Makefile 2005-10-10 17:47:31.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/jtag/Makefile RH_2_6_9_55.HEAD/drivers/net/qsnet/jtag/Makefile
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/jtag/Makefile 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/jtag/Makefile
@@ -0,0 +1,15 @@
+#
+# Makefile for Quadrics QsNet
@@ -74457,9 +74477,9 @@ diff -urN clean/drivers/net/qsnet/jtag/Makefile linux-2.6.9/drivers/net/qsnet/jt
+jtag-objs := jtagdrv_Linux.o jtagdrv.o
+
+EXTRA_CFLAGS += -DDEBUG -DDEBUG_PRINTF -DDEBUG_ASSERT
-diff -urN clean/drivers/net/qsnet/jtag/Makefile.conf linux-2.6.9/drivers/net/qsnet/jtag/Makefile.conf
---- clean/drivers/net/qsnet/jtag/Makefile.conf 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/jtag/Makefile.conf 2005-09-07 10:39:49.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/jtag/Makefile.conf RH_2_6_9_55.HEAD/drivers/net/qsnet/jtag/Makefile.conf
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/jtag/Makefile.conf 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/jtag/Makefile.conf
@@ -0,0 +1,10 @@
+# Flags for generating QsNet Linux Kernel Makefiles
+MODNAME = jtag.o
@@ -74471,14 +74491,14 @@ diff -urN clean/drivers/net/qsnet/jtag/Makefile.conf linux-2.6.9/drivers/net/qsn
+# EXTRALINES START
+
+# EXTRALINES END
-diff -urN clean/drivers/net/qsnet/jtag/quadrics_version.h linux-2.6.9/drivers/net/qsnet/jtag/quadrics_version.h
---- clean/drivers/net/qsnet/jtag/quadrics_version.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/jtag/quadrics_version.h 2005-09-07 10:39:49.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/jtag/quadrics_version.h RH_2_6_9_55.HEAD/drivers/net/qsnet/jtag/quadrics_version.h
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/jtag/quadrics_version.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/jtag/quadrics_version.h
@@ -0,0 +1 @@
+#define QUADRICS_VERSION "5.11.3qsnet"
-diff -urN clean/drivers/net/qsnet/Kconfig linux-2.6.9/drivers/net/qsnet/Kconfig
---- clean/drivers/net/qsnet/Kconfig 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/Kconfig 2005-10-10 17:47:30.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/Kconfig RH_2_6_9_55.HEAD/drivers/net/qsnet/Kconfig
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/Kconfig 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/Kconfig
@@ -0,0 +1,79 @@
+#
+# Kconfig for Quadrics QsNet
@@ -74559,9 +74579,9 @@ diff -urN clean/drivers/net/qsnet/Kconfig linux-2.6.9/drivers/net/qsnet/Kconfig
+ For more information about JTag interface, please refer to the IEEE document on
+ http://www.ieee.org/
+endmenu
-diff -urN clean/drivers/net/qsnet/Makefile linux-2.6.9/drivers/net/qsnet/Makefile
---- clean/drivers/net/qsnet/Makefile 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/Makefile 2005-10-10 17:47:30.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/Makefile RH_2_6_9_55.HEAD/drivers/net/qsnet/Makefile
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/Makefile 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/Makefile
@@ -0,0 +1,15 @@
+#
+# Makefile for Quadrics QsNet
@@ -74578,9 +74598,9 @@ diff -urN clean/drivers/net/qsnet/Makefile linux-2.6.9/drivers/net/qsnet/Makefil
+obj-$(CONFIG_EIP) += eip/
+obj-$(CONFIG_RMS) += rms/
+obj-$(CONFIG_JTAG) += jtag/
-diff -urN clean/drivers/net/qsnet/qsnet/debug.c linux-2.6.9/drivers/net/qsnet/qsnet/debug.c
---- clean/drivers/net/qsnet/qsnet/debug.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/qsnet/debug.c 2005-03-23 06:04:54.000000000 -0500
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/qsnet/debug.c RH_2_6_9_55.HEAD/drivers/net/qsnet/qsnet/debug.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/qsnet/debug.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/qsnet/debug.c
@@ -0,0 +1,583 @@
+/*
+ * Copyright (c) 2003 by Quadrics Ltd.
@@ -75165,9 +75185,9 @@ diff -urN clean/drivers/net/qsnet/qsnet/debug.c linux-2.6.9/drivers/net/qsnet/qs
+ * c-file-style: "linux"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/qsnet/i686_mmx.c linux-2.6.9/drivers/net/qsnet/qsnet/i686_mmx.c
---- clean/drivers/net/qsnet/qsnet/i686_mmx.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/qsnet/i686_mmx.c 2004-01-05 07:08:25.000000000 -0500
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/qsnet/i686_mmx.c RH_2_6_9_55.HEAD/drivers/net/qsnet/qsnet/i686_mmx.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/qsnet/i686_mmx.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/qsnet/i686_mmx.c
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -75268,9 +75288,9 @@ diff -urN clean/drivers/net/qsnet/qsnet/i686_mmx.c linux-2.6.9/drivers/net/qsnet
+ }
+}
+#endif
-diff -urN clean/drivers/net/qsnet/qsnet/kernel_linux.c linux-2.6.9/drivers/net/qsnet/qsnet/kernel_linux.c
---- clean/drivers/net/qsnet/qsnet/kernel_linux.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/qsnet/kernel_linux.c 2005-09-07 10:35:03.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/qsnet/kernel_linux.c RH_2_6_9_55.HEAD/drivers/net/qsnet/qsnet/kernel_linux.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/qsnet/kernel_linux.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/qsnet/kernel_linux.c
@@ -0,0 +1,902 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -76174,9 +76194,9 @@ diff -urN clean/drivers/net/qsnet/qsnet/kernel_linux.c linux-2.6.9/drivers/net/q
+ * c-file-style: "linux"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/qsnet/Makefile linux-2.6.9/drivers/net/qsnet/qsnet/Makefile
---- clean/drivers/net/qsnet/qsnet/Makefile 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/qsnet/Makefile 2005-10-10 17:47:31.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/qsnet/Makefile RH_2_6_9_55.HEAD/drivers/net/qsnet/qsnet/Makefile
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/qsnet/Makefile 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/qsnet/Makefile
@@ -0,0 +1,15 @@
+#
+# Makefile for Quadrics QsNet
@@ -76193,9 +76213,9 @@ diff -urN clean/drivers/net/qsnet/qsnet/Makefile linux-2.6.9/drivers/net/qsnet/q
+qsnet-objs := debug.o kernel_linux.o i686_mmx.o
+
+EXTRA_CFLAGS += -DDEBUG -DDEBUG_PRINTF -DDEBUG_ASSERT
-diff -urN clean/drivers/net/qsnet/qsnet/Makefile.conf linux-2.6.9/drivers/net/qsnet/qsnet/Makefile.conf
---- clean/drivers/net/qsnet/qsnet/Makefile.conf 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/qsnet/Makefile.conf 2005-09-07 10:39:34.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/qsnet/Makefile.conf RH_2_6_9_55.HEAD/drivers/net/qsnet/qsnet/Makefile.conf
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/qsnet/Makefile.conf 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/qsnet/Makefile.conf
@@ -0,0 +1,10 @@
+# Flags for generating QsNet Linux Kernel Makefiles
+MODNAME = qsnet.o
@@ -76207,9 +76227,9 @@ diff -urN clean/drivers/net/qsnet/qsnet/Makefile.conf linux-2.6.9/drivers/net/qs
+# EXTRALINES START
+
+# EXTRALINES END
-diff -urN clean/drivers/net/qsnet/qsnet/qsnetkmem_linux.c linux-2.6.9/drivers/net/qsnet/qsnet/qsnetkmem_linux.c
---- clean/drivers/net/qsnet/qsnet/qsnetkmem_linux.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/qsnet/qsnetkmem_linux.c 2003-08-13 06:03:27.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/qsnet/qsnetkmem_linux.c RH_2_6_9_55.HEAD/drivers/net/qsnet/qsnet/qsnetkmem_linux.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/qsnet/qsnetkmem_linux.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/qsnet/qsnetkmem_linux.c
@@ -0,0 +1,325 @@
+/*
+ * Copyright (c) 2003 by Quadrics Ltd.
@@ -76536,14 +76556,14 @@ diff -urN clean/drivers/net/qsnet/qsnet/qsnetkmem_linux.c linux-2.6.9/drivers/ne
+ * c-file-style: "linux"
+ * End:
+ */
-diff -urN clean/drivers/net/qsnet/qsnet/quadrics_version.h linux-2.6.9/drivers/net/qsnet/qsnet/quadrics_version.h
---- clean/drivers/net/qsnet/qsnet/quadrics_version.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/qsnet/quadrics_version.h 2005-09-07 10:39:49.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/qsnet/quadrics_version.h RH_2_6_9_55.HEAD/drivers/net/qsnet/qsnet/quadrics_version.h
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/qsnet/quadrics_version.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/qsnet/quadrics_version.h
@@ -0,0 +1 @@
+#define QUADRICS_VERSION "5.11.3qsnet"
-diff -urN clean/drivers/net/qsnet/rms/Makefile linux-2.6.9/drivers/net/qsnet/rms/Makefile
---- clean/drivers/net/qsnet/rms/Makefile 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/rms/Makefile 2005-10-10 17:47:31.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/rms/Makefile RH_2_6_9_55.HEAD/drivers/net/qsnet/rms/Makefile
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/rms/Makefile 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/rms/Makefile
@@ -0,0 +1,15 @@
+#
+# Makefile for Quadrics QsNet
@@ -76560,9 +76580,9 @@ diff -urN clean/drivers/net/qsnet/rms/Makefile linux-2.6.9/drivers/net/qsnet/rms
+rms-objs := rms_kern.o rms_kern_Linux.o
+
+EXTRA_CFLAGS += -DDEBUG -DDEBUG_PRINTF -DDEBUG_ASSERT
-diff -urN clean/drivers/net/qsnet/rms/Makefile.conf linux-2.6.9/drivers/net/qsnet/rms/Makefile.conf
---- clean/drivers/net/qsnet/rms/Makefile.conf 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/rms/Makefile.conf 2005-09-07 10:39:48.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/rms/Makefile.conf RH_2_6_9_55.HEAD/drivers/net/qsnet/rms/Makefile.conf
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/rms/Makefile.conf 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/rms/Makefile.conf
@@ -0,0 +1,10 @@
+# Flags for generating QsNet Linux Kernel Makefiles
+MODNAME = rms.o
@@ -76574,14 +76594,14 @@ diff -urN clean/drivers/net/qsnet/rms/Makefile.conf linux-2.6.9/drivers/net/qsne
+# EXTRALINES START
+
+# EXTRALINES END
-diff -urN clean/drivers/net/qsnet/rms/quadrics_version.h linux-2.6.9/drivers/net/qsnet/rms/quadrics_version.h
---- clean/drivers/net/qsnet/rms/quadrics_version.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/rms/quadrics_version.h 2005-09-07 10:39:49.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/rms/quadrics_version.h RH_2_6_9_55.HEAD/drivers/net/qsnet/rms/quadrics_version.h
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/rms/quadrics_version.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/rms/quadrics_version.h
@@ -0,0 +1 @@
+#define QUADRICS_VERSION "5.11.3qsnet"
-diff -urN clean/drivers/net/qsnet/rms/rms_kern.c linux-2.6.9/drivers/net/qsnet/rms/rms_kern.c
---- clean/drivers/net/qsnet/rms/rms_kern.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/rms/rms_kern.c 2005-09-07 10:35:04.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/rms/rms_kern.c RH_2_6_9_55.HEAD/drivers/net/qsnet/rms/rms_kern.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/rms/rms_kern.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/rms/rms_kern.c
@@ -0,0 +1,1484 @@
+/*
+ * Copyright (c) 1996-2003 by Quadrics Supercomputers World Ltd.
@@ -78067,9 +78087,9 @@ diff -urN clean/drivers/net/qsnet/rms/rms_kern.c linux-2.6.9/drivers/net/qsnet/r
+
+
+
-diff -urN clean/drivers/net/qsnet/rms/rms_kern_Linux.c linux-2.6.9/drivers/net/qsnet/rms/rms_kern_Linux.c
---- clean/drivers/net/qsnet/rms/rms_kern_Linux.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/drivers/net/qsnet/rms/rms_kern_Linux.c 2005-09-07 10:35:04.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/rms/rms_kern_Linux.c RH_2_6_9_55.HEAD/drivers/net/qsnet/rms/rms_kern_Linux.c
+--- RH_2_6_9_55.HEAD.orig/drivers/net/qsnet/rms/rms_kern_Linux.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/drivers/net/qsnet/rms/rms_kern_Linux.c
@@ -0,0 +1,489 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -78560,29 +78580,10 @@ diff -urN clean/drivers/net/qsnet/rms/rms_kern_Linux.c linux-2.6.9/drivers/net/q
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/drivers/net/Kconfig linux-2.6.9/drivers/net/Kconfig
---- clean/drivers/net/Kconfig 2005-10-10 18:50:31.000000000 -0400
-+++ linux-2.6.9/drivers/net/Kconfig 2005-10-10 18:50:34.000000000 -0400
-@@ -2271,6 +2271,8 @@
-
- source "drivers/net/tokenring/Kconfig"
-
-+source "drivers/net/qsnet/Kconfig"
-+
- source "drivers/net/wireless/Kconfig"
-
- source "drivers/net/pcmcia/Kconfig"
---- clean/drivers/net/Makefile 2005-10-10 18:59:11.000000000 -0400
-+++ linux-2.6.9/drivers/net/Makefile 2005-10-10 18:59:28.000000000 -0400
-@@ -197,3 +197,4 @@
-
- obj-$(CONFIG_NETCONSOLE) += netconsole.o
- obj-$(CONFIG_NETDUMP) += netdump.o
-+obj-$(CONFIG_QSNET) += qsnet/
-diff -urN clean/fs/exec.c linux-2.6.9/fs/exec.c
---- clean/fs/exec.c 2005-10-10 17:43:57.000000000 -0400
-+++ linux-2.6.9/fs/exec.c 2005-10-10 17:47:17.000000000 -0400
-@@ -54,6 +54,8 @@
+diff -urpN RH_2_6_9_55.HEAD.orig/fs/exec.c RH_2_6_9_55.HEAD/fs/exec.c
+--- RH_2_6_9_55.HEAD.orig/fs/exec.c
++++ RH_2_6_9_55.HEAD/fs/exec.c
+@@ -56,6 +56,8 @@
#include <linux/kmod.h>
#endif
@@ -78591,7 +78592,7 @@ diff -urN clean/fs/exec.c linux-2.6.9/fs/exec.c
int core_uses_pid;
char core_pattern[65] = "core";
int suid_dumpable = 0;
-@@ -1175,6 +1177,9 @@
+@@ -1214,6 +1216,9 @@ int do_execve(char * filename,
if (retval < 0)
goto out;
@@ -78601,10 +78602,10 @@ diff -urN clean/fs/exec.c linux-2.6.9/fs/exec.c
retval = search_binary_handler(bprm,regs);
if (retval >= 0) {
free_arg_pages(bprm);
-diff -urN clean/fs/open.c linux-2.6.9/fs/open.c
---- clean/fs/open.c 2005-10-10 17:43:57.000000000 -0400
-+++ linux-2.6.9/fs/open.c 2005-10-10 17:47:17.000000000 -0400
-@@ -1029,6 +1029,8 @@
+diff -urpN RH_2_6_9_55.HEAD.orig/fs/open.c RH_2_6_9_55.HEAD/fs/open.c
+--- RH_2_6_9_55.HEAD.orig/fs/open.c
++++ RH_2_6_9_55.HEAD/fs/open.c
+@@ -1028,6 +1028,8 @@ out_error:
goto out;
}
@@ -78613,10 +78614,10 @@ diff -urN clean/fs/open.c linux-2.6.9/fs/open.c
#ifndef __alpha__
/*
-diff -urN clean/fs/read_write.c linux-2.6.9/fs/read_write.c
---- clean/fs/read_write.c 2005-05-13 13:39:11.000000000 -0400
-+++ linux-2.6.9/fs/read_write.c 2005-10-10 17:47:17.000000000 -0400
-@@ -145,6 +145,7 @@
+diff -urpN RH_2_6_9_55.HEAD.orig/fs/read_write.c RH_2_6_9_55.HEAD/fs/read_write.c
+--- RH_2_6_9_55.HEAD.orig/fs/read_write.c
++++ RH_2_6_9_55.HEAD/fs/read_write.c
+@@ -145,6 +145,7 @@ asmlinkage off_t sys_lseek(unsigned int
bad:
return retval;
}
@@ -78624,17 +78625,17 @@ diff -urN clean/fs/read_write.c linux-2.6.9/fs/read_write.c
#ifdef __ARCH_WANT_SYS_LLSEEK
asmlinkage long sys_llseek(unsigned int fd, unsigned long offset_high,
-diff -urN clean/fs/select.c linux-2.6.9/fs/select.c
---- clean/fs/select.c 2005-05-13 13:39:11.000000000 -0400
-+++ linux-2.6.9/fs/select.c 2005-10-10 17:47:17.000000000 -0400
-@@ -529,3 +529,4 @@
+diff -urpN RH_2_6_9_55.HEAD.orig/fs/select.c RH_2_6_9_55.HEAD/fs/select.c
+--- RH_2_6_9_55.HEAD.orig/fs/select.c
++++ RH_2_6_9_55.HEAD/fs/select.c
+@@ -539,3 +539,4 @@ out_fds:
poll_freewait(&table);
return err;
}
+EXPORT_SYMBOL_GPL(sys_poll);
-diff -urN clean/include/elan/bitmap.h linux-2.6.9/include/elan/bitmap.h
---- clean/include/elan/bitmap.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan/bitmap.h 2004-01-20 12:32:15.000000000 -0500
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan/bitmap.h RH_2_6_9_55.HEAD/include/elan/bitmap.h
+--- RH_2_6_9_55.HEAD.orig/include/elan/bitmap.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan/bitmap.h
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -78710,9 +78711,9 @@ diff -urN clean/include/elan/bitmap.h linux-2.6.9/include/elan/bitmap.h
+ * c-file-style: "linux"
+ * End:
+ */
-diff -urN clean/include/elan/capability.h linux-2.6.9/include/elan/capability.h
---- clean/include/elan/capability.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan/capability.h 2005-05-17 05:52:53.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan/capability.h RH_2_6_9_55.HEAD/include/elan/capability.h
+--- RH_2_6_9_55.HEAD.orig/include/elan/capability.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan/capability.h
@@ -0,0 +1,198 @@
+/*
+ * Copyright (c) 2003 by Quadrics Limited.
@@ -78912,9 +78913,9 @@ diff -urN clean/include/elan/capability.h linux-2.6.9/include/elan/capability.h
+ * c-file-style: "linux"
+ * End:
+ */
-diff -urN clean/include/elan/cm.h linux-2.6.9/include/elan/cm.h
---- clean/include/elan/cm.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan/cm.h 2005-03-30 09:06:34.000000000 -0500
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan/cm.h RH_2_6_9_55.HEAD/include/elan/cm.h
+--- RH_2_6_9_55.HEAD.orig/include/elan/cm.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan/cm.h
@@ -0,0 +1,396 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -79312,9 +79313,9 @@ diff -urN clean/include/elan/cm.h linux-2.6.9/include/elan/cm.h
+ */
+#endif /* __ELAN_CM_H */
+
-diff -urN clean/include/elan/compat.h linux-2.6.9/include/elan/compat.h
---- clean/include/elan/compat.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan/compat.h 2003-12-03 08:18:48.000000000 -0500
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan/compat.h RH_2_6_9_55.HEAD/include/elan/compat.h
+--- RH_2_6_9_55.HEAD.orig/include/elan/compat.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan/compat.h
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -79339,9 +79340,9 @@ diff -urN clean/include/elan/compat.h linux-2.6.9/include/elan/compat.h
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/include/elan/device.h linux-2.6.9/include/elan/device.h
---- clean/include/elan/device.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan/device.h 2003-09-24 09:55:37.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan/device.h RH_2_6_9_55.HEAD/include/elan/device.h
+--- RH_2_6_9_55.HEAD.orig/include/elan/device.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan/device.h
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2003 by Quadrics Limited.
@@ -79405,9 +79406,9 @@ diff -urN clean/include/elan/device.h linux-2.6.9/include/elan/device.h
+ * c-file-style: "linux"
+ * End:
+ */
-diff -urN clean/include/elan/devinfo.h linux-2.6.9/include/elan/devinfo.h
---- clean/include/elan/devinfo.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan/devinfo.h 2005-02-01 07:35:53.000000000 -0500
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan/devinfo.h RH_2_6_9_55.HEAD/include/elan/devinfo.h
+--- RH_2_6_9_55.HEAD.orig/include/elan/devinfo.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan/devinfo.h
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2003 by Quadrics Limited.
@@ -79501,9 +79502,9 @@ diff -urN clean/include/elan/devinfo.h linux-2.6.9/include/elan/devinfo.h
+ * c-file-style: "linux"
+ * End:
+ */
-diff -urN clean/include/elan/elanmoddebug.h linux-2.6.9/include/elan/elanmoddebug.h
---- clean/include/elan/elanmoddebug.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan/elanmoddebug.h 2005-05-24 13:07:44.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan/elanmoddebug.h RH_2_6_9_55.HEAD/include/elan/elanmoddebug.h
+--- RH_2_6_9_55.HEAD.orig/include/elan/elanmoddebug.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan/elanmoddebug.h
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -79569,9 +79570,9 @@ diff -urN clean/include/elan/elanmoddebug.h linux-2.6.9/include/elan/elanmoddebu
+ * c-file-style: "linux"
+ * End:
+ */
-diff -urN clean/include/elan/elanmod.h linux-2.6.9/include/elan/elanmod.h
---- clean/include/elan/elanmod.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan/elanmod.h 2005-05-26 12:14:21.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan/elanmod.h RH_2_6_9_55.HEAD/include/elan/elanmod.h
+--- RH_2_6_9_55.HEAD.orig/include/elan/elanmod.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan/elanmod.h
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2003 by Quadrics Limited.
@@ -79656,9 +79657,9 @@ diff -urN clean/include/elan/elanmod.h linux-2.6.9/include/elan/elanmod.h
+ * c-file-style: "linux"
+ * End:
+ */
-diff -urN clean/include/elan/elanmod_linux.h linux-2.6.9/include/elan/elanmod_linux.h
---- clean/include/elan/elanmod_linux.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan/elanmod_linux.h 2005-02-22 07:29:22.000000000 -0500
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan/elanmod_linux.h RH_2_6_9_55.HEAD/include/elan/elanmod_linux.h
+--- RH_2_6_9_55.HEAD.orig/include/elan/elanmod_linux.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan/elanmod_linux.h
@@ -0,0 +1,164 @@
+/*
+ * Copyright (c) 2003 by Quadrics Ltd.
@@ -79824,9 +79825,9 @@ diff -urN clean/include/elan/elanmod_linux.h linux-2.6.9/include/elan/elanmod_li
+ * c-file-style: "linux"
+ * End:
+ */
-diff -urN clean/include/elan/elanmod_subsystem.h linux-2.6.9/include/elan/elanmod_subsystem.h
---- clean/include/elan/elanmod_subsystem.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan/elanmod_subsystem.h 2003-09-29 11:35:13.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan/elanmod_subsystem.h RH_2_6_9_55.HEAD/include/elan/elanmod_subsystem.h
+--- RH_2_6_9_55.HEAD.orig/include/elan/elanmod_subsystem.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan/elanmod_subsystem.h
@@ -0,0 +1,138 @@
+/*
+ * Copyright (c) 2003 by Quadrics Limited.
@@ -79966,9 +79967,9 @@ diff -urN clean/include/elan/elanmod_subsystem.h linux-2.6.9/include/elan/elanmo
+ * c-file-style: "linux"
+ * End:
+ */
-diff -urN clean/include/elan/epcomms.h linux-2.6.9/include/elan/epcomms.h
---- clean/include/elan/epcomms.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan/epcomms.h 2004-11-12 05:55:03.000000000 -0500
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan/epcomms.h RH_2_6_9_55.HEAD/include/elan/epcomms.h
+--- RH_2_6_9_55.HEAD.orig/include/elan/epcomms.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan/epcomms.h
@@ -0,0 +1,635 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -80605,9 +80606,9 @@ diff -urN clean/include/elan/epcomms.h linux-2.6.9/include/elan/epcomms.h
+ */
+#endif /* __ELAN_EPCOMMS_H */
+
-diff -urN clean/include/elan/epsvc.h linux-2.6.9/include/elan/epsvc.h
---- clean/include/elan/epsvc.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan/epsvc.h 2004-02-13 05:03:27.000000000 -0500
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan/epsvc.h RH_2_6_9_55.HEAD/include/elan/epsvc.h
+--- RH_2_6_9_55.HEAD.orig/include/elan/epsvc.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan/epsvc.h
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -80645,9 +80646,9 @@ diff -urN clean/include/elan/epsvc.h linux-2.6.9/include/elan/epsvc.h
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/include/elan/kalloc.h linux-2.6.9/include/elan/kalloc.h
---- clean/include/elan/kalloc.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan/kalloc.h 2004-05-19 06:23:59.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan/kalloc.h RH_2_6_9_55.HEAD/include/elan/kalloc.h
+--- RH_2_6_9_55.HEAD.orig/include/elan/kalloc.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan/kalloc.h
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -80757,9 +80758,9 @@ diff -urN clean/include/elan/kalloc.h linux-2.6.9/include/elan/kalloc.h
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/include/elan/kcomm.h linux-2.6.9/include/elan/kcomm.h
---- clean/include/elan/kcomm.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan/kcomm.h 2005-04-05 12:36:28.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan/kcomm.h RH_2_6_9_55.HEAD/include/elan/kcomm.h
+--- RH_2_6_9_55.HEAD.orig/include/elan/kcomm.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan/kcomm.h
@@ -0,0 +1,831 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -81592,9 +81593,9 @@ diff -urN clean/include/elan/kcomm.h linux-2.6.9/include/elan/kcomm.h
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/include/elan/kcomm_stats.h linux-2.6.9/include/elan/kcomm_stats.h
---- clean/include/elan/kcomm_stats.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan/kcomm_stats.h 2005-05-31 07:42:43.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan/kcomm_stats.h RH_2_6_9_55.HEAD/include/elan/kcomm_stats.h
+--- RH_2_6_9_55.HEAD.orig/include/elan/kcomm_stats.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan/kcomm_stats.h
@@ -0,0 +1,153 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -81749,9 +81750,9 @@ diff -urN clean/include/elan/kcomm_stats.h linux-2.6.9/include/elan/kcomm_stats.
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/include/elan/kmap.h linux-2.6.9/include/elan/kmap.h
---- clean/include/elan/kmap.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan/kmap.h 2004-12-14 05:19:23.000000000 -0500
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan/kmap.h RH_2_6_9_55.HEAD/include/elan/kmap.h
+--- RH_2_6_9_55.HEAD.orig/include/elan/kmap.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan/kmap.h
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -81821,9 +81822,9 @@ diff -urN clean/include/elan/kmap.h linux-2.6.9/include/elan/kmap.h
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/include/elan/kmsg.h linux-2.6.9/include/elan/kmsg.h
---- clean/include/elan/kmsg.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan/kmsg.h 2003-09-23 09:55:12.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan/kmsg.h RH_2_6_9_55.HEAD/include/elan/kmsg.h
+--- RH_2_6_9_55.HEAD.orig/include/elan/kmsg.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan/kmsg.h
@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2003 by Quadrics Ltd.
@@ -81839,9 +81840,9 @@ diff -urN clean/include/elan/kmsg.h linux-2.6.9/include/elan/kmsg.h
+/* $Source: /cvs/master/quadrics/epmod/kmsg.h,v $ */
+
+#endif /* __ELAN_KMSG_H */
-diff -urN clean/include/elan/kthread.h linux-2.6.9/include/elan/kthread.h
---- clean/include/elan/kthread.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan/kthread.h 2004-05-06 10:24:08.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan/kthread.h RH_2_6_9_55.HEAD/include/elan/kthread.h
+--- RH_2_6_9_55.HEAD.orig/include/elan/kthread.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan/kthread.h
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -81896,9 +81897,9 @@ diff -urN clean/include/elan/kthread.h linux-2.6.9/include/elan/kthread.h
+ * c-file-style: "linux"
+ * End:
+ */
-diff -urN clean/include/elan/nmh.h linux-2.6.9/include/elan/nmh.h
---- clean/include/elan/nmh.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan/nmh.h 2004-01-06 05:29:55.000000000 -0500
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan/nmh.h RH_2_6_9_55.HEAD/include/elan/nmh.h
+--- RH_2_6_9_55.HEAD.orig/include/elan/nmh.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan/nmh.h
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -81995,9 +81996,9 @@ diff -urN clean/include/elan/nmh.h linux-2.6.9/include/elan/nmh.h
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/include/elan/rmap.h linux-2.6.9/include/elan/rmap.h
---- clean/include/elan/rmap.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan/rmap.h 2004-05-19 06:24:40.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan/rmap.h RH_2_6_9_55.HEAD/include/elan/rmap.h
+--- RH_2_6_9_55.HEAD.orig/include/elan/rmap.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan/rmap.h
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -82048,9 +82049,9 @@ diff -urN clean/include/elan/rmap.h linux-2.6.9/include/elan/rmap.h
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/include/elan/statemap.h linux-2.6.9/include/elan/statemap.h
---- clean/include/elan/statemap.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan/statemap.h 2003-10-07 09:22:38.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan/statemap.h RH_2_6_9_55.HEAD/include/elan/statemap.h
+--- RH_2_6_9_55.HEAD.orig/include/elan/statemap.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan/statemap.h
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -82104,9 +82105,9 @@ diff -urN clean/include/elan/statemap.h linux-2.6.9/include/elan/statemap.h
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/include/elan/stats.h linux-2.6.9/include/elan/stats.h
---- clean/include/elan/stats.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan/stats.h 2003-09-24 09:55:37.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan/stats.h RH_2_6_9_55.HEAD/include/elan/stats.h
+--- RH_2_6_9_55.HEAD.orig/include/elan/stats.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan/stats.h
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2003 by Quadrics Limited.
@@ -82193,9 +82194,9 @@ diff -urN clean/include/elan/stats.h linux-2.6.9/include/elan/stats.h
+ * c-file-style: "linux"
+ * End:
+ */
-diff -urN clean/include/elan3/compat.h linux-2.6.9/include/elan3/compat.h
---- clean/include/elan3/compat.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan3/compat.h 2004-06-09 05:07:03.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan3/compat.h RH_2_6_9_55.HEAD/include/elan3/compat.h
+--- RH_2_6_9_55.HEAD.orig/include/elan3/compat.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan3/compat.h
@@ -0,0 +1,177 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -82374,9 +82375,9 @@ diff -urN clean/include/elan3/compat.h linux-2.6.9/include/elan3/compat.h
+ * End:
+ */
+
-diff -urN clean/include/elan3/dma.h linux-2.6.9/include/elan3/dma.h
---- clean/include/elan3/dma.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan3/dma.h 2002-08-21 08:43:27.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan3/dma.h RH_2_6_9_55.HEAD/include/elan3/dma.h
+--- RH_2_6_9_55.HEAD.orig/include/elan3/dma.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan3/dma.h
@@ -0,0 +1,213 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -82591,9 +82592,9 @@ diff -urN clean/include/elan3/dma.h linux-2.6.9/include/elan3/dma.h
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/include/elan3/e3types.h linux-2.6.9/include/elan3/e3types.h
---- clean/include/elan3/e3types.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan3/e3types.h 2002-08-09 07:23:33.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan3/e3types.h RH_2_6_9_55.HEAD/include/elan3/e3types.h
+--- RH_2_6_9_55.HEAD.orig/include/elan3/e3types.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan3/e3types.h
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -82677,9 +82678,9 @@ diff -urN clean/include/elan3/e3types.h linux-2.6.9/include/elan3/e3types.h
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/include/elan3/elan3mmu.h linux-2.6.9/include/elan3/elan3mmu.h
---- clean/include/elan3/elan3mmu.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan3/elan3mmu.h 2004-12-14 05:19:32.000000000 -0500
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan3/elan3mmu.h RH_2_6_9_55.HEAD/include/elan3/elan3mmu.h
+--- RH_2_6_9_55.HEAD.orig/include/elan3/elan3mmu.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan3/elan3mmu.h
@@ -0,0 +1,346 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -83027,9 +83028,9 @@ diff -urN clean/include/elan3/elan3mmu.h linux-2.6.9/include/elan3/elan3mmu.h
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/include/elan3/elan3mmu_linux.h linux-2.6.9/include/elan3/elan3mmu_linux.h
---- clean/include/elan3/elan3mmu_linux.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan3/elan3mmu_linux.h 2003-09-24 09:57:24.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan3/elan3mmu_linux.h RH_2_6_9_55.HEAD/include/elan3/elan3mmu_linux.h
+--- RH_2_6_9_55.HEAD.orig/include/elan3/elan3mmu_linux.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan3/elan3mmu_linux.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -83070,9 +83071,9 @@ diff -urN clean/include/elan3/elan3mmu_linux.h linux-2.6.9/include/elan3/elan3mm
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/include/elan3/elan3ops.h linux-2.6.9/include/elan3/elan3ops.h
---- clean/include/elan3/elan3ops.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan3/elan3ops.h 2003-09-24 09:57:24.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan3/elan3ops.h RH_2_6_9_55.HEAD/include/elan3/elan3ops.h
+--- RH_2_6_9_55.HEAD.orig/include/elan3/elan3ops.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan3/elan3ops.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -83116,9 +83117,9 @@ diff -urN clean/include/elan3/elan3ops.h linux-2.6.9/include/elan3/elan3ops.h
+ * c-file-style: "linux"
+ * End:
+ */
-diff -urN clean/include/elan3/elanctxt.h linux-2.6.9/include/elan3/elanctxt.h
---- clean/include/elan3/elanctxt.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan3/elanctxt.h 2003-09-24 09:57:24.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan3/elanctxt.h RH_2_6_9_55.HEAD/include/elan3/elanctxt.h
+--- RH_2_6_9_55.HEAD.orig/include/elan3/elanctxt.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan3/elanctxt.h
@@ -0,0 +1,856 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -83976,9 +83977,9 @@ diff -urN clean/include/elan3/elanctxt.h linux-2.6.9/include/elan3/elanctxt.h
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/include/elan3/elandebug.h linux-2.6.9/include/elan3/elandebug.h
---- clean/include/elan3/elandebug.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan3/elandebug.h 2003-09-24 09:57:24.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan3/elandebug.h RH_2_6_9_55.HEAD/include/elan3/elandebug.h
+--- RH_2_6_9_55.HEAD.orig/include/elan3/elandebug.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan3/elandebug.h
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -84086,9 +84087,9 @@ diff -urN clean/include/elan3/elandebug.h linux-2.6.9/include/elan3/elandebug.h
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/include/elan3/elandev.h linux-2.6.9/include/elan3/elandev.h
---- clean/include/elan3/elandev.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan3/elandev.h 2005-07-20 07:35:20.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan3/elandev.h RH_2_6_9_55.HEAD/include/elan3/elandev.h
+--- RH_2_6_9_55.HEAD.orig/include/elan3/elandev.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan3/elandev.h
@@ -0,0 +1,581 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -84671,9 +84672,9 @@ diff -urN clean/include/elan3/elandev.h linux-2.6.9/include/elan3/elandev.h
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/include/elan3/elandev_linux.h linux-2.6.9/include/elan3/elandev_linux.h
---- clean/include/elan3/elandev_linux.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan3/elandev_linux.h 2005-04-05 11:28:37.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan3/elandev_linux.h RH_2_6_9_55.HEAD/include/elan3/elandev_linux.h
+--- RH_2_6_9_55.HEAD.orig/include/elan3/elandev_linux.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan3/elandev_linux.h
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -84749,9 +84750,9 @@ diff -urN clean/include/elan3/elandev_linux.h linux-2.6.9/include/elan3/elandev_
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/include/elan3/elanio.h linux-2.6.9/include/elan3/elanio.h
---- clean/include/elan3/elanio.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan3/elanio.h 2003-12-08 10:40:26.000000000 -0500
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan3/elanio.h RH_2_6_9_55.HEAD/include/elan3/elanio.h
+--- RH_2_6_9_55.HEAD.orig/include/elan3/elanio.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan3/elanio.h
@@ -0,0 +1,226 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -84979,9 +84980,9 @@ diff -urN clean/include/elan3/elanio.h linux-2.6.9/include/elan3/elanio.h
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/include/elan3/elanregs.h linux-2.6.9/include/elan3/elanregs.h
---- clean/include/elan3/elanregs.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan3/elanregs.h 2004-04-22 08:27:21.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan3/elanregs.h RH_2_6_9_55.HEAD/include/elan3/elanregs.h
+--- RH_2_6_9_55.HEAD.orig/include/elan3/elanregs.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan3/elanregs.h
@@ -0,0 +1,1063 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -86046,9 +86047,9 @@ diff -urN clean/include/elan3/elanregs.h linux-2.6.9/include/elan3/elanregs.h
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/include/elan3/elansyscall.h linux-2.6.9/include/elan3/elansyscall.h
---- clean/include/elan3/elansyscall.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan3/elansyscall.h 2004-06-07 09:50:06.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan3/elansyscall.h RH_2_6_9_55.HEAD/include/elan3/elansyscall.h
+--- RH_2_6_9_55.HEAD.orig/include/elan3/elansyscall.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan3/elansyscall.h
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -86174,9 +86175,9 @@ diff -urN clean/include/elan3/elansyscall.h linux-2.6.9/include/elan3/elansyscal
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/include/elan3/elanuregs.h linux-2.6.9/include/elan3/elanuregs.h
---- clean/include/elan3/elanuregs.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan3/elanuregs.h 2003-09-24 09:57:24.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan3/elanuregs.h RH_2_6_9_55.HEAD/include/elan3/elanuregs.h
+--- RH_2_6_9_55.HEAD.orig/include/elan3/elanuregs.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan3/elanuregs.h
@@ -0,0 +1,295 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -86473,9 +86474,9 @@ diff -urN clean/include/elan3/elanuregs.h linux-2.6.9/include/elan3/elanuregs.h
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/include/elan3/elanvp.h linux-2.6.9/include/elan3/elanvp.h
---- clean/include/elan3/elanvp.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan3/elanvp.h 2004-06-18 05:28:06.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan3/elanvp.h RH_2_6_9_55.HEAD/include/elan3/elanvp.h
+--- RH_2_6_9_55.HEAD.orig/include/elan3/elanvp.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan3/elanvp.h
@@ -0,0 +1,165 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -86642,9 +86643,9 @@ diff -urN clean/include/elan3/elanvp.h linux-2.6.9/include/elan3/elanvp.h
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/include/elan3/events.h linux-2.6.9/include/elan3/events.h
---- clean/include/elan3/events.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan3/events.h 2003-09-24 09:57:24.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan3/events.h RH_2_6_9_55.HEAD/include/elan3/events.h
+--- RH_2_6_9_55.HEAD.orig/include/elan3/events.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan3/events.h
@@ -0,0 +1,183 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -86829,9 +86830,9 @@ diff -urN clean/include/elan3/events.h linux-2.6.9/include/elan3/events.h
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/include/elan3/intrinsics.h linux-2.6.9/include/elan3/intrinsics.h
---- clean/include/elan3/intrinsics.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan3/intrinsics.h 2003-09-24 09:57:24.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan3/intrinsics.h RH_2_6_9_55.HEAD/include/elan3/intrinsics.h
+--- RH_2_6_9_55.HEAD.orig/include/elan3/intrinsics.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan3/intrinsics.h
@@ -0,0 +1,320 @@
+/*
+ * Copyright (c) 2003 by Quadrics Limited.
@@ -87153,9 +87154,9 @@ diff -urN clean/include/elan3/intrinsics.h linux-2.6.9/include/elan3/intrinsics.
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/include/elan3/minames.h linux-2.6.9/include/elan3/minames.h
---- clean/include/elan3/minames.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan3/minames.h 2005-09-07 10:39:37.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan3/minames.h RH_2_6_9_55.HEAD/include/elan3/minames.h
+--- RH_2_6_9_55.HEAD.orig/include/elan3/minames.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan3/minames.h
@@ -0,0 +1,256 @@
+{MI_WaitForRemoteDescRead, "MI_WaitForRemoteDescRead"},
+{MI_WaitForRemoteDescRead2, "MI_WaitForRemoteDescRead2"},
@@ -87413,9 +87414,9 @@ diff -urN clean/include/elan3/minames.h linux-2.6.9/include/elan3/minames.h
+{MI_CheckForRunIfZero, "MI_CheckForRunIfZero"},
+{MI_TestForBreakOrSuspend, "MI_TestForBreakOrSuspend"},
+{MI_SwapForRunable, "MI_SwapForRunable"},
-diff -urN clean/include/elan3/neterr_rpc.h linux-2.6.9/include/elan3/neterr_rpc.h
---- clean/include/elan3/neterr_rpc.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan3/neterr_rpc.h 2003-06-26 12:05:22.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan3/neterr_rpc.h RH_2_6_9_55.HEAD/include/elan3/neterr_rpc.h
+--- RH_2_6_9_55.HEAD.orig/include/elan3/neterr_rpc.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan3/neterr_rpc.h
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -87485,9 +87486,9 @@ diff -urN clean/include/elan3/neterr_rpc.h linux-2.6.9/include/elan3/neterr_rpc.
+ * End:
+ */
+#endif /* __ELAN3_NETERR_RPC_H */
-diff -urN clean/include/elan3/perm.h linux-2.6.9/include/elan3/perm.h
---- clean/include/elan3/perm.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan3/perm.h 2003-09-24 09:57:24.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan3/perm.h RH_2_6_9_55.HEAD/include/elan3/perm.h
+--- RH_2_6_9_55.HEAD.orig/include/elan3/perm.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan3/perm.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -87518,9 +87519,9 @@ diff -urN clean/include/elan3/perm.h linux-2.6.9/include/elan3/perm.h
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/include/elan3/pte.h linux-2.6.9/include/elan3/pte.h
---- clean/include/elan3/pte.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan3/pte.h 2003-09-24 09:57:24.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan3/pte.h RH_2_6_9_55.HEAD/include/elan3/pte.h
+--- RH_2_6_9_55.HEAD.orig/include/elan3/pte.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan3/pte.h
@@ -0,0 +1,139 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -87661,9 +87662,9 @@ diff -urN clean/include/elan3/pte.h linux-2.6.9/include/elan3/pte.h
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/include/elan3/spinlock.h linux-2.6.9/include/elan3/spinlock.h
---- clean/include/elan3/spinlock.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan3/spinlock.h 2003-09-24 09:57:24.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan3/spinlock.h RH_2_6_9_55.HEAD/include/elan3/spinlock.h
+--- RH_2_6_9_55.HEAD.orig/include/elan3/spinlock.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan3/spinlock.h
@@ -0,0 +1,195 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -87860,9 +87861,9 @@ diff -urN clean/include/elan3/spinlock.h linux-2.6.9/include/elan3/spinlock.h
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/include/elan3/thread.h linux-2.6.9/include/elan3/thread.h
---- clean/include/elan3/thread.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan3/thread.h 2002-08-09 07:23:34.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan3/thread.h RH_2_6_9_55.HEAD/include/elan3/thread.h
+--- RH_2_6_9_55.HEAD.orig/include/elan3/thread.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan3/thread.h
@@ -0,0 +1,137 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -88001,9 +88002,9 @@ diff -urN clean/include/elan3/thread.h linux-2.6.9/include/elan3/thread.h
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/include/elan3/threadlinkage.h linux-2.6.9/include/elan3/threadlinkage.h
---- clean/include/elan3/threadlinkage.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan3/threadlinkage.h 2002-08-09 07:23:34.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan3/threadlinkage.h RH_2_6_9_55.HEAD/include/elan3/threadlinkage.h
+--- RH_2_6_9_55.HEAD.orig/include/elan3/threadlinkage.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan3/threadlinkage.h
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -88108,9 +88109,9 @@ diff -urN clean/include/elan3/threadlinkage.h linux-2.6.9/include/elan3/threadli
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/include/elan3/threadsyscall.h linux-2.6.9/include/elan3/threadsyscall.h
---- clean/include/elan3/threadsyscall.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan3/threadsyscall.h 2003-09-24 09:57:24.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan3/threadsyscall.h RH_2_6_9_55.HEAD/include/elan3/threadsyscall.h
+--- RH_2_6_9_55.HEAD.orig/include/elan3/threadsyscall.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan3/threadsyscall.h
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -88176,9 +88177,9 @@ diff -urN clean/include/elan3/threadsyscall.h linux-2.6.9/include/elan3/threadsy
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/include/elan3/trtype.h linux-2.6.9/include/elan3/trtype.h
---- clean/include/elan3/trtype.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan3/trtype.h 2002-08-09 07:23:34.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan3/trtype.h RH_2_6_9_55.HEAD/include/elan3/trtype.h
+--- RH_2_6_9_55.HEAD.orig/include/elan3/trtype.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan3/trtype.h
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -88296,9 +88297,9 @@ diff -urN clean/include/elan3/trtype.h linux-2.6.9/include/elan3/trtype.h
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/include/elan3/urom_addrs.h linux-2.6.9/include/elan3/urom_addrs.h
---- clean/include/elan3/urom_addrs.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan3/urom_addrs.h 2002-07-12 10:28:21.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan3/urom_addrs.h RH_2_6_9_55.HEAD/include/elan3/urom_addrs.h
+--- RH_2_6_9_55.HEAD.orig/include/elan3/urom_addrs.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan3/urom_addrs.h
@@ -0,0 +1,262 @@
+#define MI_WaitForRemoteDescRead 0x0
+#define MI_WaitForRemoteDescRead2 0x1
@@ -88562,9 +88563,9 @@ diff -urN clean/include/elan3/urom_addrs.h linux-2.6.9/include/elan3/urom_addrs.
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/include/elan3/vmseg.h linux-2.6.9/include/elan3/vmseg.h
---- clean/include/elan3/vmseg.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan3/vmseg.h 2003-09-24 09:57:24.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan3/vmseg.h RH_2_6_9_55.HEAD/include/elan3/vmseg.h
+--- RH_2_6_9_55.HEAD.orig/include/elan3/vmseg.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan3/vmseg.h
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -88641,9 +88642,9 @@ diff -urN clean/include/elan3/vmseg.h linux-2.6.9/include/elan3/vmseg.h
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/include/elan3/vpd.h linux-2.6.9/include/elan3/vpd.h
---- clean/include/elan3/vpd.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan3/vpd.h 2002-08-09 07:23:34.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan3/vpd.h RH_2_6_9_55.HEAD/include/elan3/vpd.h
+--- RH_2_6_9_55.HEAD.orig/include/elan3/vpd.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan3/vpd.h
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -88692,9 +88693,9 @@ diff -urN clean/include/elan3/vpd.h linux-2.6.9/include/elan3/vpd.h
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/include/elan4/commands.h linux-2.6.9/include/elan4/commands.h
---- clean/include/elan4/commands.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan4/commands.h 2004-06-16 11:45:02.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan4/commands.h RH_2_6_9_55.HEAD/include/elan4/commands.h
+--- RH_2_6_9_55.HEAD.orig/include/elan4/commands.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan4/commands.h
@@ -0,0 +1,247 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -88943,9 +88944,9 @@ diff -urN clean/include/elan4/commands.h linux-2.6.9/include/elan4/commands.h
+
+#endif /* __ELAN4_COMMANDS_H */
+
-diff -urN clean/include/elan4/debug.h linux-2.6.9/include/elan4/debug.h
---- clean/include/elan4/debug.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan4/debug.h 2005-03-23 06:06:15.000000000 -0500
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan4/debug.h RH_2_6_9_55.HEAD/include/elan4/debug.h
+--- RH_2_6_9_55.HEAD.orig/include/elan4/debug.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan4/debug.h
@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd.
@@ -89059,9 +89060,9 @@ diff -urN clean/include/elan4/debug.h linux-2.6.9/include/elan4/debug.h
+ * End:
+ */
+#endif /* _ELAN4_DEBUG_H */
-diff -urN clean/include/elan4/device.h linux-2.6.9/include/elan4/device.h
---- clean/include/elan4/device.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan4/device.h 2005-08-09 05:57:04.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan4/device.h RH_2_6_9_55.HEAD/include/elan4/device.h
+--- RH_2_6_9_55.HEAD.orig/include/elan4/device.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan4/device.h
@@ -0,0 +1,888 @@
+/*
+ * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd.
@@ -89951,9 +89952,9 @@ diff -urN clean/include/elan4/device.h linux-2.6.9/include/elan4/device.h
+ * End:
+ */
+#endif /* __ELAN4_ELANDEV_H */
-diff -urN clean/include/elan4/device_Linux.h linux-2.6.9/include/elan4/device_Linux.h
---- clean/include/elan4/device_Linux.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan4/device_Linux.h 2005-04-05 11:29:28.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan4/device_Linux.h RH_2_6_9_55.HEAD/include/elan4/device_Linux.h
+--- RH_2_6_9_55.HEAD.orig/include/elan4/device_Linux.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan4/device_Linux.h
@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd.
@@ -90073,9 +90074,9 @@ diff -urN clean/include/elan4/device_Linux.h linux-2.6.9/include/elan4/device_Li
+ * End:
+ */
+#endif /* __ELAN4_ELANDEV_LINUX_H */
-diff -urN clean/include/elan4/dma.h linux-2.6.9/include/elan4/dma.h
---- clean/include/elan4/dma.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan4/dma.h 2003-09-04 08:39:17.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan4/dma.h RH_2_6_9_55.HEAD/include/elan4/dma.h
+--- RH_2_6_9_55.HEAD.orig/include/elan4/dma.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan4/dma.h
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -90159,9 +90160,9 @@ diff -urN clean/include/elan4/dma.h linux-2.6.9/include/elan4/dma.h
+} E4_DMA64;
+
+#endif /* __ELAN4_DMA_H */
-diff -urN clean/include/elan4/events.h linux-2.6.9/include/elan4/events.h
---- clean/include/elan4/events.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan4/events.h 2004-06-23 07:07:18.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan4/events.h RH_2_6_9_55.HEAD/include/elan4/events.h
+--- RH_2_6_9_55.HEAD.orig/include/elan4/events.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan4/events.h
@@ -0,0 +1,179 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -90342,9 +90343,9 @@ diff -urN clean/include/elan4/events.h linux-2.6.9/include/elan4/events.h
+#endif /* _ASM */
+
+#endif /* __ELAN4_EVENTS_H */
-diff -urN clean/include/elan4/i2c.h linux-2.6.9/include/elan4/i2c.h
---- clean/include/elan4/i2c.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan4/i2c.h 2003-12-02 11:11:22.000000000 -0500
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan4/i2c.h RH_2_6_9_55.HEAD/include/elan4/i2c.h
+--- RH_2_6_9_55.HEAD.orig/include/elan4/i2c.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan4/i2c.h
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -90393,9 +90394,9 @@ diff -urN clean/include/elan4/i2c.h linux-2.6.9/include/elan4/i2c.h
+ * End:
+ */
+#endif /* _ELAN4_I2C_H */
-diff -urN clean/include/elan4/intcookie.h linux-2.6.9/include/elan4/intcookie.h
---- clean/include/elan4/intcookie.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan4/intcookie.h 2004-08-09 10:02:37.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan4/intcookie.h RH_2_6_9_55.HEAD/include/elan4/intcookie.h
+--- RH_2_6_9_55.HEAD.orig/include/elan4/intcookie.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan4/intcookie.h
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd.
@@ -90459,9 +90460,9 @@ diff -urN clean/include/elan4/intcookie.h linux-2.6.9/include/elan4/intcookie.h
+ * End:
+ */
+#endif /* __ELAN4_INTCOOKIE_H */
-diff -urN clean/include/elan4/ioctl.h linux-2.6.9/include/elan4/ioctl.h
---- clean/include/elan4/ioctl.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan4/ioctl.h 2005-01-10 12:45:50.000000000 -0500
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan4/ioctl.h RH_2_6_9_55.HEAD/include/elan4/ioctl.h
+--- RH_2_6_9_55.HEAD.orig/include/elan4/ioctl.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan4/ioctl.h
@@ -0,0 +1,320 @@
+/*
+ * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd.
@@ -90783,9 +90784,9 @@ diff -urN clean/include/elan4/ioctl.h linux-2.6.9/include/elan4/ioctl.h
+ * End:
+ */
+#endif /* __ELAN4_IOCTL_H */
-diff -urN clean/include/elan4/mmu.h linux-2.6.9/include/elan4/mmu.h
---- clean/include/elan4/mmu.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan4/mmu.h 2005-04-21 07:12:06.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan4/mmu.h RH_2_6_9_55.HEAD/include/elan4/mmu.h
+--- RH_2_6_9_55.HEAD.orig/include/elan4/mmu.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan4/mmu.h
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd.
@@ -90904,9 +90905,9 @@ diff -urN clean/include/elan4/mmu.h linux-2.6.9/include/elan4/mmu.h
+ * End:
+ */
+#endif /* __ELAN4_MMU_H */
-diff -urN clean/include/elan4/neterr.h linux-2.6.9/include/elan4/neterr.h
---- clean/include/elan4/neterr.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan4/neterr.h 2004-01-19 09:38:34.000000000 -0500
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan4/neterr.h RH_2_6_9_55.HEAD/include/elan4/neterr.h
+--- RH_2_6_9_55.HEAD.orig/include/elan4/neterr.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan4/neterr.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -90948,9 +90949,9 @@ diff -urN clean/include/elan4/neterr.h linux-2.6.9/include/elan4/neterr.h
+ * End:
+ */
+#endif /* __ELAN4_NETERR_H */
-diff -urN clean/include/elan4/pci.h linux-2.6.9/include/elan4/pci.h
---- clean/include/elan4/pci.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan4/pci.h 2003-09-04 08:39:17.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan4/pci.h RH_2_6_9_55.HEAD/include/elan4/pci.h
+--- RH_2_6_9_55.HEAD.orig/include/elan4/pci.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan4/pci.h
@@ -0,0 +1,227 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -91179,9 +91180,9 @@ diff -urN clean/include/elan4/pci.h linux-2.6.9/include/elan4/pci.h
+#define ECTRL_SYS_CLOCK_RATIO_MASK (7 << ECTRL_SYS_CLOCK_RATIO_SHIFT)
+
+#endif /* __ELAN4_PCI_H */
-diff -urN clean/include/elan4/registers.h linux-2.6.9/include/elan4/registers.h
---- clean/include/elan4/registers.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan4/registers.h 2005-03-03 11:28:50.000000000 -0500
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan4/registers.h RH_2_6_9_55.HEAD/include/elan4/registers.h
+--- RH_2_6_9_55.HEAD.orig/include/elan4/registers.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan4/registers.h
@@ -0,0 +1,1587 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -92770,9 +92771,9 @@ diff -urN clean/include/elan4/registers.h linux-2.6.9/include/elan4/registers.h
+#define ELAN4_REVB_NUM_COMMAND_QUEUES (ELAN4_REVB_I2C_OFFSET >> 13)
+
+#endif /* notdef _ELAN4_REGISTERS_H */
-diff -urN clean/include/elan4/sdram.h linux-2.6.9/include/elan4/sdram.h
---- clean/include/elan4/sdram.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan4/sdram.h 2003-09-24 09:55:55.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan4/sdram.h RH_2_6_9_55.HEAD/include/elan4/sdram.h
+--- RH_2_6_9_55.HEAD.orig/include/elan4/sdram.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan4/sdram.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -92815,9 +92816,9 @@ diff -urN clean/include/elan4/sdram.h linux-2.6.9/include/elan4/sdram.h
+#define SDRAM_MIN_PAGE_SIZE (8192)
+
+#endif /* __ELAN4_SDRAM_H */
-diff -urN clean/include/elan4/stats.h linux-2.6.9/include/elan4/stats.h
---- clean/include/elan4/stats.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan4/stats.h 2005-04-19 12:14:52.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan4/stats.h RH_2_6_9_55.HEAD/include/elan4/stats.h
+--- RH_2_6_9_55.HEAD.orig/include/elan4/stats.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan4/stats.h
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd.
@@ -92902,9 +92903,9 @@ diff -urN clean/include/elan4/stats.h linux-2.6.9/include/elan4/stats.h
+ * End:
+ */
+#endif /*__ELAN4_STATS_H */
-diff -urN clean/include/elan4/tprintf.h linux-2.6.9/include/elan4/tprintf.h
---- clean/include/elan4/tprintf.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan4/tprintf.h 2003-09-04 08:39:17.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan4/tprintf.h RH_2_6_9_55.HEAD/include/elan4/tprintf.h
+--- RH_2_6_9_55.HEAD.orig/include/elan4/tprintf.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan4/tprintf.h
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -92930,9 +92931,9 @@ diff -urN clean/include/elan4/tprintf.h linux-2.6.9/include/elan4/tprintf.h
+#endif /* _ASM */
+
+#endif /* __ELAN4_TPRINTF_H */
-diff -urN clean/include/elan4/trap.h linux-2.6.9/include/elan4/trap.h
---- clean/include/elan4/trap.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan4/trap.h 2003-10-07 08:11:10.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan4/trap.h RH_2_6_9_55.HEAD/include/elan4/trap.h
+--- RH_2_6_9_55.HEAD.orig/include/elan4/trap.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan4/trap.h
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd.
@@ -93029,9 +93030,9 @@ diff -urN clean/include/elan4/trap.h linux-2.6.9/include/elan4/trap.h
+ * End:
+ */
+#endif /* __ELAN4_TRAP_H */
-diff -urN clean/include/elan4/trtype.h linux-2.6.9/include/elan4/trtype.h
---- clean/include/elan4/trtype.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan4/trtype.h 2004-02-06 05:38:21.000000000 -0500
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan4/trtype.h RH_2_6_9_55.HEAD/include/elan4/trtype.h
+--- RH_2_6_9_55.HEAD.orig/include/elan4/trtype.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan4/trtype.h
@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -93145,9 +93146,9 @@ diff -urN clean/include/elan4/trtype.h linux-2.6.9/include/elan4/trtype.h
+#define TR_TRACEROUTE1_BCAST_BOTTOM(val) (((val) >> 12) & 7) /* 12:14 Broadcast Bottom */
+
+#endif /* _ELAN4_TRANSACTIONTYPE_H */
-diff -urN clean/include/elan4/types.h linux-2.6.9/include/elan4/types.h
---- clean/include/elan4/types.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan4/types.h 2003-09-04 08:39:17.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan4/types.h RH_2_6_9_55.HEAD/include/elan4/types.h
+--- RH_2_6_9_55.HEAD.orig/include/elan4/types.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan4/types.h
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -93218,9 +93219,9 @@ diff -urN clean/include/elan4/types.h linux-2.6.9/include/elan4/types.h
+
+#endif /* __ELAN4_TYPES_H */
+
-diff -urN clean/include/elan4/user.h linux-2.6.9/include/elan4/user.h
---- clean/include/elan4/user.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan4/user.h 2005-04-21 07:12:06.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan4/user.h RH_2_6_9_55.HEAD/include/elan4/user.h
+--- RH_2_6_9_55.HEAD.orig/include/elan4/user.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan4/user.h
@@ -0,0 +1,347 @@
+/*
+ * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd.
@@ -93569,9 +93570,9 @@ diff -urN clean/include/elan4/user.h linux-2.6.9/include/elan4/user.h
+ * End:
+ */
+#endif /* __ELAN4_USER_H */
-diff -urN clean/include/elan4/userregs.h linux-2.6.9/include/elan4/userregs.h
---- clean/include/elan4/userregs.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan4/userregs.h 2004-10-06 10:50:38.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan4/userregs.h RH_2_6_9_55.HEAD/include/elan4/userregs.h
+--- RH_2_6_9_55.HEAD.orig/include/elan4/userregs.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan4/userregs.h
@@ -0,0 +1,383 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -93956,9 +93957,9 @@ diff -urN clean/include/elan4/userregs.h linux-2.6.9/include/elan4/userregs.h
+#endif
+
+#endif /* __ELAN4_USERREGS_H */
-diff -urN clean/include/elan4/usertrap.h linux-2.6.9/include/elan4/usertrap.h
---- clean/include/elan4/usertrap.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan4/usertrap.h 2004-05-05 05:08:35.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan4/usertrap.h RH_2_6_9_55.HEAD/include/elan4/usertrap.h
+--- RH_2_6_9_55.HEAD.orig/include/elan4/usertrap.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan4/usertrap.h
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd.
@@ -94074,9 +94075,9 @@ diff -urN clean/include/elan4/usertrap.h linux-2.6.9/include/elan4/usertrap.h
+ * End:
+ */
+#endif /* __ELAN4_USERTRAP_H */
-diff -urN clean/include/elan4/xsdram.h linux-2.6.9/include/elan4/xsdram.h
---- clean/include/elan4/xsdram.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/elan4/xsdram.h 2004-03-05 07:32:04.000000000 -0500
+diff -urpN RH_2_6_9_55.HEAD.orig/include/elan4/xsdram.h RH_2_6_9_55.HEAD/include/elan4/xsdram.h
+--- RH_2_6_9_55.HEAD.orig/include/elan4/xsdram.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/elan4/xsdram.h
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -94137,9 +94138,9 @@ diff -urN clean/include/elan4/xsdram.h linux-2.6.9/include/elan4/xsdram.h
+#endif
+
+#endif /* __ELAN4_XSDRAM_H */
-diff -urN clean/include/jtag/jtagio.h linux-2.6.9/include/jtag/jtagio.h
---- clean/include/jtag/jtagio.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/jtag/jtagio.h 2004-12-16 05:39:27.000000000 -0500
+diff -urpN RH_2_6_9_55.HEAD.orig/include/jtag/jtagio.h RH_2_6_9_55.HEAD/include/jtag/jtagio.h
+--- RH_2_6_9_55.HEAD.orig/include/jtag/jtagio.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/jtag/jtagio.h
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -94247,9 +94248,9 @@ diff -urN clean/include/jtag/jtagio.h linux-2.6.9/include/jtag/jtagio.h
+#endif
+
+#endif /* __SYS_JTAGMOD_H */
-diff -urN clean/include/linux/init_task.h linux-2.6.9/include/linux/init_task.h
---- clean/include/linux/init_task.h 2004-10-18 17:53:13.000000000 -0400
-+++ linux-2.6.9/include/linux/init_task.h 2005-10-10 17:47:17.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/linux/init_task.h RH_2_6_9_55.HEAD/include/linux/init_task.h
+--- RH_2_6_9_55.HEAD.orig/include/linux/init_task.h
++++ RH_2_6_9_55.HEAD/include/linux/init_task.h
@@ -2,6 +2,7 @@
#define _LINUX__INIT_TASK_H
@@ -94258,7 +94259,7 @@ diff -urN clean/include/linux/init_task.h linux-2.6.9/include/linux/init_task.h
#define INIT_FILES \
{ \
-@@ -112,6 +113,7 @@
+@@ -112,6 +113,7 @@ extern struct group_info init_groups;
.proc_lock = SPIN_LOCK_UNLOCKED, \
.switch_lock = SPIN_LOCK_UNLOCKED, \
.journal_info = NULL, \
@@ -94266,9 +94267,9 @@ diff -urN clean/include/linux/init_task.h linux-2.6.9/include/linux/init_task.h
}
-diff -urN clean/include/linux/ioproc.h linux-2.6.9/include/linux/ioproc.h
---- clean/include/linux/ioproc.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/linux/ioproc.h 2005-10-10 17:47:17.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/linux/ioproc.h RH_2_6_9_55.HEAD/include/linux/ioproc.h
+--- RH_2_6_9_55.HEAD.orig/include/linux/ioproc.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/linux/ioproc.h
@@ -0,0 +1,271 @@
+/* -*- linux-c -*-
+ *
@@ -94541,9 +94542,9 @@ diff -urN clean/include/linux/ioproc.h linux-2.6.9/include/linux/ioproc.h
+#endif /* CONFIG_IOPROC */
+
+#endif /* __LINUX_IOPROC_H__ */
-diff -urN clean/include/linux/ptrack.h linux-2.6.9/include/linux/ptrack.h
---- clean/include/linux/ptrack.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/linux/ptrack.h 2005-10-10 17:47:17.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/linux/ptrack.h RH_2_6_9_55.HEAD/include/linux/ptrack.h
+--- RH_2_6_9_55.HEAD.orig/include/linux/ptrack.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/linux/ptrack.h
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2000 Regents of the University of California
@@ -94610,10 +94611,10 @@ diff -urN clean/include/linux/ptrack.h linux-2.6.9/include/linux/ptrack.h
+#endif
+
+#endif /* __LINUX_PTRACK_H */
-diff -urN clean/include/linux/sched.h linux-2.6.9/include/linux/sched.h
---- clean/include/linux/sched.h 2005-05-13 13:39:11.000000000 -0400
-+++ linux-2.6.9/include/linux/sched.h 2005-10-10 17:47:17.000000000 -0400
-@@ -184,6 +184,9 @@
+diff -urpN RH_2_6_9_55.HEAD.orig/include/linux/sched.h RH_2_6_9_55.HEAD/include/linux/sched.h
+--- RH_2_6_9_55.HEAD.orig/include/linux/sched.h
++++ RH_2_6_9_55.HEAD/include/linux/sched.h
+@@ -185,6 +185,9 @@ extern signed long schedule_timeout_unin
asmlinkage void schedule(void);
struct namespace;
@@ -94623,7 +94624,7 @@ diff -urN clean/include/linux/sched.h linux-2.6.9/include/linux/sched.h
/* Maximum number of active map areas.. This is a random (large) number */
#define DEFAULT_MAX_MAP_COUNT 65536
-@@ -259,6 +262,11 @@
+@@ -260,6 +263,11 @@ struct mm_struct {
struct kioctx *ioctx_list;
struct kioctx default_kioctx;
@@ -94635,7 +94636,7 @@ diff -urN clean/include/linux/sched.h linux-2.6.9/include/linux/sched.h
};
extern int mmlist_nr;
-@@ -600,6 +608,10 @@
+@@ -635,6 +643,10 @@ struct task_struct {
struct mempolicy *mempolicy;
short il_next; /* could be shared with used_math */
#endif
@@ -94646,9 +94647,9 @@ diff -urN clean/include/linux/sched.h linux-2.6.9/include/linux/sched.h
};
static inline pid_t process_group(struct task_struct *tsk)
-diff -urN clean/include/qsnet/autoconf.h linux-2.6.9/include/qsnet/autoconf.h
---- clean/include/qsnet/autoconf.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/qsnet/autoconf.h 2005-10-10 17:47:30.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/qsnet/autoconf.h RH_2_6_9_55.HEAD/include/qsnet/autoconf.h
+--- RH_2_6_9_55.HEAD.orig/include/qsnet/autoconf.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/qsnet/autoconf.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2005 by Quadrics Ltd.
@@ -94694,9 +94695,9 @@ diff -urN clean/include/qsnet/autoconf.h linux-2.6.9/include/qsnet/autoconf.h
+
+#endif /* __QSNET_AUTOCONF_H */
+
-diff -urN clean/include/qsnet/condvar.h linux-2.6.9/include/qsnet/condvar.h
---- clean/include/qsnet/condvar.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/qsnet/condvar.h 2003-06-07 11:43:33.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/qsnet/condvar.h RH_2_6_9_55.HEAD/include/qsnet/condvar.h
+--- RH_2_6_9_55.HEAD.orig/include/qsnet/condvar.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/qsnet/condvar.h
@@ -0,0 +1,140 @@
+/*
+ * Copyright (C) 2000 Regents of the University of California
@@ -94838,9 +94839,9 @@ diff -urN clean/include/qsnet/condvar.h linux-2.6.9/include/qsnet/condvar.h
+
+#endif /* __KERNEL__ */
+#endif /* _LINUX_CONDVAR_H */
-diff -urN clean/include/qsnet/config.h linux-2.6.9/include/qsnet/config.h
---- clean/include/qsnet/config.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/qsnet/config.h 2005-04-28 18:59:31.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/qsnet/config.h RH_2_6_9_55.HEAD/include/qsnet/config.h
+--- RH_2_6_9_55.HEAD.orig/include/qsnet/config.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/qsnet/config.h
@@ -0,0 +1,195 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -95037,9 +95038,9 @@ diff -urN clean/include/qsnet/config.h linux-2.6.9/include/qsnet/config.h
+#include <qsnet/workarounds.h>
+
+#endif /* _QSNET_CONFIG_H */
-diff -urN clean/include/qsnet/crwlock.h linux-2.6.9/include/qsnet/crwlock.h
---- clean/include/qsnet/crwlock.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/qsnet/crwlock.h 2003-09-24 10:07:02.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/qsnet/crwlock.h RH_2_6_9_55.HEAD/include/qsnet/crwlock.h
+--- RH_2_6_9_55.HEAD.orig/include/qsnet/crwlock.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/qsnet/crwlock.h
@@ -0,0 +1,207 @@
+/*
+ * Copyright (C) 2000 Regents of the University of California
@@ -95248,9 +95249,9 @@ diff -urN clean/include/qsnet/crwlock.h linux-2.6.9/include/qsnet/crwlock.h
+
+#endif /* __KERNEL__ */
+#endif /* _LINUX_RWLOCK_H */
-diff -urN clean/include/qsnet/ctrl_linux.h linux-2.6.9/include/qsnet/ctrl_linux.h
---- clean/include/qsnet/ctrl_linux.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/qsnet/ctrl_linux.h 2003-03-26 04:32:03.000000000 -0500
+diff -urpN RH_2_6_9_55.HEAD.orig/include/qsnet/ctrl_linux.h RH_2_6_9_55.HEAD/include/qsnet/ctrl_linux.h
+--- RH_2_6_9_55.HEAD.orig/include/qsnet/ctrl_linux.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/qsnet/ctrl_linux.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -95289,9 +95290,9 @@ diff -urN clean/include/qsnet/ctrl_linux.h linux-2.6.9/include/qsnet/ctrl_linux.
+ * c-file-style: "linux"
+ * End:
+ */
-diff -urN clean/include/qsnet/debug.h linux-2.6.9/include/qsnet/debug.h
---- clean/include/qsnet/debug.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/qsnet/debug.h 2005-03-23 06:04:54.000000000 -0500
+diff -urpN RH_2_6_9_55.HEAD.orig/include/qsnet/debug.h RH_2_6_9_55.HEAD/include/qsnet/debug.h
+--- RH_2_6_9_55.HEAD.orig/include/qsnet/debug.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/qsnet/debug.h
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2000 Regents of the University of California
@@ -95361,9 +95362,9 @@ diff -urN clean/include/qsnet/debug.h linux-2.6.9/include/qsnet/debug.h
+ * c-file-style: "linux"
+ * End:
+ */
-diff -urN clean/include/qsnet/kcompat.h linux-2.6.9/include/qsnet/kcompat.h
---- clean/include/qsnet/kcompat.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/qsnet/kcompat.h 2005-07-05 11:09:03.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/qsnet/kcompat.h RH_2_6_9_55.HEAD/include/qsnet/kcompat.h
+--- RH_2_6_9_55.HEAD.orig/include/qsnet/kcompat.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/qsnet/kcompat.h
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -95392,9 +95393,9 @@ diff -urN clean/include/qsnet/kcompat.h linux-2.6.9/include/qsnet/kcompat.h
+
+
+
-diff -urN clean/include/qsnet/kernel.h linux-2.6.9/include/qsnet/kernel.h
---- clean/include/qsnet/kernel.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/qsnet/kernel.h 2005-07-20 07:35:37.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/qsnet/kernel.h RH_2_6_9_55.HEAD/include/qsnet/kernel.h
+--- RH_2_6_9_55.HEAD.orig/include/qsnet/kernel.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/qsnet/kernel.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -95435,9 +95436,9 @@ diff -urN clean/include/qsnet/kernel.h linux-2.6.9/include/qsnet/kernel.h
+
+
+
-diff -urN clean/include/qsnet/kernel_linux.h linux-2.6.9/include/qsnet/kernel_linux.h
---- clean/include/qsnet/kernel_linux.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/qsnet/kernel_linux.h 2005-09-07 10:35:03.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/qsnet/kernel_linux.h RH_2_6_9_55.HEAD/include/qsnet/kernel_linux.h
+--- RH_2_6_9_55.HEAD.orig/include/qsnet/kernel_linux.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/qsnet/kernel_linux.h
@@ -0,0 +1,374 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -95813,9 +95814,9 @@ diff -urN clean/include/qsnet/kernel_linux.h linux-2.6.9/include/qsnet/kernel_li
+ * c-file-style: "linux"
+ * End:
+ */
-diff -urN clean/include/qsnet/kpte.h linux-2.6.9/include/qsnet/kpte.h
---- clean/include/qsnet/kpte.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/qsnet/kpte.h 2005-03-18 08:56:40.000000000 -0500
+diff -urpN RH_2_6_9_55.HEAD.orig/include/qsnet/kpte.h RH_2_6_9_55.HEAD/include/qsnet/kpte.h
+--- RH_2_6_9_55.HEAD.orig/include/qsnet/kpte.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/qsnet/kpte.h
@@ -0,0 +1,132 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -95949,9 +95950,9 @@ diff -urN clean/include/qsnet/kpte.h linux-2.6.9/include/qsnet/kpte.h
+ * c-file-style: "stroustrup"
+ * End:
+ */
-diff -urN clean/include/qsnet/kthread.h linux-2.6.9/include/qsnet/kthread.h
---- clean/include/qsnet/kthread.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/qsnet/kthread.h 2004-10-28 07:50:29.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/qsnet/kthread.h RH_2_6_9_55.HEAD/include/qsnet/kthread.h
+--- RH_2_6_9_55.HEAD.orig/include/qsnet/kthread.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/qsnet/kthread.h
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -96024,9 +96025,9 @@ diff -urN clean/include/qsnet/kthread.h linux-2.6.9/include/qsnet/kthread.h
+ * c-file-style: "linux"
+ * End:
+ */
-diff -urN clean/include/qsnet/list.h linux-2.6.9/include/qsnet/list.h
---- clean/include/qsnet/list.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/qsnet/list.h 2003-10-27 08:55:33.000000000 -0500
+diff -urpN RH_2_6_9_55.HEAD.orig/include/qsnet/list.h RH_2_6_9_55.HEAD/include/qsnet/list.h
+--- RH_2_6_9_55.HEAD.orig/include/qsnet/list.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/qsnet/list.h
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2003 by Quadrics Limited.
@@ -96108,9 +96109,9 @@ diff -urN clean/include/qsnet/list.h linux-2.6.9/include/qsnet/list.h
+ pos = n, n = (pos)->next)
+
+#endif /* __QSNET_LIST_H */
-diff -urN clean/include/qsnet/module.h linux-2.6.9/include/qsnet/module.h
---- clean/include/qsnet/module.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/qsnet/module.h 2005-09-07 10:35:04.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/qsnet/module.h RH_2_6_9_55.HEAD/include/qsnet/module.h
+--- RH_2_6_9_55.HEAD.orig/include/qsnet/module.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/qsnet/module.h
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -96139,9 +96140,9 @@ diff -urN clean/include/qsnet/module.h linux-2.6.9/include/qsnet/module.h
+
+
+
-diff -urN clean/include/qsnet/mutex.h linux-2.6.9/include/qsnet/mutex.h
---- clean/include/qsnet/mutex.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/qsnet/mutex.h 2003-06-26 12:05:45.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/qsnet/mutex.h RH_2_6_9_55.HEAD/include/qsnet/mutex.h
+--- RH_2_6_9_55.HEAD.orig/include/qsnet/mutex.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/qsnet/mutex.h
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2000 Regents of the University of California
@@ -96234,9 +96235,9 @@ diff -urN clean/include/qsnet/mutex.h linux-2.6.9/include/qsnet/mutex.h
+
+#endif /* __KERNEL__ */
+#endif /* _LINUX_MUTEX_H */
-diff -urN clean/include/qsnet/procfs_linux.h linux-2.6.9/include/qsnet/procfs_linux.h
---- clean/include/qsnet/procfs_linux.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/qsnet/procfs_linux.h 2005-07-20 07:35:37.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/qsnet/procfs_linux.h RH_2_6_9_55.HEAD/include/qsnet/procfs_linux.h
+--- RH_2_6_9_55.HEAD.orig/include/qsnet/procfs_linux.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/qsnet/procfs_linux.h
@@ -0,0 +1,263 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -96501,9 +96502,9 @@ diff -urN clean/include/qsnet/procfs_linux.h linux-2.6.9/include/qsnet/procfs_li
+ * c-file-style: "linux"
+ * End:
+ */
-diff -urN clean/include/qsnet/types.h linux-2.6.9/include/qsnet/types.h
---- clean/include/qsnet/types.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/qsnet/types.h 2003-08-01 12:21:38.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/qsnet/types.h RH_2_6_9_55.HEAD/include/qsnet/types.h
+--- RH_2_6_9_55.HEAD.orig/include/qsnet/types.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/qsnet/types.h
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -96595,9 +96596,9 @@ diff -urN clean/include/qsnet/types.h linux-2.6.9/include/qsnet/types.h
+
+
+#endif /* __QSNET_TYPES_H */
-diff -urN clean/include/qsnet/workarounds.h linux-2.6.9/include/qsnet/workarounds.h
---- clean/include/qsnet/workarounds.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/qsnet/workarounds.h 2002-08-09 07:15:55.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/qsnet/workarounds.h RH_2_6_9_55.HEAD/include/qsnet/workarounds.h
+--- RH_2_6_9_55.HEAD.orig/include/qsnet/workarounds.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/qsnet/workarounds.h
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -96623,9 +96624,9 @@ diff -urN clean/include/qsnet/workarounds.h linux-2.6.9/include/qsnet/workaround
+#define ELAN_REVB_BUG_3
+
+#endif /* _QSNET_WORKAROUNDS_H */
-diff -urN clean/include/rms/rmscall.h linux-2.6.9/include/rms/rmscall.h
---- clean/include/rms/rmscall.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/rms/rmscall.h 2005-07-28 06:49:09.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/rms/rmscall.h RH_2_6_9_55.HEAD/include/rms/rmscall.h
+--- RH_2_6_9_55.HEAD.orig/include/rms/rmscall.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/rms/rmscall.h
@@ -0,0 +1,149 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -96776,9 +96777,9 @@ diff -urN clean/include/rms/rmscall.h linux-2.6.9/include/rms/rmscall.h
+
+
+
-diff -urN clean/include/rms/rmsio.h linux-2.6.9/include/rms/rmsio.h
---- clean/include/rms/rmsio.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/include/rms/rmsio.h 2004-08-26 07:49:30.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/include/rms/rmsio.h RH_2_6_9_55.HEAD/include/rms/rmsio.h
+--- RH_2_6_9_55.HEAD.orig/include/rms/rmsio.h 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/include/rms/rmsio.h
@@ -0,0 +1,194 @@
+/*
+ * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd.
@@ -96974,9 +96975,9 @@ diff -urN clean/include/rms/rmsio.h linux-2.6.9/include/rms/rmsio.h
+
+
+
-diff -urN clean/ipc/shm.c linux-2.6.9/ipc/shm.c
---- clean/ipc/shm.c 2005-05-13 13:39:10.000000000 -0400
-+++ linux-2.6.9/ipc/shm.c 2005-10-10 17:47:17.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/ipc/shm.c RH_2_6_9_55.HEAD/ipc/shm.c
+--- RH_2_6_9_55.HEAD.orig/ipc/shm.c
++++ RH_2_6_9_55.HEAD/ipc/shm.c
@@ -26,6 +26,7 @@
#include <linux/proc_fs.h>
#include <linux/shmem_fs.h>
@@ -96985,7 +96986,7 @@ diff -urN clean/ipc/shm.c linux-2.6.9/ipc/shm.c
#include <linux/audit.h>
#include <asm/uaccess.h>
-@@ -850,6 +851,44 @@
+@@ -856,6 +857,44 @@ asmlinkage long sys_shmdt(char __user *s
return retval;
}
@@ -97030,10 +97031,10 @@ diff -urN clean/ipc/shm.c linux-2.6.9/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 -urN clean/kernel/exit.c linux-2.6.9/kernel/exit.c
---- clean/kernel/exit.c 2005-10-10 17:43:57.000000000 -0400
-+++ linux-2.6.9/kernel/exit.c 2005-10-10 17:47:17.000000000 -0400
-@@ -30,6 +30,8 @@
+diff -urpN RH_2_6_9_55.HEAD.orig/kernel/exit.c RH_2_6_9_55.HEAD/kernel/exit.c
+--- RH_2_6_9_55.HEAD.orig/kernel/exit.c
++++ RH_2_6_9_55.HEAD/kernel/exit.c
+@@ -32,6 +32,8 @@
#include <asm/pgtable.h>
#include <asm/mmu_context.h>
@@ -97042,18 +97043,18 @@ diff -urN clean/kernel/exit.c linux-2.6.9/kernel/exit.c
extern void sem_exit (void);
extern struct task_struct *child_reaper;
-@@ -822,6 +824,8 @@
- #endif
- current->tux_exit();
- }
-+ /* Notify any ptrack callbacks of the process exit */
-+ ptrack_call_callbacks (PTRACK_PHASE_EXIT, NULL);
+@@ -827,6 +829,8 @@ asmlinkage NORET_TYPE void do_exit(long
+
+ if (unlikely(tsk->audit_context))
+ audit_free(tsk);
++ /* Notify any ptrack callbacks of the process exit */
++ ptrack_call_callbacks (PTRACK_PHASE_EXIT, NULL);
__exit_mm(tsk);
exit_sem(tsk);
-diff -urN clean/kernel/fork.c linux-2.6.9/kernel/fork.c
---- clean/kernel/fork.c 2005-05-13 13:39:08.000000000 -0400
-+++ linux-2.6.9/kernel/fork.c 2005-10-10 17:47:17.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/kernel/fork.c RH_2_6_9_55.HEAD/kernel/fork.c
+--- RH_2_6_9_55.HEAD.orig/kernel/fork.c
++++ RH_2_6_9_55.HEAD/kernel/fork.c
@@ -14,6 +14,7 @@
#include <linux/config.h>
#include <linux/slab.h>
@@ -97062,7 +97063,7 @@ diff -urN clean/kernel/fork.c linux-2.6.9/kernel/fork.c
#include <linux/unistd.h>
#include <linux/smp_lock.h>
#include <linux/module.h>
-@@ -430,6 +431,9 @@
+@@ -443,6 +444,9 @@ static struct mm_struct * mm_init(struct
mm->page_table_lock = SPIN_LOCK_UNLOCKED;
mm->ioctx_list_lock = RW_LOCK_UNLOCKED;
mm->ioctx_list = NULL;
@@ -97072,7 +97073,7 @@ diff -urN clean/kernel/fork.c linux-2.6.9/kernel/fork.c
mm->default_kioctx = (struct kioctx)INIT_KIOCTX(mm->default_kioctx, *mm);
mm->free_area_cache = TASK_UNMAPPED_BASE;
-@@ -1264,6 +1268,11 @@
+@@ -1312,6 +1316,11 @@ long do_fork(unsigned long clone_flags,
set_tsk_thread_flag(p, TIF_SIGPENDING);
}
@@ -97084,9 +97085,9 @@ diff -urN clean/kernel/fork.c linux-2.6.9/kernel/fork.c
if (!(clone_flags & CLONE_STOPPED))
wake_up_new_task(p, clone_flags);
else
-diff -urN clean/kernel/Kconfig linux-2.6.9/kernel/Kconfig
---- clean/kernel/Kconfig 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/kernel/Kconfig 2005-10-10 17:47:17.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/kernel/Kconfig RH_2_6_9_55.HEAD/kernel/Kconfig
+--- RH_2_6_9_55.HEAD.orig/kernel/Kconfig 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/kernel/Kconfig
@@ -0,0 +1,14 @@
+#
+# Kernel subsystem specific config
@@ -97102,20 +97103,20 @@ diff -urN clean/kernel/Kconfig linux-2.6.9/kernel/Kconfig
+ created and destoryed in order for a resource management
+ system to know which processes are a member of a "job" and
+ to be able to clean up when the job is terminated.
-diff -urN clean/kernel/Makefile linux-2.6.9/kernel/Makefile
---- clean/kernel/Makefile 2005-05-13 13:39:07.000000000 -0400
-+++ linux-2.6.9/kernel/Makefile 2005-10-10 17:47:17.000000000 -0400
-@@ -26,6 +26,7 @@
- obj-$(CONFIG_AUDIT) += audit.o
+diff -urpN RH_2_6_9_55.HEAD.orig/kernel/Makefile RH_2_6_9_55.HEAD/kernel/Makefile
+--- RH_2_6_9_55.HEAD.orig/kernel/Makefile
++++ RH_2_6_9_55.HEAD/kernel/Makefile
+@@ -26,6 +26,7 @@ obj-$(CONFIG_AUDIT) += audit.o
obj-$(CONFIG_AUDITSYSCALL) += auditsc.o
+ obj-$(CONFIG_AUDITFILESYSTEM) += auditfs.o
obj-$(CONFIG_KPROBES) += kprobes.o
+obj-$(CONFIG_PTRACK) += ptrack.o
ifneq ($(CONFIG_IA64),y)
# According to Alan Modra <alan@linuxcare.com.au>, the -fno-omit-frame-pointer is
-diff -urN clean/kernel/ptrack.c linux-2.6.9/kernel/ptrack.c
---- clean/kernel/ptrack.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/kernel/ptrack.c 2005-10-10 17:47:17.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/kernel/ptrack.c RH_2_6_9_55.HEAD/kernel/ptrack.c
+--- RH_2_6_9_55.HEAD.orig/kernel/ptrack.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/kernel/ptrack.c
@@ -0,0 +1,145 @@
+/*
+ * Copyright (C) 2000 Regents of the University of California
@@ -97262,10 +97263,10 @@ diff -urN clean/kernel/ptrack.c linux-2.6.9/kernel/ptrack.c
+EXPORT_SYMBOL(ptrack_register);
+EXPORT_SYMBOL(ptrack_deregister);
+EXPORT_SYMBOL(ptrack_registered);
-diff -urN clean/kernel/signal.c linux-2.6.9/kernel/signal.c
---- clean/kernel/signal.c 2005-05-13 13:39:11.000000000 -0400
-+++ linux-2.6.9/kernel/signal.c 2005-10-10 17:47:17.000000000 -0400
-@@ -2266,6 +2266,7 @@
+diff -urpN RH_2_6_9_55.HEAD.orig/kernel/signal.c RH_2_6_9_55.HEAD/kernel/signal.c
+--- RH_2_6_9_55.HEAD.orig/kernel/signal.c
++++ RH_2_6_9_55.HEAD/kernel/signal.c
+@@ -2329,6 +2329,7 @@ sys_kill(int pid, int sig)
return kill_something_info(sig, &info, pid);
}
@@ -97273,21 +97274,21 @@ diff -urN clean/kernel/signal.c linux-2.6.9/kernel/signal.c
/**
* sys_tgkill - send signal to one specific thread
-diff -urN clean/Makefile linux-2.6.9/Makefile
---- clean/Makefile 2005-05-13 13:39:19.000000000 -0400
-+++ linux-2.6.9/Makefile 2005-10-10 17:47:31.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/Makefile RH_2_6_9_55.HEAD/Makefile
+--- RH_2_6_9_55.HEAD.orig/Makefile
++++ RH_2_6_9_55.HEAD/Makefile
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 9
-EXTRAVERSION = -prep
+EXTRAVERSION = -prep.qp2.2.5.11.3qsnet
+ RHEL_VERSION = 4
+ RHEL_UPDATE = 5
NAME=AC 1
-
- # *DOCUMENTATION*
-diff -urN clean/mm/fremap.c linux-2.6.9/mm/fremap.c
---- clean/mm/fremap.c 2004-10-18 17:53:06.000000000 -0400
-+++ linux-2.6.9/mm/fremap.c 2005-10-10 17:47:17.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/mm/fremap.c RH_2_6_9_55.HEAD/mm/fremap.c
+--- RH_2_6_9_55.HEAD.orig/mm/fremap.c
++++ RH_2_6_9_55.HEAD/mm/fremap.c
@@ -12,6 +12,7 @@
#include <linux/mman.h>
#include <linux/pagemap.h>
@@ -97296,7 +97297,7 @@ diff -urN clean/mm/fremap.c linux-2.6.9/mm/fremap.c
#include <linux/rmap.h>
#include <linux/module.h>
-@@ -29,6 +30,7 @@
+@@ -29,6 +30,7 @@ static inline void zap_pte(struct mm_str
if (pte_present(pte)) {
unsigned long pfn = pte_pfn(pte);
@@ -97304,7 +97305,7 @@ diff -urN clean/mm/fremap.c linux-2.6.9/mm/fremap.c
flush_cache_page(vma, addr);
pte = ptep_clear_flush(vma, addr, ptep);
if (pfn_valid(pfn)) {
-@@ -93,6 +95,7 @@
+@@ -93,6 +95,7 @@ int install_page(struct mm_struct *mm, s
pte_val = *pte;
pte_unmap(pte);
update_mmu_cache(vma, addr, pte_val);
@@ -97312,7 +97313,7 @@ diff -urN clean/mm/fremap.c linux-2.6.9/mm/fremap.c
err = 0;
err_unlock:
-@@ -132,6 +135,7 @@
+@@ -132,6 +135,7 @@ int install_file_pte(struct mm_struct *m
pte_val = *pte;
pte_unmap(pte);
update_mmu_cache(vma, addr, pte_val);
@@ -97320,9 +97321,9 @@ diff -urN clean/mm/fremap.c linux-2.6.9/mm/fremap.c
spin_unlock(&mm->page_table_lock);
return 0;
-diff -urN clean/mm/hugetlb.c linux-2.6.9/mm/hugetlb.c
---- clean/mm/hugetlb.c 2004-10-18 17:54:37.000000000 -0400
-+++ linux-2.6.9/mm/hugetlb.c 2005-10-10 17:47:17.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/mm/hugetlb.c RH_2_6_9_55.HEAD/mm/hugetlb.c
+--- RH_2_6_9_55.HEAD.orig/mm/hugetlb.c
++++ RH_2_6_9_55.HEAD/mm/hugetlb.c
@@ -10,6 +10,7 @@
#include <linux/hugetlb.h>
#include <linux/sysctl.h>
@@ -97331,7 +97332,7 @@ diff -urN clean/mm/hugetlb.c linux-2.6.9/mm/hugetlb.c
const unsigned long hugetlb_zero = 0, hugetlb_infinity = ~0UL;
static unsigned long nr_huge_pages, free_huge_pages;
-@@ -254,6 +255,7 @@
+@@ -260,6 +261,7 @@ void zap_hugepage_range(struct vm_area_s
struct mm_struct *mm = vma->vm_mm;
spin_lock(&mm->page_table_lock);
@@ -97339,9 +97340,9 @@ diff -urN clean/mm/hugetlb.c linux-2.6.9/mm/hugetlb.c
unmap_hugepage_range(vma, start, start + length);
spin_unlock(&mm->page_table_lock);
}
-diff -urN clean/mm/ioproc.c linux-2.6.9/mm/ioproc.c
---- clean/mm/ioproc.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/mm/ioproc.c 2005-10-10 17:47:17.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/mm/ioproc.c RH_2_6_9_55.HEAD/mm/ioproc.c
+--- RH_2_6_9_55.HEAD.orig/mm/ioproc.c 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/mm/ioproc.c
@@ -0,0 +1,58 @@
+/* -*- linux-c -*-
+ *
@@ -97401,9 +97402,9 @@ diff -urN clean/mm/ioproc.c linux-2.6.9/mm/ioproc.c
+}
+
+EXPORT_SYMBOL_GPL(ioproc_unregister_ops);
-diff -urN clean/mm/Kconfig linux-2.6.9/mm/Kconfig
---- clean/mm/Kconfig 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.9/mm/Kconfig 2005-10-10 17:47:17.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/mm/Kconfig RH_2_6_9_55.HEAD/mm/Kconfig
+--- RH_2_6_9_55.HEAD.orig/mm/Kconfig 1970-01-01 03:00:00.000000000 +0300
++++ RH_2_6_9_55.HEAD/mm/Kconfig
@@ -0,0 +1,15 @@
+#
+# VM subsystem specific config
@@ -97420,10 +97421,10 @@ diff -urN clean/mm/Kconfig linux-2.6.9/mm/Kconfig
+ incorporate advanced RDMA capabilities can be kept in sync with CPU
+ page table changes.
+ See Documentation/vm/ioproc.txt for more details.
-diff -urN clean/mm/Makefile linux-2.6.9/mm/Makefile
---- clean/mm/Makefile 2005-05-13 13:39:02.000000000 -0400
-+++ linux-2.6.9/mm/Makefile 2005-10-10 17:47:17.000000000 -0400
-@@ -16,6 +16,7 @@
+diff -urpN RH_2_6_9_55.HEAD.orig/mm/Makefile RH_2_6_9_55.HEAD/mm/Makefile
+--- RH_2_6_9_55.HEAD.orig/mm/Makefile
++++ RH_2_6_9_55.HEAD/mm/Makefile
+@@ -16,6 +16,7 @@ obj-$(CONFIG_SWAP) += page_io.o swap_sta
obj-$(CONFIG_X86_4G) += usercopy.o
obj-$(CONFIG_HUGETLBFS) += hugetlb.o
obj-$(CONFIG_NUMA) += mempolicy.o
@@ -97431,9 +97432,9 @@ diff -urN clean/mm/Makefile linux-2.6.9/mm/Makefile
obj-$(CONFIG_SHMEM) += shmem.o
obj-$(CONFIG_TINY_SHMEM) += tiny-shmem.o
-diff -urN clean/mm/memory.c linux-2.6.9/mm/memory.c
---- clean/mm/memory.c 2005-05-13 13:39:08.000000000 -0400
-+++ linux-2.6.9/mm/memory.c 2005-10-10 17:47:17.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/mm/memory.c RH_2_6_9_55.HEAD/mm/memory.c
+--- RH_2_6_9_55.HEAD.orig/mm/memory.c
++++ RH_2_6_9_55.HEAD/mm/memory.c
@@ -43,6 +43,7 @@
#include <linux/swap.h>
#include <linux/highmem.h>
@@ -97442,7 +97443,7 @@ diff -urN clean/mm/memory.c linux-2.6.9/mm/memory.c
#include <linux/rmap.h>
#include <linux/module.h>
#include <linux/init.h>
-@@ -619,6 +620,7 @@
+@@ -630,6 +631,7 @@ void zap_page_range(struct vm_area_struc
lru_add_drain();
spin_lock(&mm->page_table_lock);
@@ -97450,7 +97451,7 @@ diff -urN clean/mm/memory.c linux-2.6.9/mm/memory.c
tlb = tlb_gather_mmu(mm, 0);
unmap_vmas(&tlb, mm, vma, address, end, &nr_accounted, details);
tlb_finish_mmu(tlb, address, end);
-@@ -968,6 +970,7 @@
+@@ -998,6 +1000,7 @@ int zeromap_page_range(struct vm_area_st
BUG();
spin_lock(&mm->page_table_lock);
@@ -97458,7 +97459,7 @@ diff -urN clean/mm/memory.c linux-2.6.9/mm/memory.c
do {
pmd_t *pmd = pmd_alloc(mm, dir, address);
error = -ENOMEM;
-@@ -982,6 +985,7 @@
+@@ -1012,6 +1015,7 @@ int zeromap_page_range(struct vm_area_st
/*
* Why flush? zeromap_pte_range has a BUG_ON for !pte_none()
*/
@@ -97466,7 +97467,7 @@ diff -urN clean/mm/memory.c linux-2.6.9/mm/memory.c
flush_tlb_range(vma, beg, end);
spin_unlock(&mm->page_table_lock);
return error;
-@@ -1062,6 +1066,7 @@
+@@ -1092,6 +1096,7 @@ int remap_page_range(struct vm_area_stru
vma->vm_flags |= VM_IO | VM_RESERVED;
spin_lock(&mm->page_table_lock);
@@ -97474,7 +97475,7 @@ diff -urN clean/mm/memory.c linux-2.6.9/mm/memory.c
do {
pmd_t *pmd = pmd_alloc(mm, dir, from);
error = -ENOMEM;
-@@ -1076,6 +1081,7 @@
+@@ -1106,6 +1111,7 @@ int remap_page_range(struct vm_area_stru
/*
* Why flush? remap_pte_range has a BUG_ON for !pte_none()
*/
@@ -97482,15 +97483,15 @@ diff -urN clean/mm/memory.c linux-2.6.9/mm/memory.c
flush_tlb_range(vma, beg, end);
spin_unlock(&mm->page_table_lock);
return error;
-@@ -1162,6 +1168,7 @@
- ptep_set_access_flags(vma, address, page_table, entry, 1);
+@@ -1194,6 +1200,7 @@ static int do_wp_page(struct mm_struct *
update_mmu_cache(vma, address, entry);
+ lazy_mmu_prot_update(entry);
pte_unmap(page_table);
+ ioproc_update_page(vma, address);
spin_unlock(&mm->page_table_lock);
return VM_FAULT_MINOR;
}
-@@ -1194,6 +1201,7 @@
+@@ -1226,6 +1233,7 @@ static int do_wp_page(struct mm_struct *
++mm->rss;
else
page_remove_rmap(old_page);
@@ -97498,7 +97499,7 @@ diff -urN clean/mm/memory.c linux-2.6.9/mm/memory.c
break_cow(vma, new_page, address, page_table);
lru_cache_add_active(new_page);
page_add_anon_rmap(new_page, vma, address);
-@@ -1202,6 +1210,7 @@
+@@ -1234,6 +1242,7 @@ static int do_wp_page(struct mm_struct *
new_page = old_page;
}
pte_unmap(page_table);
@@ -97506,15 +97507,15 @@ diff -urN clean/mm/memory.c linux-2.6.9/mm/memory.c
page_cache_release(new_page);
page_cache_release(old_page);
spin_unlock(&mm->page_table_lock);
-@@ -1495,6 +1504,7 @@
- /* No need to invalidate - it was non-present before */
- update_mmu_cache(vma, address, pte);
+@@ -1555,6 +1564,7 @@ static int do_swap_page(struct mm_struct
+ int ret = VM_FAULT_MINOR;
+
pte_unmap(page_table);
+ ioproc_update_page(vma, address);
spin_unlock(&mm->page_table_lock);
- out:
- return ret;
-@@ -1555,6 +1565,7 @@
+ page = lookup_swap_cache(entry);
+ if (!page) {
+@@ -1694,6 +1704,7 @@ do_anonymous_page(struct mm_struct *mm,
/* No need to invalidate - it was non-present before */
update_mmu_cache(vma, addr, entry);
@@ -97522,7 +97523,7 @@ diff -urN clean/mm/memory.c linux-2.6.9/mm/memory.c
lazy_mmu_prot_update(entry);
spin_unlock(&mm->page_table_lock);
out:
-@@ -1673,6 +1684,7 @@
+@@ -1812,6 +1823,7 @@ retry:
/* no need to invalidate: a not-present page shouldn't be cached */
update_mmu_cache(vma, address, entry);
@@ -97530,7 +97531,7 @@ diff -urN clean/mm/memory.c linux-2.6.9/mm/memory.c
lazy_mmu_prot_update(entry);
spin_unlock(&mm->page_table_lock);
out:
-@@ -1853,6 +1865,7 @@
+@@ -1998,6 +2010,7 @@ int make_pages_present(unsigned long add
return ret;
return ret == len ? 0 : -1;
}
@@ -97538,9 +97539,9 @@ diff -urN clean/mm/memory.c linux-2.6.9/mm/memory.c
/*
* Map a vmalloc()-space virtual address to the physical page.
-diff -urN clean/mm/mmap.c linux-2.6.9/mm/mmap.c
---- clean/mm/mmap.c 2005-05-13 13:39:10.000000000 -0400
-+++ linux-2.6.9/mm/mmap.c 2005-10-10 17:47:17.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/mm/mmap.c RH_2_6_9_55.HEAD/mm/mmap.c
+--- RH_2_6_9_55.HEAD.orig/mm/mmap.c
++++ RH_2_6_9_55.HEAD/mm/mmap.c
@@ -15,6 +15,7 @@
#include <linux/init.h>
#include <linux/file.h>
@@ -97549,7 +97550,7 @@ diff -urN clean/mm/mmap.c linux-2.6.9/mm/mmap.c
#include <linux/personality.h>
#include <linux/security.h>
#include <linux/hugetlb.h>
-@@ -1680,6 +1681,7 @@
+@@ -1703,6 +1704,7 @@ static void unmap_region(struct mm_struc
unsigned long nr_accounted = 0;
lru_add_drain();
@@ -97557,7 +97558,7 @@ diff -urN clean/mm/mmap.c linux-2.6.9/mm/mmap.c
tlb = tlb_gather_mmu(mm, 0);
unmap_vmas(&tlb, mm, vma, start, end, &nr_accounted, NULL);
vm_unacct_memory(nr_accounted);
-@@ -1965,6 +1967,7 @@
+@@ -1995,6 +1997,7 @@ void exit_mmap(struct mm_struct *mm)
spin_lock(&mm->page_table_lock);
@@ -97565,9 +97566,9 @@ diff -urN clean/mm/mmap.c linux-2.6.9/mm/mmap.c
tlb = tlb_gather_mmu(mm, 1);
flush_cache_mm(mm);
/* Use ~0UL here to ensure all VMAs in the mm are unmapped */
-diff -urN clean/mm/mprotect.c linux-2.6.9/mm/mprotect.c
---- clean/mm/mprotect.c 2005-05-13 13:39:02.000000000 -0400
-+++ linux-2.6.9/mm/mprotect.c 2005-10-10 17:47:17.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/mm/mprotect.c RH_2_6_9_55.HEAD/mm/mprotect.c
+--- RH_2_6_9_55.HEAD.orig/mm/mprotect.c
++++ RH_2_6_9_55.HEAD/mm/mprotect.c
@@ -10,6 +10,7 @@
#include <linux/mm.h>
@@ -97576,7 +97577,7 @@ diff -urN clean/mm/mprotect.c linux-2.6.9/mm/mprotect.c
#include <linux/slab.h>
#include <linux/shm.h>
#include <linux/mman.h>
-@@ -99,6 +100,7 @@
+@@ -100,6 +101,7 @@ change_protection(struct vm_area_struct
if (start >= end)
BUG();
spin_lock(¤t->mm->page_table_lock);
@@ -97584,9 +97585,9 @@ diff -urN clean/mm/mprotect.c linux-2.6.9/mm/mprotect.c
do {
change_pmd_range(dir, start, end - start, newprot);
start = (start + PGDIR_SIZE) & PGDIR_MASK;
-diff -urN clean/mm/mremap.c linux-2.6.9/mm/mremap.c
---- clean/mm/mremap.c 2005-05-13 13:39:02.000000000 -0400
-+++ linux-2.6.9/mm/mremap.c 2005-10-10 17:47:17.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/mm/mremap.c RH_2_6_9_55.HEAD/mm/mremap.c
+--- RH_2_6_9_55.HEAD.orig/mm/mremap.c
++++ RH_2_6_9_55.HEAD/mm/mremap.c
@@ -9,6 +9,7 @@
#include <linux/mm.h>
@@ -97595,7 +97596,7 @@ diff -urN clean/mm/mremap.c linux-2.6.9/mm/mremap.c
#include <linux/slab.h>
#include <linux/shm.h>
#include <linux/mman.h>
-@@ -148,6 +149,8 @@
+@@ -148,6 +149,8 @@ static unsigned long move_page_tables(st
{
unsigned long offset;
@@ -97604,9 +97605,9 @@ diff -urN clean/mm/mremap.c linux-2.6.9/mm/mremap.c
flush_cache_range(vma, old_addr, old_addr + len);
/*
-diff -urN clean/mm/msync.c linux-2.6.9/mm/msync.c
---- clean/mm/msync.c 2004-10-18 17:53:51.000000000 -0400
-+++ linux-2.6.9/mm/msync.c 2005-10-10 17:47:17.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/mm/msync.c RH_2_6_9_55.HEAD/mm/msync.c
+--- RH_2_6_9_55.HEAD.orig/mm/msync.c
++++ RH_2_6_9_55.HEAD/mm/msync.c
@@ -12,6 +12,7 @@
#include <linux/mm.h>
#include <linux/mman.h>
@@ -97615,7 +97616,7 @@ diff -urN clean/mm/msync.c linux-2.6.9/mm/msync.c
#include <asm/pgtable.h>
#include <asm/tlbflush.h>
-@@ -115,6 +116,7 @@
+@@ -115,6 +116,7 @@ static int filemap_sync(struct vm_area_s
if (address >= end)
BUG();
@@ -97623,9 +97624,9 @@ diff -urN clean/mm/msync.c linux-2.6.9/mm/msync.c
do {
error |= filemap_sync_pmd_range(dir, address, end, vma, flags);
address = (address + PGDIR_SIZE) & PGDIR_MASK;
-diff -urN clean/mm/rmap.c linux-2.6.9/mm/rmap.c
---- clean/mm/rmap.c 2005-05-13 13:39:08.000000000 -0400
-+++ linux-2.6.9/mm/rmap.c 2005-10-10 17:47:17.000000000 -0400
+diff -urpN RH_2_6_9_55.HEAD.orig/mm/rmap.c RH_2_6_9_55.HEAD/mm/rmap.c
+--- RH_2_6_9_55.HEAD.orig/mm/rmap.c
++++ RH_2_6_9_55.HEAD/mm/rmap.c
@@ -51,6 +51,7 @@
#include <linux/slab.h>
#include <linux/init.h>
@@ -97634,7 +97635,7 @@ diff -urN clean/mm/rmap.c linux-2.6.9/mm/rmap.c
#include <linux/rcupdate.h>
#include <asm/tlbflush.h>
-@@ -566,6 +567,7 @@
+@@ -566,6 +567,7 @@ static int try_to_unmap_one(struct page
}
/* Nuke the page table entry. */
@@ -97642,7 +97643,7 @@ diff -urN clean/mm/rmap.c linux-2.6.9/mm/rmap.c
flush_cache_page(vma, address);
pteval = ptep_clear_flush(vma, address, pte);
-@@ -673,6 +675,7 @@
+@@ -673,6 +675,7 @@ static void try_to_unmap_cluster(unsigne
continue;
/* Nuke the page table entry. */
diff --git a/lustre/kernel_patches/patches/quota-deadlock-on-pagelock-core.patch b/lustre/kernel_patches/patches/quota-deadlock-on-pagelock-core.patch
index 892a61fce3b76f29d8c8a641cb47d5f119cee6b8..576765c68baa276b63a3cf664d161f2523d71148 100644
--- a/lustre/kernel_patches/patches/quota-deadlock-on-pagelock-core.patch
+++ b/lustre/kernel_patches/patches/quota-deadlock-on-pagelock-core.patch
@@ -1,4 +1,3 @@
-
From: Jan Kara <jack@suse.cz>
The four patches in this series fix deadlocks with quotas of pagelock (the
@@ -55,9 +54,9 @@ Signed-off-by: Andrew Morton <akpm@osdl.org>
25-akpm/security/selinux/hooks.c | 4
9 files changed, 247 insertions(+), 268 deletions(-)
-diff -puN fs/dquot.c~fix-of-quota-deadlock-on-pagelock-quota-core fs/dquot.c
---- 25/fs/dquot.c~fix-of-quota-deadlock-on-pagelock-quota-core 2004-12-03 20:56:04.293107536 -0800
-+++ 25-akpm/fs/dquot.c 2004-12-03 20:56:04.312104648 -0800
+diff -rup RH_2_6_9_55.orig/fs/dquot.c RH_2_6_9_55/fs/dquot.c
+--- RH_2_6_9_55.orig/fs/dquot.c
++++ RH_2_6_9_55/fs/dquot.c
@@ -49,7 +49,7 @@
* New SMP locking.
* Jan Kara, <jack@suse.cz>, 10/2002
@@ -83,8 +82,8 @@ diff -puN fs/dquot.c~fix-of-quota-deadlock-on-pagelock-quota-core fs/dquot.c
*
- * Lock ordering (including related VFS locks) is following:
+ * Lock ordering (including related VFS locks) is the following:
- * i_sem > dqonoff_sem > iprune_sem > journal_lock > dqptr_sem >
- * > dquot->dq_lock > dqio_sem
+ * i_sem > dqonoff_sem > journal_lock > dqptr_sem > dquot->dq_lock >
+ * dqio_sem
* i_sem on quota files is special (it's below dqio_sem)
@@ -183,8 +184,7 @@ static void put_quota_format(struct quot
* on all three lists, depending on its current state.
@@ -96,7 +95,7 @@ diff -puN fs/dquot.c~fix-of-quota-deadlock-on-pagelock-quota-core fs/dquot.c
*
* Unused dquots (dq_count == 0) are added to the free_dquots list when freed,
* and this list is searched whenever we need an available dquot. Dquots are
-@@ -1314,10 +1314,12 @@ int vfs_quota_off(struct super_block *sb
+@@ -1341,10 +1341,12 @@ int vfs_quota_off(struct super_block *sb
{
int cnt;
struct quota_info *dqopt = sb_dqopt(sb);
@@ -109,7 +108,7 @@ diff -puN fs/dquot.c~fix-of-quota-deadlock-on-pagelock-quota-core fs/dquot.c
if (type != -1 && cnt != type)
continue;
if (!sb_has_quota_enabled(sb, cnt))
-@@ -1337,7 +1339,7 @@ int vfs_quota_off(struct super_block *sb
+@@ -1364,7 +1366,7 @@ int vfs_quota_off(struct super_block *sb
dqopt->ops[cnt]->free_file_info(sb, cnt);
put_quota_format(dqopt->info[cnt].dqi_format);
@@ -118,7 +117,7 @@ diff -puN fs/dquot.c~fix-of-quota-deadlock-on-pagelock-quota-core fs/dquot.c
dqopt->files[cnt] = NULL;
dqopt->info[cnt].dqi_flags = 0;
dqopt->info[cnt].dqi_igrace = 0;
-@@ -1345,6 +1347,26 @@ int vfs_quota_off(struct super_block *sb
+@@ -1372,6 +1374,26 @@ int vfs_quota_off(struct super_block *sb
dqopt->ops[cnt] = NULL;
}
up(&dqopt->dqonoff_sem);
@@ -145,7 +144,7 @@ diff -puN fs/dquot.c~fix-of-quota-deadlock-on-pagelock-quota-core fs/dquot.c
return 0;
}
-@@ -1352,68 +1374,56 @@ int vfs_quota_off(struct super_block *sb
+@@ -1379,68 +1401,56 @@ int vfs_quota_off(struct super_block *sb
* Turn quotas on on a device
*/
@@ -242,7 +241,7 @@ diff -puN fs/dquot.c~fix-of-quota-deadlock-on-pagelock-quota-core fs/dquot.c
dqopt->ops[type] = fmt->qf_ops;
dqopt->info[type].dqi_format = fmt;
-@@ -1424,6 +1434,7 @@ static int vfs_quota_on_file(struct file
+@@ -1451,6 +1461,7 @@ static int vfs_quota_on_file(struct file
goto out_file_init;
}
up(&dqopt->dqio_sem);
@@ -250,7 +249,7 @@ diff -puN fs/dquot.c~fix-of-quota-deadlock-on-pagelock-quota-core fs/dquot.c
set_enable_flags(dqopt, type);
add_dquot_ref(sb, type);
-@@ -1433,19 +1444,18 @@ static int vfs_quota_on_file(struct file
+@@ -1460,19 +1471,18 @@ static int vfs_quota_on_file(struct file
out_file_init:
dqopt->files[type] = NULL;
@@ -275,7 +274,7 @@ diff -puN fs/dquot.c~fix-of-quota-deadlock-on-pagelock-quota-core fs/dquot.c
out_fmt:
put_quota_format(fmt);
-@@ -1455,47 +1465,37 @@ out_fmt:
+@@ -1482,47 +1492,37 @@ out_fmt:
/* Actual function called from quotactl() */
int vfs_quota_on(struct super_block *sb, int type, int format_id, char *path)
{
@@ -342,9 +341,9 @@ diff -puN fs/dquot.c~fix-of-quota-deadlock-on-pagelock-quota-core fs/dquot.c
}
/* Generic routine for getting common part of quota structure */
-diff -puN fs/quota.c~fix-of-quota-deadlock-on-pagelock-quota-core fs/quota.c
---- 25/fs/quota.c~fix-of-quota-deadlock-on-pagelock-quota-core 2004-12-03 20:56:04.295107232 -0800
-+++ 25-akpm/fs/quota.c 2004-12-03 20:56:04.313104496 -0800
+diff -rup RH_2_6_9_55.orig/fs/quota.c RH_2_6_9_55/fs/quota.c
+--- RH_2_6_9_55.orig/fs/quota.c
++++ RH_2_6_9_55/fs/quota.c
@@ -13,6 +13,8 @@
#include <linux/kernel.h>
#include <linux/smp_lock.h>
@@ -354,7 +353,7 @@ diff -puN fs/quota.c~fix-of-quota-deadlock-on-pagelock-quota-core fs/quota.c
/* Check validity of quotactl */
static int check_quotactl_valid(struct super_block *sb, int type, int cmd, qid_t id)
-@@ -135,16 +136,54 @@ restart:
+@@ -134,16 +136,54 @@ restart:
return NULL;
}
@@ -412,9 +411,9 @@ diff -puN fs/quota.c~fix-of-quota-deadlock-on-pagelock-quota-core fs/quota.c
drop_super(sb);
}
}
-diff -puN fs/quota_v1.c~fix-of-quota-deadlock-on-pagelock-quota-core fs/quota_v1.c
---- 25/fs/quota_v1.c~fix-of-quota-deadlock-on-pagelock-quota-core 2004-12-03 20:56:04.296107080 -0800
-+++ 25-akpm/fs/quota_v1.c 2004-12-03 20:56:04.314104344 -0800
+diff -rup RH_2_6_9_55.orig/fs/quota_v1.c RH_2_6_9_55/fs/quota_v1.c
+--- RH_2_6_9_55.orig/fs/quota_v1.c
++++ RH_2_6_9_55/fs/quota_v1.c
@@ -7,7 +7,6 @@
#include <linux/init.h>
#include <linux/module.h>
@@ -576,9 +575,9 @@ diff -puN fs/quota_v1.c~fix-of-quota-deadlock-on-pagelock-quota-core fs/quota_v1
return ret;
}
-diff -puN fs/quota_v2.c~fix-of-quota-deadlock-on-pagelock-quota-core fs/quota_v2.c
---- 25/fs/quota_v2.c~fix-of-quota-deadlock-on-pagelock-quota-core 2004-12-03 20:56:04.297106928 -0800
-+++ 25-akpm/fs/quota_v2.c 2004-12-03 20:56:04.318103736 -0800
+diff -rup RH_2_6_9_55.orig/fs/quota_v2.c RH_2_6_9_55/fs/quota_v2.c
+--- RH_2_6_9_55.orig/fs/quota_v2.c
++++ RH_2_6_9_55/fs/quota_v2.c
@@ -13,7 +13,6 @@
#include <linux/slab.h>
@@ -1175,11 +1174,11 @@ diff -puN fs/quota_v2.c~fix-of-quota-deadlock-on-pagelock-quota-core fs/quota_v2
disk2memdqb(&dquot->dq_dqb, &ddquot);
if (!dquot->dq_dqb.dqb_bhardlimit &&
!dquot->dq_dqb.dqb_bsoftlimit &&
-diff -puN include/linux/fs.h~fix-of-quota-deadlock-on-pagelock-quota-core include/linux/fs.h
---- 25/include/linux/fs.h~fix-of-quota-deadlock-on-pagelock-quota-core 2004-12-03 20:56:04.300106472 -0800
-+++ 25-akpm/include/linux/fs.h 2004-12-03 20:56:04.319103584 -0800
-@@ -1004,6 +1004,9 @@ struct super_operations {
- void (*umount_begin) (struct super_block *);
+diff -rup RH_2_6_9_55.orig/include/linux/fs.h RH_2_6_9_55/include/linux/fs.h
+--- RH_2_6_9_55.orig/include/linux/fs.h
++++ RH_2_6_9_55/include/linux/fs.h
+@@ -1042,6 +1042,9 @@ struct super_operations {
+ void (*umount_lustre) (struct super_block *);
int (*show_options)(struct seq_file *, struct vfsmount *);
+
@@ -1188,10 +1187,9 @@ diff -puN include/linux/fs.h~fix-of-quota-deadlock-on-pagelock-quota-core includ
};
/* Inode state bits. Protected by inode_lock. */
-
-diff -puN include/linux/quota.h~fix-of-quota-deadlock-on-pagelock-quota-core include/linux/quota.h
---- 25/include/linux/quota.h~fix-of-quota-deadlock-on-pagelock-quota-core 2004-12-03 20:56:04.301106320 -0800
-+++ 25-akpm/include/linux/quota.h 2004-12-03 20:56:04.320103432 -0800
+diff -rup RH_2_6_9_55.orig/include/linux/quota.h RH_2_6_9_55/include/linux/quota.h
+--- RH_2_6_9_55.orig/include/linux/quota.h
++++ RH_2_6_9_55/include/linux/quota.h
@@ -285,7 +285,7 @@ struct quota_info {
struct semaphore dqio_sem; /* lock device while I/O in progress */
struct semaphore dqonoff_sem; /* Serialize quotaon & quotaoff */
@@ -1201,9 +1199,9 @@ diff -puN include/linux/quota.h~fix-of-quota-deadlock-on-pagelock-quota-core inc
struct mem_dqinfo info[MAXQUOTAS]; /* Information for each quota type */
struct quota_format_ops *ops[MAXQUOTAS]; /* Operations for each type */
};
-diff -puN include/linux/security.h~fix-of-quota-deadlock-on-pagelock-quota-core include/linux/security.h
---- 25/include/linux/security.h~fix-of-quota-deadlock-on-pagelock-quota-core 2004-12-03 20:56:04.303106016 -0800
-+++ 25-akpm/include/linux/security.h 2004-12-03 20:56:04.322103128 -0800
+diff -rup RH_2_6_9_55.orig/include/linux/security.h RH_2_6_9_55/include/linux/security.h
+--- RH_2_6_9_55.orig/include/linux/security.h
++++ RH_2_6_9_55/include/linux/security.h
@@ -1033,7 +1033,7 @@ struct security_operations {
int (*sysctl) (ctl_table * table, int op);
int (*capable) (struct task_struct * tsk, int cap);
@@ -1225,7 +1223,7 @@ diff -puN include/linux/security.h~fix-of-quota-deadlock-on-pagelock-quota-core
}
static inline int security_syslog(int type)
-@@ -1959,7 +1959,7 @@ static inline int security_quotactl (int
+@@ -1953,7 +1953,7 @@ static inline int security_quotactl (int
return 0;
}
@@ -1234,9 +1232,9 @@ diff -puN include/linux/security.h~fix-of-quota-deadlock-on-pagelock-quota-core
{
return 0;
}
-diff -puN security/dummy.c~fix-of-quota-deadlock-on-pagelock-quota-core security/dummy.c
---- 25/security/dummy.c~fix-of-quota-deadlock-on-pagelock-quota-core 2004-12-03 20:56:04.304105864 -0800
-+++ 25-akpm/security/dummy.c 2004-12-03 20:56:04.323102976 -0800
+diff -rup RH_2_6_9_55.orig/security/dummy.c RH_2_6_9_55/security/dummy.c
+--- RH_2_6_9_55.orig/security/dummy.c
++++ RH_2_6_9_55/security/dummy.c
@@ -92,7 +92,7 @@ static int dummy_quotactl (int cmds, int
return 0;
}
@@ -1246,10 +1244,10 @@ diff -puN security/dummy.c~fix-of-quota-deadlock-on-pagelock-quota-core security
{
return 0;
}
-diff -puN security/selinux/hooks.c~fix-of-quota-deadlock-on-pagelock-quota-core security/selinux/hooks.c
---- 25/security/selinux/hooks.c~fix-of-quota-deadlock-on-pagelock-quota-core 2004-12-03 20:56:04.306105560 -0800
-+++ 25-akpm/security/selinux/hooks.c 2004-12-03 20:56:04.326102520 -0800
-@@ -1494,9 +1494,9 @@ static int selinux_quotactl(int cmds, in
+diff -rup RH_2_6_9_55.orig/security/selinux/hooks.c RH_2_6_9_55/security/selinux/hooks.c
+--- RH_2_6_9_55.orig/security/selinux/hooks.c
++++ RH_2_6_9_55/security/selinux/hooks.c
+@@ -1485,9 +1485,9 @@ static int selinux_quotactl(int cmds, in
return rc;
}
@@ -1261,4 +1259,3 @@ diff -puN security/selinux/hooks.c~fix-of-quota-deadlock-on-pagelock-quota-core
}
static int selinux_syslog(int type)
-_
diff --git a/lustre/kernel_patches/patches/vfs_intent-2.6-rhel4.patch b/lustre/kernel_patches/patches/vfs_intent-2.6-rhel4.patch
index 19bd34b312fb2ae94124403eafb342c9868ac347..1e659f5534541bb96de318857bcac361b2840b21 100644
--- a/lustre/kernel_patches/patches/vfs_intent-2.6-rhel4.patch
+++ b/lustre/kernel_patches/patches/vfs_intent-2.6-rhel4.patch
@@ -1,47 +1,30 @@
-diff -urNp RH_2_6_9_42_0_3.orig/fs/cifs/dir.c RH_2_6_9_42_0_3/fs/cifs/dir.c
---- RH_2_6_9_42_0_3.orig/fs/cifs/dir.c 2006-10-23 13:32:46.000000000 +0300
-+++ RH_2_6_9_42_0_3/fs/cifs/dir.c 2007-01-29 17:47:35.000000000 +0200
-@@ -146,23 +146,23 @@ cifs_create(struct inode *inode, struct
- }
-
- if(nd) {
-- if ((nd->intent.open.flags & O_ACCMODE) == O_RDONLY)
-+ if ((nd->intent.it_flags & O_ACCMODE) == O_RDONLY)
- desiredAccess = GENERIC_READ;
-- else if ((nd->intent.open.flags & O_ACCMODE) == O_WRONLY) {
-+ else if ((nd->intent.it_flags & O_ACCMODE) == O_WRONLY) {
- desiredAccess = GENERIC_WRITE;
- write_only = TRUE;
-- } else if ((nd->intent.open.flags & O_ACCMODE) == O_RDWR) {
-+ } else if ((nd->intent.it_flags & O_ACCMODE) == O_RDWR) {
- /* GENERIC_ALL is too much permission to request */
- /* can cause unnecessary access denied on create */
- /* desiredAccess = GENERIC_ALL; */
- desiredAccess = GENERIC_READ | GENERIC_WRITE;
- }
-
-- if((nd->intent.open.flags & (O_CREAT | O_EXCL)) == (O_CREAT | O_EXCL))
-+ if((nd->intent.it_flags & (O_CREAT | O_EXCL)) == (O_CREAT | O_EXCL))
- disposition = FILE_CREATE;
-- else if((nd->intent.open.flags & (O_CREAT | O_TRUNC)) == (O_CREAT | O_TRUNC))
-+ else if((nd->intent.it_flags & (O_CREAT | O_TRUNC)) == (O_CREAT | O_TRUNC))
- disposition = FILE_OVERWRITE_IF;
-- else if((nd->intent.open.flags & O_CREAT) == O_CREAT)
-+ else if((nd->intent.it_flags & O_CREAT) == O_CREAT)
- disposition = FILE_OPEN_IF;
- else {
- cFYI(1,("Create flag not set in create function"));
-diff -urNp RH_2_6_9_42_0_3.orig/fs/exec.c RH_2_6_9_42_0_3/fs/exec.c
---- RH_2_6_9_42_0_3.orig/fs/exec.c 2006-10-23 13:33:09.000000000 +0300
-+++ RH_2_6_9_42_0_3/fs/exec.c 2007-01-29 17:47:35.000000000 +0200
+diff -rup RH_2_6_9_55.orig/fs/cifs/dir.c RH_2_6_9_55/fs/cifs/dir.c
+--- RH_2_6_9_55.orig/fs/cifs/dir.c
++++ RH_2_6_9_55/fs/cifs/dir.c
+@@ -157,11 +157,7 @@ cifs_create(struct inode *inode, struct
+
+ #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)
+ if(nd && (nd->flags & LOOKUP_OPEN)) {
+-#if LINUX_VERSION_CODE == KERNEL_VERSION(2,6,5) /* SUSE included Lustre patch */
+ int oflags = nd->intent.it_flags;
+-#else
+- int oflags = nd->intent.open.flags;
+-#endif
+
+ desiredAccess = 0;
+ if (oflags & FMODE_READ)
+diff -rup RH_2_6_9_55.orig/fs/exec.c RH_2_6_9_55/fs/exec.c
+--- RH_2_6_9_55.orig/fs/exec.c
++++ RH_2_6_9_55/fs/exec.c
@@ -126,9 +126,10 @@ asmlinkage long sys_uselib(const char __
struct file * file;
struct nameidata nd;
int error;
-+ intent_init(&nd.intent, IT_OPEN);
-
-- nd.intent.open.flags = FMODE_READ;
+-
+- nd.intent.open.flags = FMODE_READ|FMODE_EXEC;
- error = __user_walk(library, LOOKUP_FOLLOW|LOOKUP_OPEN, &nd);
++ intent_init(&nd.intent, IT_OPEN);
++
+ nd.intent.it_flags = FMODE_READ|FMODE_EXEC;
+ error = __user_walk_it(library, LOOKUP_FOLLOW|LOOKUP_OPEN, &nd);
if (error)
@@ -60,7 +43,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/exec.c RH_2_6_9_42_0_3/fs/exec.c
int err;
struct file *file;
-- nd.intent.open.flags = FMODE_READ;
+- nd.intent.open.flags = FMODE_READ|FMODE_EXEC;
- err = path_lookup(name, LOOKUP_FOLLOW|LOOKUP_OPEN, &nd);
+ intent_init(&nd.intent, IT_OPEN);
+ nd.intent.it_flags = FMODE_READ|FMODE_EXEC;
@@ -68,8 +51,8 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/exec.c RH_2_6_9_42_0_3/fs/exec.c
file = ERR_PTR(err);
if (!err) {
-@@ -503,7 +505,7 @@ struct file *open_exec(const char *name)
- err = -EACCES;
+@@ -501,7 +503,7 @@ struct file *open_exec(const char *name)
+ int err = permission(inode, MAY_EXEC, &nd);
file = ERR_PTR(err);
if (!err) {
- file = dentry_open(nd.dentry, nd.mnt, O_RDONLY);
@@ -77,18 +60,9 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/exec.c RH_2_6_9_42_0_3/fs/exec.c
if (!IS_ERR(file)) {
err = deny_write_access(file);
if (err) {
-@@ -1536,7 +1538,7 @@ int do_coredump(long signr, int exit_cod
- goto close_fail;
- if (!file->f_op->write)
- goto close_fail;
-- if (do_truncate(file->f_dentry, 0) != 0)
-+ if (do_truncate(file->f_dentry, 0, 0) != 0)
- goto close_fail;
-
- retval = binfmt->core_dump(signr, regs, file);
-diff -urNp RH_2_6_9_42_0_3.orig/fs/inode.c RH_2_6_9_42_0_3/fs/inode.c
---- RH_2_6_9_42_0_3.orig/fs/inode.c 2006-10-23 13:33:09.000000000 +0300
-+++ RH_2_6_9_42_0_3/fs/inode.c 2007-01-29 17:47:35.000000000 +0200
+diff -rup RH_2_6_9_55.orig/fs/inode.c RH_2_6_9_55/fs/inode.c
+--- RH_2_6_9_55.orig/fs/inode.c
++++ RH_2_6_9_55/fs/inode.c
@@ -235,6 +235,7 @@ void __iget(struct inode * inode)
inodes_stat.nr_unused--;
}
@@ -97,10 +71,10 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/inode.c RH_2_6_9_42_0_3/fs/inode.c
/**
* clear_inode - clear an inode
* @inode: inode to clear
-diff -urNp RH_2_6_9_42_0_3.orig/fs/namei.c RH_2_6_9_42_0_3/fs/namei.c
---- RH_2_6_9_42_0_3.orig/fs/namei.c 2006-10-23 13:33:09.000000000 +0300
-+++ RH_2_6_9_42_0_3/fs/namei.c 2007-01-29 17:53:11.000000000 +0200
-@@ -274,8 +274,19 @@ int deny_write_access(struct file * file
+diff -rup RH_2_6_9_55.orig/fs/namei.c RH_2_6_9_55/fs/namei.c
+--- RH_2_6_9_55.orig/fs/namei.c
++++ RH_2_6_9_55/fs/namei.c
+@@ -282,8 +282,19 @@ int deny_write_access(struct file * file
return 0;
}
@@ -120,30 +94,36 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/namei.c RH_2_6_9_42_0_3/fs/namei.c
dput(nd->dentry);
mntput(nd->mnt);
}
-@@ -367,7 +378,10 @@ static struct dentry * real_lookup(struc
+@@ -395,8 +406,12 @@ static struct dentry * real_lookup(struc
{
struct dentry * result;
struct inode *dir = parent->d_inode;
+-
+ int counter = 0;
-
++
+again:
-+ counter++;
down(&dir->i_sem);
++ counter++;
++
/*
* First re-do the cached lookup just in case it was created
-@@ -406,7 +420,10 @@ static struct dentry * real_lookup(struc
+ * while we waited for the directory semaphore..
+@@ -433,8 +448,12 @@ static struct dentry * real_lookup(struc
+ up(&dir->i_sem);
if (result->d_op && result->d_op->d_revalidate) {
- if (!result->d_op->d_revalidate(result, nd) && !d_invalidate(result)) {
- dput(result);
+ result = do_revalidate(result, nd);
+- if (!result)
- result = ERR_PTR(-ENOENT);
++ if (!result) {
+ if (counter > 10)
+ result = ERR_PTR(-ESTALE);
+ if (!IS_ERR(result))
+ goto again;
- }
++ }
}
return result;
-@@ -437,6 +454,7 @@ static inline int __vfs_follow_link(stru
+ }
+@@ -464,6 +483,7 @@ static inline int __vfs_follow_link(stru
{
int res = 0;
char *name;
@@ -151,7 +131,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/namei.c RH_2_6_9_42_0_3/fs/namei.c
if (IS_ERR(link))
goto fail;
-@@ -446,6 +464,7 @@ static inline int __vfs_follow_link(stru
+@@ -473,6 +493,7 @@ static inline int __vfs_follow_link(stru
/* weird __emul_prefix() stuff did it */
goto out;
}
@@ -159,7 +139,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/namei.c RH_2_6_9_42_0_3/fs/namei.c
res = link_path_walk(link, nd);
out:
if (nd->depth || res || nd->last_type!=LAST_NORM)
-@@ -654,6 +673,33 @@ fail:
+@@ -681,6 +702,33 @@ fail:
return PTR_ERR(dentry);
}
@@ -193,12 +173,17 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/namei.c RH_2_6_9_42_0_3/fs/namei.c
/*
* Name resolution.
* This is the basic name resolution function, turning a pathname into
-@@ -755,8 +801,12 @@ static fastcall int __link_path_walk(con
+@@ -782,13 +830,17 @@ static fastcall int __link_path_walk(con
goto out_dput;
if (inode->i_op->follow_link) {
+ int save_flags = nd->flags;
mntget(next.mnt);
+ if (next.mnt != nd->mnt) {
+ dput(nd->dentry);
+ nd->mnt = next.mnt;
+ nd->dentry = dget(next.dentry);
+ }
+ nd->flags |= LOOKUP_LINK_NOTLAST;
err = do_follow_link(next.dentry, nd);
+ if (!(save_flags & LOOKUP_LINK_NOTLAST))
@@ -206,17 +191,17 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/namei.c RH_2_6_9_42_0_3/fs/namei.c
dput(next.dentry);
mntput(next.mnt);
if (err)
-@@ -795,14 +845,34 @@ last_component:
+@@ -828,14 +880,34 @@ last_component:
inode = nd->dentry->d_inode;
/* fallthrough */
case 1:
-+ nd->flags |= LOOKUP_LAST;
-+ err = revalidate_special(nd);
-+ nd->flags &= ~LOOKUP_LAST;
++ nd->flags |= LOOKUP_LAST;
++ err = revalidate_special(nd);
++ nd->flags &= ~LOOKUP_LAST;
+ if (!nd->dentry->d_inode)
+ err = -ENOENT;
+ if (err) {
-+ path_release(nd);
++ path_release(nd);
+ goto return_err;
+ }
+ if (lookup_flags & LOOKUP_DIRECTORY) {
@@ -241,7 +226,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/namei.c RH_2_6_9_42_0_3/fs/namei.c
if (err)
break;
follow_mount(&next.mnt, &next.dentry);
-@@ -969,7 +1039,7 @@ set_it:
+@@ -1007,7 +1079,7 @@ set_it:
}
/* Returns 0 and nd will be valid on success; Retuns error, otherwise. */
@@ -250,7 +235,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/namei.c RH_2_6_9_42_0_3/fs/namei.c
{
int retval = 0;
-@@ -1003,6 +1073,12 @@ out:
+@@ -1041,6 +1113,12 @@ out:
return retval;
}
@@ -263,7 +248,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/namei.c RH_2_6_9_42_0_3/fs/namei.c
/*
* Restricted form of lookup. Doesn't follow links, single-component only,
* needs parent already locked. Doesn't follow mounts.
-@@ -1053,7 +1129,7 @@ struct dentry * lookup_hash(struct qstr
+@@ -1091,7 +1169,7 @@ struct dentry * lookup_hash(struct qstr
}
/* SMP-safe */
@@ -272,7 +257,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/namei.c RH_2_6_9_42_0_3/fs/namei.c
{
unsigned long hash;
struct qstr this;
-@@ -1073,11 +1149,16 @@ struct dentry * lookup_one_len(const cha
+@@ -1111,11 +1189,16 @@ struct dentry * lookup_one_len(const cha
}
this.hash = end_name_hash(hash);
@@ -290,7 +275,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/namei.c RH_2_6_9_42_0_3/fs/namei.c
/*
* namei()
*
-@@ -1089,18 +1170,24 @@ access:
+@@ -1127,18 +1210,24 @@ access:
* that namei follows links, while lnamei does not.
* SMP-safe
*/
@@ -317,16 +302,16 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/namei.c RH_2_6_9_42_0_3/fs/namei.c
/*
* It's inline, so penalty for filesystems that don't use sticky bit is
* minimal.
-@@ -1346,7 +1433,7 @@ int may_open(struct nameidata *nd, int a
+@@ -1384,7 +1473,7 @@ int may_open(struct nameidata *nd, int a
if (!error) {
DQUOT_INIT(inode);
-- error = do_truncate(dentry, 0);
-+ error = do_truncate(dentry, 0, 1);
+- error = do_truncate(dentry, 0, ATTR_MTIME|ATTR_CTIME);
++ error = do_truncate(dentry, 0, ATTR_MTIME|ATTR_CTIME|ATTR_FROM_OPEN);
}
put_write_access(inode);
if (error)
-@@ -1387,14 +1474,14 @@ int open_namei(const char * pathname, in
+@@ -1425,14 +1514,14 @@ int open_namei(const char * pathname, in
acc_mode |= MAY_APPEND;
/* Fill in the open() intent data */
@@ -344,7 +329,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/namei.c RH_2_6_9_42_0_3/fs/namei.c
if (error)
return error;
goto ok;
-@@ -1403,7 +1490,8 @@ int open_namei(const char * pathname, in
+@@ -1441,7 +1530,8 @@ int open_namei(const char * pathname, in
/*
* Create - we need to know the parent.
*/
@@ -354,7 +339,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/namei.c RH_2_6_9_42_0_3/fs/namei.c
if (error)
return error;
-@@ -1419,7 +1507,9 @@ int open_namei(const char * pathname, in
+@@ -1457,7 +1547,9 @@ int open_namei(const char * pathname, in
dir = nd->dentry;
nd->flags &= ~LOOKUP_PARENT;
down(&dir->d_inode->i_sem);
@@ -364,7 +349,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/namei.c RH_2_6_9_42_0_3/fs/namei.c
do_last:
error = PTR_ERR(dentry);
-@@ -1532,7 +1622,9 @@ do_link:
+@@ -1570,7 +1662,9 @@ do_link:
}
dir = nd->dentry;
down(&dir->d_inode->i_sem);
@@ -374,7 +359,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/namei.c RH_2_6_9_42_0_3/fs/namei.c
__putname(nd->last.name);
goto do_last;
}
-@@ -1606,10 +1698,20 @@ asmlinkage long sys_mknod(const char __u
+@@ -1644,10 +1738,20 @@ asmlinkage long sys_mknod(const char __u
tmp = getname(filename);
if (IS_ERR(tmp))
return PTR_ERR(tmp);
@@ -397,7 +382,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/namei.c RH_2_6_9_42_0_3/fs/namei.c
dentry = lookup_create(&nd, 0);
error = PTR_ERR(dentry);
-@@ -1636,6 +1738,7 @@ asmlinkage long sys_mknod(const char __u
+@@ -1674,6 +1778,7 @@ asmlinkage long sys_mknod(const char __u
dput(dentry);
}
up(&nd.dentry->d_inode->i_sem);
@@ -405,7 +390,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/namei.c RH_2_6_9_42_0_3/fs/namei.c
path_release(&nd);
out:
putname(tmp);
-@@ -1678,10 +1781,18 @@ asmlinkage long sys_mkdir(const char __u
+@@ -1716,10 +1821,20 @@ asmlinkage long sys_mkdir(const char __u
if (!IS_ERR(tmp)) {
struct dentry *dentry;
struct nameidata nd;
@@ -415,6 +400,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/namei.c RH_2_6_9_42_0_3/fs/namei.c
+ error = path_lookup_it(tmp, LOOKUP_PARENT, &nd);
if (error)
goto out;
++
+ if (nd.dentry->d_inode->i_op->mkdir_raw) {
+ struct inode_operations *op = nd.dentry->d_inode->i_op;
+ error = op->mkdir_raw(&nd, mode);
@@ -422,10 +408,11 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/namei.c RH_2_6_9_42_0_3/fs/namei.c
+ if (error != -EOPNOTSUPP)
+ goto out2;
+ }
++
dentry = lookup_create(&nd, 1);
error = PTR_ERR(dentry);
if (!IS_ERR(dentry)) {
-@@ -1691,6 +1802,7 @@ asmlinkage long sys_mkdir(const char __u
+@@ -1729,6 +1844,7 @@ asmlinkage long sys_mkdir(const char __u
dput(dentry);
}
up(&nd.dentry->d_inode->i_sem);
@@ -433,7 +420,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/namei.c RH_2_6_9_42_0_3/fs/namei.c
path_release(&nd);
out:
putname(tmp);
-@@ -1776,7 +1888,8 @@ asmlinkage long sys_rmdir(const char __u
+@@ -1814,7 +1930,8 @@ asmlinkage long sys_rmdir(const char __u
if(IS_ERR(name))
return PTR_ERR(name);
@@ -443,7 +430,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/namei.c RH_2_6_9_42_0_3/fs/namei.c
if (error)
goto exit;
-@@ -1791,6 +1904,16 @@ asmlinkage long sys_rmdir(const char __u
+@@ -1829,6 +1946,16 @@ asmlinkage long sys_rmdir(const char __u
error = -EBUSY;
goto exit1;
}
@@ -460,7 +447,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/namei.c RH_2_6_9_42_0_3/fs/namei.c
down(&nd.dentry->d_inode->i_sem);
dentry = lookup_hash(&nd.last, nd.dentry);
error = PTR_ERR(dentry);
-@@ -1854,12 +1977,20 @@ asmlinkage long sys_unlink(const char __
+@@ -1892,12 +2019,22 @@ asmlinkage long sys_unlink(const char __
if(IS_ERR(name))
return PTR_ERR(name);
@@ -472,6 +459,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/namei.c RH_2_6_9_42_0_3/fs/namei.c
error = -EISDIR;
if (nd.last_type != LAST_NORM)
goto exit1;
++
+ if (nd.dentry->d_inode->i_op->unlink_raw) {
+ struct inode_operations *op = nd.dentry->d_inode->i_op;
+ error = op->unlink_raw(&nd);
@@ -479,10 +467,11 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/namei.c RH_2_6_9_42_0_3/fs/namei.c
+ if (error != -EOPNOTSUPP)
+ goto exit1;
+ }
++
down(&nd.dentry->d_inode->i_sem);
dentry = lookup_hash(&nd.last, nd.dentry);
error = PTR_ERR(dentry);
-@@ -1927,10 +2058,18 @@ asmlinkage long sys_symlink(const char _
+@@ -1965,10 +2102,20 @@ asmlinkage long sys_symlink(const char _
if (!IS_ERR(to)) {
struct dentry *dentry;
struct nameidata nd;
@@ -492,6 +481,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/namei.c RH_2_6_9_42_0_3/fs/namei.c
+ error = path_lookup_it(to, LOOKUP_PARENT, &nd);
if (error)
goto out;
++
+ if (nd.dentry->d_inode->i_op->symlink_raw) {
+ struct inode_operations *op = nd.dentry->d_inode->i_op;
+ error = op->symlink_raw(&nd, from);
@@ -499,10 +489,11 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/namei.c RH_2_6_9_42_0_3/fs/namei.c
+ if (error != -EOPNOTSUPP)
+ goto out2;
+ }
++
dentry = lookup_create(&nd, 0);
error = PTR_ERR(dentry);
if (!IS_ERR(dentry)) {
-@@ -1938,6 +2077,7 @@ asmlinkage long sys_symlink(const char _
+@@ -1976,6 +2123,7 @@ asmlinkage long sys_symlink(const char _
dput(dentry);
}
up(&nd.dentry->d_inode->i_sem);
@@ -510,7 +501,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/namei.c RH_2_6_9_42_0_3/fs/namei.c
path_release(&nd);
out:
putname(to);
-@@ -2007,15 +2147,25 @@ asmlinkage long sys_link(const char __us
+@@ -2045,15 +2193,26 @@ asmlinkage long sys_link(const char __us
if (IS_ERR(to))
return PTR_ERR(to);
@@ -535,10 +526,11 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/namei.c RH_2_6_9_42_0_3/fs/namei.c
+ if (error != -EOPNOTSUPP)
+ goto out_release;
+ }
++
new_dentry = lookup_create(&nd, 0);
error = PTR_ERR(new_dentry);
if (!IS_ERR(new_dentry)) {
-@@ -2191,11 +2341,13 @@ static inline int do_rename(const char *
+@@ -2229,11 +2388,13 @@ static inline int do_rename(const char *
struct dentry * trap;
struct nameidata oldnd, newnd;
@@ -554,7 +546,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/namei.c RH_2_6_9_42_0_3/fs/namei.c
if (error)
goto exit1;
-@@ -2212,6 +2364,13 @@ static inline int do_rename(const char *
+@@ -2250,6 +2411,13 @@ static inline int do_rename(const char *
if (newnd.last_type != LAST_NORM)
goto exit2;
@@ -568,7 +560,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/namei.c RH_2_6_9_42_0_3/fs/namei.c
trap = lock_rename(new_dir, old_dir);
old_dentry = lookup_hash(&oldnd.last, old_dir);
-@@ -2243,8 +2402,7 @@ static inline int do_rename(const char *
+@@ -2281,8 +2449,7 @@ static inline int do_rename(const char *
if (new_dentry == trap)
goto exit5;
@@ -578,7 +570,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/namei.c RH_2_6_9_42_0_3/fs/namei.c
exit5:
dput(new_dentry);
exit4:
-@@ -2435,6 +2593,7 @@ EXPORT_SYMBOL(page_readlink);
+@@ -2473,6 +2640,7 @@ EXPORT_SYMBOL(page_readlink);
EXPORT_SYMBOL(page_symlink);
EXPORT_SYMBOL(page_symlink_inode_operations);
EXPORT_SYMBOL(path_lookup);
@@ -587,8 +579,8 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/namei.c RH_2_6_9_42_0_3/fs/namei.c
EXPORT_SYMBOL(path_walk);
EXPORT_SYMBOL(permission);
diff -urNp RH_2_6_9_42_0_3.orig/fs/namespace.c RH_2_6_9_42_0_3/fs/namespace.c
---- RH_2_6_9_42_0_3.orig/fs/namespace.c 2006-10-23 13:33:09.000000000 +0300
-+++ RH_2_6_9_42_0_3/fs/namespace.c 2007-01-29 17:47:35.000000000 +0200
+--- RH_2_6_9_42_0_3.orig/fs/namespace.c
++++ RH_2_6_9_42_0_3/fs/namespace.c
@@ -61,6 +61,7 @@ struct vfsmount *alloc_vfsmnt(const char
INIT_LIST_HEAD(&mnt->mnt_mounts);
INIT_LIST_HEAD(&mnt->mnt_list);
@@ -605,17 +597,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/namespace.c RH_2_6_9_42_0_3/fs/namespace.c
old_nd->dentry = mnt->mnt_mountpoint;
old_nd->mnt = mnt->mnt_parent;
mnt->mnt_parent = mnt;
-@@ -177,6 +179,9 @@ void __mntput(struct vfsmount *mnt)
- {
- struct super_block *sb = mnt->mnt_sb;
- dput(mnt->mnt_root);
-+ spin_lock(&dcache_lock);
-+ list_del(&mnt->mnt_lustre_list);
-+ spin_unlock(&dcache_lock);
- free_vfsmnt(mnt);
- deactivate_super(sb);
- }
-@@ -403,6 +408,8 @@ static int do_umount(struct vfsmount *mn
+@@ -441,6 +442,8 @@ static int do_umount(struct vfsmount *mn
*/
lock_kernel();
@@ -624,7 +606,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/namespace.c RH_2_6_9_42_0_3/fs/namespace.c
if( (flags&MNT_FORCE) && sb->s_op->umount_begin)
sb->s_op->umount_begin(sb);
unlock_kernel();
-@@ -627,7 +634,8 @@ static int do_loopback(struct nameidata
+@@ -665,7 +668,8 @@ static int do_loopback(struct nameidata
return err;
if (!old_name || !*old_name)
return -EINVAL;
@@ -634,7 +616,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/namespace.c RH_2_6_9_42_0_3/fs/namespace.c
if (err)
return err;
-@@ -701,7 +709,8 @@ static int do_move_mount(struct nameidat
+@@ -739,7 +743,8 @@ static int do_move_mount(struct nameidat
return -EPERM;
if (!old_name || !*old_name)
return -EINVAL;
@@ -644,7 +626,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/namespace.c RH_2_6_9_42_0_3/fs/namespace.c
if (err)
return err;
-@@ -1036,7 +1045,8 @@ long do_mount(char * dev_name, char * di
+@@ -1074,7 +1079,8 @@ long do_mount(char * dev_name, char * di
flags &= ~(MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_ACTIVE);
/* ... and get the mountpoint */
@@ -654,10 +636,10 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/namespace.c RH_2_6_9_42_0_3/fs/namespace.c
if (retval)
return retval;
-diff -urNp RH_2_6_9_42_0_3.orig/fs/nfs/dir.c RH_2_6_9_42_0_3/fs/nfs/dir.c
---- RH_2_6_9_42_0_3.orig/fs/nfs/dir.c 2006-10-23 13:32:56.000000000 +0300
-+++ RH_2_6_9_42_0_3/fs/nfs/dir.c 2007-01-29 17:47:35.000000000 +0200
-@@ -827,7 +827,7 @@ int nfs_is_exclusive_create(struct inode
+diff -rup RH_2_6_9_55.orig/fs/nfs/dir.c RH_2_6_9_55/fs/nfs/dir.c
+--- RH_2_6_9_55.orig/fs/nfs/dir.c
++++ RH_2_6_9_55/fs/nfs/dir.c
+@@ -839,7 +839,7 @@ int nfs_is_exclusive_create(struct inode
return 0;
if (!nd || (nd->flags & LOOKUP_CONTINUE) || !(nd->flags & LOOKUP_CREATE))
return 0;
@@ -666,7 +648,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/nfs/dir.c RH_2_6_9_42_0_3/fs/nfs/dir.c
}
static struct dentry *nfs_lookup(struct inode *dir, struct dentry * dentry, struct nameidata *nd)
-@@ -902,7 +902,7 @@ static int is_atomic_open(struct inode *
+@@ -915,7 +915,7 @@ static int is_atomic_open(struct inode *
if (nd->flags & LOOKUP_DIRECTORY)
return 0;
/* Are we trying to write to a read only partition? */
@@ -675,7 +657,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/nfs/dir.c RH_2_6_9_42_0_3/fs/nfs/dir.c
return 0;
return 1;
}
-@@ -923,7 +923,7 @@ static struct dentry *nfs_atomic_lookup(
+@@ -936,7 +936,7 @@ static struct dentry *nfs_atomic_lookup(
dentry->d_op = NFS_PROTO(dir)->dentry_ops;
/* Let vfs_create() deal with O_EXCL */
@@ -684,7 +666,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/nfs/dir.c RH_2_6_9_42_0_3/fs/nfs/dir.c
goto no_entry;
/* Open the file on the server */
-@@ -935,7 +935,7 @@ static struct dentry *nfs_atomic_lookup(
+@@ -948,7 +948,7 @@ static struct dentry *nfs_atomic_lookup(
goto out;
}
@@ -693,7 +675,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/nfs/dir.c RH_2_6_9_42_0_3/fs/nfs/dir.c
nfs_begin_data_update(dir);
inode = nfs4_atomic_open(dir, dentry, nd);
nfs_end_data_update(dir);
-@@ -954,7 +954,7 @@ static struct dentry *nfs_atomic_lookup(
+@@ -967,7 +967,7 @@ static struct dentry *nfs_atomic_lookup(
case -ENOTDIR:
goto no_open;
case -ELOOP:
@@ -702,7 +684,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/nfs/dir.c RH_2_6_9_42_0_3/fs/nfs/dir.c
goto no_open;
/* case -EINVAL: */
default:
-@@ -992,7 +992,7 @@ static int nfs_open_revalidate(struct de
+@@ -1005,7 +1005,7 @@ static int nfs_open_revalidate(struct de
/* NFS only supports OPEN on regular files */
if (!S_ISREG(inode->i_mode))
goto no_open;
@@ -711,7 +693,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/nfs/dir.c RH_2_6_9_42_0_3/fs/nfs/dir.c
/* We cannot do exclusive creation on a positive dentry */
if ((openflags & (O_CREAT|O_EXCL)) == (O_CREAT|O_EXCL))
goto no_open;
-@@ -1200,7 +1200,7 @@ static int nfs_create(struct inode *dir,
+@@ -1213,7 +1213,7 @@ static int nfs_create(struct inode *dir,
attr.ia_valid = ATTR_MODE;
if (nd && (nd->flags & LOOKUP_CREATE))
@@ -720,10 +702,10 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/nfs/dir.c RH_2_6_9_42_0_3/fs/nfs/dir.c
/*
* The 0 argument passed into the create function should one day
-diff -urNp RH_2_6_9_42_0_3.orig/fs/nfs/nfs4proc.c RH_2_6_9_42_0_3/fs/nfs/nfs4proc.c
---- RH_2_6_9_42_0_3.orig/fs/nfs/nfs4proc.c 2006-10-23 13:32:56.000000000 +0300
-+++ RH_2_6_9_42_0_3/fs/nfs/nfs4proc.c 2007-01-29 17:47:35.000000000 +0200
-@@ -803,17 +803,17 @@ nfs4_atomic_open(struct inode *dir, stru
+diff -rup RH_2_6_9_55.orig/fs/nfs/nfs4proc.c RH_2_6_9_55/fs/nfs/nfs4proc.c
+--- RH_2_6_9_55.orig/fs/nfs/nfs4proc.c
++++ RH_2_6_9_55/fs/nfs/nfs4proc.c
+@@ -770,17 +770,17 @@ nfs4_atomic_open(struct inode *dir, stru
struct nfs4_state *state;
if (nd->flags & LOOKUP_CREATE) {
@@ -744,38 +726,37 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/nfs/nfs4proc.c RH_2_6_9_42_0_3/fs/nfs/nfs4pro
put_rpccred(cred);
if (IS_ERR(state))
return (struct inode *)state;
-diff -urNp RH_2_6_9_42_0_3.orig/fs/open.c RH_2_6_9_42_0_3/fs/open.c
---- RH_2_6_9_42_0_3.orig/fs/open.c 2006-10-23 13:33:09.000000000 +0300
-+++ RH_2_6_9_42_0_3/fs/open.c 2007-01-29 17:47:35.000000000 +0200
-@@ -192,9 +192,10 @@ out:
- return error;
- }
-
--int do_truncate(struct dentry *dentry, loff_t length)
-+int do_truncate(struct dentry *dentry, loff_t length, int called_from_open)
+diff -rup RH_2_6_9_55.orig/fs/open.c RH_2_6_9_55/fs/open.c
+--- RH_2_6_9_55.orig/fs/open.c
++++ RH_2_6_9_55/fs/open.c
+@@ -195,6 +195,7 @@ out:
+ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs)
{
int err;
+ struct inode_operations *op = dentry->d_inode->i_op;
struct iattr newattrs;
/* Not pretty: "inode->i_size" shouldn't really be signed. But it is. */
-@@ -205,7 +206,14 @@ int do_truncate(struct dentry *dentry, l
- newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME;
+@@ -204,8 +205,16 @@ int do_truncate(struct dentry *dentry, l
+ newattrs.ia_size = length;
+ newattrs.ia_valid = ATTR_SIZE | time_attrs;
down(&dentry->d_inode->i_sem);
- down_write(&dentry->d_inode->i_alloc_sem);
- err = notify_change(dentry, &newattrs);
-+ if (called_from_open)
-+ newattrs.ia_valid |= ATTR_FROM_OPEN;
+- up(&dentry->d_inode->i_sem);
+ if (op->setattr_raw) {
+ newattrs.ia_valid |= ATTR_RAW;
+ newattrs.ia_ctime = CURRENT_TIME;
++ down_write(&dentry->d_inode->i_alloc_sem);
+ err = op->setattr_raw(dentry->d_inode, &newattrs);
++ up_write(&dentry->d_inode->i_alloc_sem);
+ } else
+ err = notify_change(dentry, &newattrs);
- up_write(&dentry->d_inode->i_alloc_sem);
- up(&dentry->d_inode->i_sem);
++ up(&dentry->d_inode->i_sem);
++
return err;
-@@ -216,12 +224,13 @@ static inline long do_sys_truncate(const
+ }
+
+@@ -214,12 +223,13 @@ static inline long do_sys_truncate(const
struct nameidata nd;
struct inode * inode;
int error;
@@ -792,25 +773,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/open.c RH_2_6_9_42_0_3/fs/open.c
if (error)
goto out;
inode = nd.dentry->d_inode;
-@@ -261,7 +270,7 @@ static inline long do_sys_truncate(const
- error = locks_verify_truncate(inode, NULL, length);
- if (!error) {
- DQUOT_INIT(inode);
-- error = do_truncate(nd.dentry, length);
-+ error = do_truncate(nd.dentry, length, 0);
- }
- put_write_access(inode);
-
-@@ -313,7 +322,7 @@ static inline long do_sys_ftruncate(unsi
-
- error = locks_verify_truncate(inode, file, length);
- if (!error)
-- error = do_truncate(dentry, length);
-+ error = do_truncate(dentry, length, 0);
- out_putf:
- fput(file);
- out:
-@@ -392,9 +401,19 @@ asmlinkage long sys_utime(char __user *
+@@ -390,9 +400,19 @@ asmlinkage long sys_utime(char __user *
(error = permission(inode,MAY_WRITE,&nd)) != 0)
goto dput_and_out;
}
@@ -833,7 +796,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/open.c RH_2_6_9_42_0_3/fs/open.c
dput_and_out:
path_release(&nd);
out:
-@@ -445,9 +464,19 @@ long do_utimes(char __user * filename, s
+@@ -443,9 +463,19 @@ long do_utimes(char __user * filename, s
(error = permission(inode,MAY_WRITE,&nd)) != 0)
goto dput_and_out;
}
@@ -856,7 +819,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/open.c RH_2_6_9_42_0_3/fs/open.c
dput_and_out:
path_release(&nd);
out:
-@@ -475,6 +504,7 @@ asmlinkage long sys_access(const char __
+@@ -473,6 +503,7 @@ asmlinkage long sys_access(const char __
int old_fsuid, old_fsgid;
kernel_cap_t old_cap;
int res;
@@ -864,7 +827,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/open.c RH_2_6_9_42_0_3/fs/open.c
if (mode & ~S_IRWXO) /* where's F_OK, X_OK, W_OK, R_OK? */
return -EINVAL;
-@@ -499,13 +529,14 @@ asmlinkage long sys_access(const char __
+@@ -497,13 +528,14 @@ asmlinkage long sys_access(const char __
else
current->cap_effective = current->cap_permitted;
@@ -880,7 +843,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/open.c RH_2_6_9_42_0_3/fs/open.c
path_release(&nd);
}
-@@ -520,8 +551,9 @@ asmlinkage long sys_chdir(const char __u
+@@ -518,8 +550,9 @@ asmlinkage long sys_chdir(const char __u
{
struct nameidata nd;
int error;
@@ -891,7 +854,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/open.c RH_2_6_9_42_0_3/fs/open.c
if (error)
goto out;
-@@ -573,8 +605,9 @@ asmlinkage long sys_chroot(const char __
+@@ -571,8 +604,9 @@ asmlinkage long sys_chroot(const char __
{
struct nameidata nd;
int error;
@@ -902,7 +865,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/open.c RH_2_6_9_42_0_3/fs/open.c
if (error)
goto out;
-@@ -597,36 +630,52 @@ out:
+@@ -595,36 +629,52 @@ out:
EXPORT_SYMBOL_GPL(sys_chroot);
@@ -971,7 +934,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/open.c RH_2_6_9_42_0_3/fs/open.c
fput(file);
out:
return err;
-@@ -635,32 +684,13 @@ out:
+@@ -633,32 +683,13 @@ out:
asmlinkage long sys_chmod(const char __user * filename, mode_t mode)
{
struct nameidata nd;
@@ -983,7 +946,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/open.c RH_2_6_9_42_0_3/fs/open.c
if (error)
goto out;
- inode = nd.dentry->d_inode;
--
+
- error = -EROFS;
- if (IS_RDONLY(inode))
- goto dput_and_out;
@@ -991,7 +954,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/open.c RH_2_6_9_42_0_3/fs/open.c
- error = -EPERM;
- if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
- goto dput_and_out;
-
+-
- down(&inode->i_sem);
- if (mode == (mode_t) -1)
- mode = inode->i_mode;
@@ -1005,7 +968,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/open.c RH_2_6_9_42_0_3/fs/open.c
path_release(&nd);
out:
return error;
-@@ -681,6 +711,18 @@ static int chown_common(struct dentry *
+@@ -679,6 +710,18 @@ static int chown_common(struct dentry *
if (IS_RDONLY(inode))
goto out;
error = -EPERM;
@@ -1024,7 +987,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/open.c RH_2_6_9_42_0_3/fs/open.c
if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
goto out;
newattrs.ia_valid = ATTR_CTIME;
-@@ -694,6 +736,7 @@ static int chown_common(struct dentry *
+@@ -692,6 +735,7 @@ static int chown_common(struct dentry *
}
if (!S_ISDIR(inode->i_mode))
newattrs.ia_valid |= ATTR_KILL_SUID|ATTR_KILL_SGID;
@@ -1032,7 +995,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/open.c RH_2_6_9_42_0_3/fs/open.c
down(&inode->i_sem);
error = notify_change(dentry, &newattrs);
up(&inode->i_sem);
-@@ -741,8 +784,6 @@ asmlinkage long sys_fchown(unsigned int
+@@ -739,8 +783,6 @@ asmlinkage long sys_fchown(unsigned int
return error;
}
@@ -1041,7 +1004,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/open.c RH_2_6_9_42_0_3/fs/open.c
/*
* Note that while the flag value (low two bits) for sys_open means:
* 00 - read-only
-@@ -760,8 +801,9 @@ static struct file *__dentry_open(struct
+@@ -758,8 +800,9 @@ static struct file *__dentry_open(struct
struct file *filp_open(const char * filename, int flags, int mode)
{
int namei_flags, error;
@@ -1052,7 +1015,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/open.c RH_2_6_9_42_0_3/fs/open.c
namei_flags = flags;
if ((namei_flags+1) & O_ACCMODE)
-@@ -769,16 +811,11 @@ struct file *filp_open(const char * file
+@@ -767,16 +810,11 @@ struct file *filp_open(const char * file
if (namei_flags & O_TRUNC)
namei_flags |= 2;
@@ -1073,7 +1036,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/open.c RH_2_6_9_42_0_3/fs/open.c
return ERR_PTR(error);
}
-@@ -786,29 +823,27 @@ EXPORT_SYMBOL(filp_open);
+@@ -784,29 +822,27 @@ EXPORT_SYMBOL(filp_open);
struct file *dentry_open(struct dentry *dentry, struct vfsmount *mnt, int flags)
{
@@ -1113,7 +1076,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/open.c RH_2_6_9_42_0_3/fs/open.c
inode = dentry->d_inode;
if (f->f_mode & FMODE_WRITE) {
error = get_write_access(inode);
-@@ -827,6 +862,7 @@ static struct file *__dentry_open(struct
+@@ -825,6 +861,7 @@ static struct file *__dentry_open(struct
error = f->f_op->open(inode,f);
if (error)
goto cleanup_all;
@@ -1121,7 +1084,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/open.c RH_2_6_9_42_0_3/fs/open.c
}
f->f_flags &= ~(O_CREAT | O_EXCL | O_NOCTTY | O_TRUNC);
-@@ -851,6 +887,8 @@ cleanup_all:
+@@ -849,6 +886,8 @@ cleanup_all:
f->f_vfsmnt = NULL;
cleanup_file:
put_filp(f);
@@ -1130,9 +1093,9 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/open.c RH_2_6_9_42_0_3/fs/open.c
dput(dentry);
mntput(mnt);
return ERR_PTR(error);
-diff -urNp RH_2_6_9_42_0_3.orig/fs/stat.c RH_2_6_9_42_0_3/fs/stat.c
---- RH_2_6_9_42_0_3.orig/fs/stat.c 2004-10-19 00:53:37.000000000 +0300
-+++ RH_2_6_9_42_0_3/fs/stat.c 2007-01-29 17:47:35.000000000 +0200
+diff -rup RH_2_6_9_55.orig/fs/stat.c RH_2_6_9_55/fs/stat.c
+--- RH_2_6_9_55.orig/fs/stat.c
++++ RH_2_6_9_55/fs/stat.c
@@ -37,7 +37,7 @@ void generic_fillattr(struct inode *inod
EXPORT_SYMBOL(generic_fillattr);
@@ -1151,14 +1114,45 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/stat.c RH_2_6_9_42_0_3/fs/stat.c
if (inode->i_op->getattr)
return inode->i_op->getattr(mnt, dentry, stat);
-@@ -62,14 +64,20 @@ int vfs_getattr(struct vfsmount *mnt, st
+@@ -62,7 +64,7 @@ int vfs_getattr(struct vfsmount *mnt, st
EXPORT_SYMBOL(vfs_getattr);
+-int vfs_getattr64(struct vfsmount *mnt, struct dentry *dentry, struct kstat64 *stat)
++int vfs_getattr64_it(struct vfsmount *mnt, struct dentry *dentry, struct lookup_intent *it, struct kstat64 *stat)
+ {
+ struct inode *inode = dentry->d_inode;
+ int retval;
+@@ -79,6 +81,13 @@ int vfs_getattr64(struct vfsmount *mnt,
+ return ixop->getattr64(mnt, dentry, stat);
+ }
+
++ if (inode->i_op->getattr_it) {
++ retval = inode->i_op->getattr_it(mnt, dentry, it, (struct kstat *) stat);
++ if (retval == 0)
++ stat->ino64 = stat->ino;
++ return retval;
++ }
++
+ if (inode->i_op->getattr) {
+ retval = inode->i_op->getattr(mnt, dentry, (struct kstat *) stat);
+ if (retval == 0)
+@@ -98,16 +107,28 @@ int vfs_getattr64(struct vfsmount *mnt,
+ return 0;
+ }
+
++
+ EXPORT_SYMBOL(vfs_getattr64);
+
+int vfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
+{
+ return vfs_getattr_it(mnt, dentry, NULL, stat);
+}
++
++int vfs_getattr64(struct vfsmount *mnt, struct dentry *dentry, struct kstat64 *stat)
++{
++ return vfs_getattr64_it(mnt, dentry, NULL, stat);
++}
+
int vfs_stat(char __user *name, struct kstat *stat)
{
@@ -1174,7 +1168,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/stat.c RH_2_6_9_42_0_3/fs/stat.c
path_release(&nd);
}
return error;
-@@ -81,10 +89,11 @@ int vfs_lstat(char __user *name, struct
+@@ -119,10 +140,11 @@ int vfs_lstat(char __user *name, struct
{
struct nameidata nd;
int error;
@@ -1188,7 +1182,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/stat.c RH_2_6_9_42_0_3/fs/stat.c
path_release(&nd);
}
return error;
-@@ -96,9 +105,12 @@ int vfs_fstat(unsigned int fd, struct ks
+@@ -134,9 +156,12 @@ int vfs_fstat(unsigned int fd, struct ks
{
struct file *f = fget(fd);
int error = -EBADF;
@@ -1202,9 +1196,48 @@ diff -urNp RH_2_6_9_42_0_3.orig/fs/stat.c RH_2_6_9_42_0_3/fs/stat.c
fput(f);
}
return error;
-diff -urNp RH_2_6_9_42_0_3.orig/include/linux/dcache.h RH_2_6_9_42_0_3/include/linux/dcache.h
---- RH_2_6_9_42_0_3.orig/include/linux/dcache.h 2006-10-23 13:33:00.000000000 +0300
-+++ RH_2_6_9_42_0_3/include/linux/dcache.h 2007-01-29 17:47:35.000000000 +0200
+@@ -148,10 +173,11 @@ int vfs_stat64(char __user *name, struct
+ {
+ struct nameidata nd;
+ int error;
++ intent_init(&nd.intent, IT_GETATTR);
+
+ error = user_path_walk(name, &nd);
+ if (!error) {
+- error = vfs_getattr64(nd.mnt, nd.dentry, stat);
++ error = vfs_getattr64_it(nd.mnt, nd.dentry, &nd.intent, stat);
+ path_release(&nd);
+ }
+ return error;
+@@ -163,10 +189,11 @@ int vfs_lstat64(char __user *name, struc
+ {
+ struct nameidata nd;
+ int error;
++ intent_init(&nd.intent, IT_GETATTR);
+
+ error = user_path_walk_link(name, &nd);
+ if (!error) {
+- error = vfs_getattr64(nd.mnt, nd.dentry, stat);
++ error = vfs_getattr64_it(nd.mnt, nd.dentry, &nd.intent, stat);
+ path_release(&nd);
+ }
+ return error;
+@@ -178,9 +205,11 @@ int vfs_fstat64(unsigned int fd, struct
+ {
+ struct file *f = fget(fd);
+ int error = -EBADF;
++ struct nameidata nd;
++ intent_init(&nd.intent, IT_GETATTR);
+
+ if (f) {
+- error = vfs_getattr64(f->f_vfsmnt, f->f_dentry, stat);
++ error = vfs_getattr64_it(f->f_vfsmnt, f->f_dentry, &nd.intent, stat);
+ fput(f);
+ }
+ return error;
+diff -rup RH_2_6_9_55.orig/include/linux/dcache.h RH_2_6_9_55/include/linux/dcache.h
+--- RH_2_6_9_55.orig/include/linux/dcache.h
++++ RH_2_6_9_55/include/linux/dcache.h
@@ -4,6 +4,7 @@
#ifdef __KERNEL__
@@ -1222,18 +1255,10 @@ diff -urNp RH_2_6_9_42_0_3.orig/include/linux/dcache.h RH_2_6_9_42_0_3/include/l
struct dentry_stat_t {
int nr_dentry;
int nr_unused;
-diff -urNp RH_2_6_9_42_0_3.orig/include/linux/fs.h RH_2_6_9_42_0_3/include/linux/fs.h
---- RH_2_6_9_42_0_3.orig/include/linux/fs.h 2006-10-23 13:33:09.000000000 +0300
-+++ RH_2_6_9_42_0_3/include/linux/fs.h 2007-01-29 17:47:35.000000000 +0200
-@@ -75,6 +75,7 @@ extern int leases_enable, dir_notify_ena
-
- #define FMODE_READ 1
- #define FMODE_WRITE 2
-+#define FMODE_EXEC 4
-
- /* Internal kernel extensions */
- #define FMODE_LSEEK 4
-@@ -259,6 +260,8 @@ typedef void (dio_iodone_t)(struct inode
+diff -rup RH_2_6_9_55.orig/include/linux/fs.h RH_2_6_9_55/include/linux/fs.h
+--- RH_2_6_9_55.orig/include/linux/fs.h
++++ RH_2_6_9_55/include/linux/fs.h
+@@ -266,6 +266,8 @@ typedef void (dio_iodone_t)(struct inode
#define ATTR_ATTR_FLAG 1024
#define ATTR_KILL_SUID 2048
#define ATTR_KILL_SGID 4096
@@ -1242,7 +1267,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/include/linux/fs.h RH_2_6_9_42_0_3/include/linux
/*
* This is the Inode Attributes structure, used for notify_change(). It
-@@ -457,6 +460,7 @@ struct inode {
+@@ -464,6 +466,7 @@ struct inode {
struct block_device *i_bdev;
struct cdev *i_cdev;
int i_cindex;
@@ -1250,7 +1275,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/include/linux/fs.h RH_2_6_9_42_0_3/include/linux
__u32 i_generation;
-@@ -590,6 +594,7 @@ struct file {
+@@ -597,6 +600,7 @@ struct file {
spinlock_t f_ep_lock;
#endif /* #ifdef CONFIG_EPOLL */
struct address_space *f_mapping;
@@ -1258,7 +1283,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/include/linux/fs.h RH_2_6_9_42_0_3/include/linux
};
extern spinlock_t files_lock;
#define file_list_lock() spin_lock(&files_lock);
-@@ -949,20 +954,29 @@ struct inode_operations {
+@@ -967,20 +971,29 @@ struct inode_operations {
int (*create) (struct inode *,struct dentry *,int, struct nameidata *);
struct dentry * (*lookup) (struct inode *,struct dentry *, struct nameidata *);
int (*link) (struct dentry *,struct inode *,struct dentry *);
@@ -1288,7 +1313,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/include/linux/fs.h RH_2_6_9_42_0_3/include/linux
int (*setxattr) (struct dentry *, const char *,const void *,size_t,int);
ssize_t (*getxattr) (struct dentry *, const char *, void *, size_t);
ssize_t (*listxattr) (struct dentry *, char *, size_t);
-@@ -1002,6 +1016,7 @@ struct super_operations {
+@@ -1025,6 +1038,7 @@ struct super_operations {
int (*remount_fs) (struct super_block *, int *, char *);
void (*clear_inode) (struct inode *);
void (*umount_begin) (struct super_block *);
@@ -1296,7 +1321,7 @@ diff -urNp RH_2_6_9_42_0_3.orig/include/linux/fs.h RH_2_6_9_42_0_3/include/linux
int (*show_options)(struct seq_file *, struct vfsmount *);
};
-@@ -1194,6 +1209,7 @@ extern int unregister_filesystem(struct
+@@ -1217,6 +1231,7 @@ extern int unregister_filesystem(struct
extern struct vfsmount *kern_mount(struct file_system_type *);
extern int may_umount_tree(struct vfsmount *);
extern int may_umount(struct vfsmount *);
@@ -1304,21 +1329,21 @@ diff -urNp RH_2_6_9_42_0_3.orig/include/linux/fs.h RH_2_6_9_42_0_3/include/linux
extern long do_mount(char *, char *, char *, unsigned long, void *);
extern int vfs_statfs(struct super_block *, struct kstatfs *);
-@@ -1255,9 +1271,10 @@ static inline int break_lease(struct ino
+@@ -1277,10 +1292,10 @@ static inline int break_lease(struct ino
+ }
/* fs/open.c */
-
--extern int do_truncate(struct dentry *, loff_t start);
-+extern int do_truncate(struct dentry *, loff_t start, int called_from_open);
+-
+ extern int do_truncate(struct dentry *, loff_t start, unsigned int);
extern struct file *filp_open(const char *, int, int);
extern struct file * dentry_open(struct dentry *, struct vfsmount *, int);
+extern struct file * dentry_open_it(struct dentry *, struct vfsmount *, int, struct lookup_intent *);
extern int filp_close(struct file *, fl_owner_t id);
extern char * getname(const char __user *);
-diff -urNp RH_2_6_9_42_0_3.orig/include/linux/mount.h RH_2_6_9_42_0_3/include/linux/mount.h
---- RH_2_6_9_42_0_3.orig/include/linux/mount.h 2004-10-19 00:53:11.000000000 +0300
-+++ RH_2_6_9_42_0_3/include/linux/mount.h 2007-01-29 17:47:35.000000000 +0200
+diff -rup RH_2_6_9_55.orig/include/linux/mount.h RH_2_6_9_55/include/linux/mount.h
+--- RH_2_6_9_55.orig/include/linux/mount.h
++++ RH_2_6_9_55/include/linux/mount.h
@@ -34,6 +34,8 @@ struct vfsmount
struct list_head mnt_list;
struct list_head mnt_fslink; /* link in fs-specific expiry list */
@@ -1328,9 +1353,9 @@ diff -urNp RH_2_6_9_42_0_3.orig/include/linux/mount.h RH_2_6_9_42_0_3/include/li
};
static inline struct vfsmount *mntget(struct vfsmount *mnt)
-diff -urNp RH_2_6_9_42_0_3.orig/include/linux/namei.h RH_2_6_9_42_0_3/include/linux/namei.h
---- RH_2_6_9_42_0_3.orig/include/linux/namei.h 2006-10-23 13:33:09.000000000 +0300
-+++ RH_2_6_9_42_0_3/include/linux/namei.h 2007-01-29 17:47:47.000000000 +0200
+diff -rup RH_2_6_9_55.orig/include/linux/namei.h RH_2_6_9_55/include/linux/namei.h
+--- RH_2_6_9_55.orig/include/linux/namei.h
++++ RH_2_6_9_55/include/linux/namei.h
@@ -2,14 +2,55 @@
#define _LINUX_NAMEI_H
diff --git a/lustre/kernel_patches/patches/vfs_races-2.6-rhel4.patch b/lustre/kernel_patches/patches/vfs_races-2.6-rhel4.patch
index ccca64d0e238dfe839a7bee09a2fa9c02a1ef063..3632a41b3f4300c712ac7ed6def2be7a1a08ecd2 100644
--- a/lustre/kernel_patches/patches/vfs_races-2.6-rhel4.patch
+++ b/lustre/kernel_patches/patches/vfs_races-2.6-rhel4.patch
@@ -1,8 +1,7 @@
-Index: linux-2.6.7-vanilla/fs/dcache.c
-===================================================================
---- linux-2.6.7-vanilla.orig/fs/dcache.c 2004-07-01 12:09:19.000000000 +0300
-+++ linux-2.6.7-vanilla/fs/dcache.c 2004-07-01 12:29:12.510193264 +0300
-@@ -219,7 +219,14 @@
+diff -urp RH_2_6_9_42_0_3.orig/fs/dcache.c RH_2_6_9_42_0_3/fs/dcache.c
+--- RH_2_6_9_42_0_3.orig/fs/dcache.c
++++ RH_2_6_9_42_0_3/fs/dcache.c
+@@ -229,7 +229,14 @@ int d_invalidate(struct dentry * dentry)
spin_unlock(&dcache_lock);
return 0;
}
@@ -18,7 +17,7 @@ Index: linux-2.6.7-vanilla/fs/dcache.c
* Check whether to do a partial shrink_dcache
* to get rid of unused child entries.
*/
-@@ -1114,19 +1121,28 @@
+@@ -1187,19 +1194,28 @@ void d_delete(struct dentry * dentry)
* Adds a dentry to the hash according to its name.
*/
@@ -50,11 +49,10 @@ Index: linux-2.6.7-vanilla/fs/dcache.c
#define do_switch(x,y) do { \
__typeof__ (x) __tmp = x; \
x = y; y = __tmp; } while (0)
-Index: linux-2.6.7-vanilla/include/linux/dcache.h
-===================================================================
---- linux-2.6.7-vanilla.orig/include/linux/dcache.h 2004-07-01 12:24:53.602553208 +0300
-+++ linux-2.6.7-vanilla/include/linux/dcache.h 2004-07-01 12:27:29.757814000 +0300
-@@ -159,6 +159,8 @@
+diff -urp RH_2_6_9_42_0_3.orig/include/linux/dcache.h RH_2_6_9_42_0_3/include/linux/dcache.h
+--- RH_2_6_9_42_0_3.orig/include/linux/dcache.h
++++ RH_2_6_9_42_0_3/include/linux/dcache.h
+@@ -157,6 +157,8 @@ d_iput: no no no yes
#define DCACHE_REFERENCED 0x0008 /* Recently used, don't discard. */
#define DCACHE_UNHASHED 0x0010
diff --git a/lustre/kernel_patches/series/2.6-rhel4-titech.series b/lustre/kernel_patches/series/2.6-rhel4-titech.series
index 8771efdbd73acf1748f14eca0c82d66c4844ed30..59133ac3c87bb3394b217d31ca2a85592a87cc96 100644
--- a/lustre/kernel_patches/series/2.6-rhel4-titech.series
+++ b/lustre/kernel_patches/series/2.6-rhel4-titech.series
@@ -2,7 +2,6 @@ lustre_version.patch
vfs_intent-2.6-rhel4.patch
vfs_races-2.6-rhel4.patch
iopen-misc-2.6-suse.patch
-export-truncate-2.6-suse.patch
export_symbols-2.6-rhel4.patch
dev_read_only-2.6-suse.patch
export-log-2.6-rhel4.patch
@@ -17,7 +16,6 @@ qsnet-rhel4-2.6.patch
linux-2.6-binutils-2.16.patch
vm-tunables-rhel4.patch
tcp-rto_proc-2.6.9.patch
-iallocsem_consistency.patch
raid5-stats.patch
raid5-configurable-cachesize.patch
raid5-large-io.patch
diff --git a/lustre/kernel_patches/series/2.6-rhel4.series b/lustre/kernel_patches/series/2.6-rhel4.series
index 6de7649de233351f5ced123eb2f74547f0c337cc..67ac232a168c745748166e616bbf8148e4e206fb 100644
--- a/lustre/kernel_patches/series/2.6-rhel4.series
+++ b/lustre/kernel_patches/series/2.6-rhel4.series
@@ -2,7 +2,6 @@ lustre_version.patch
vfs_intent-2.6-rhel4.patch
vfs_races-2.6-rhel4.patch
iopen-misc-2.6-suse.patch
-export-truncate-2.6-suse.patch
export_symbols-2.6-rhel4.patch
dev_read_only-2.6-suse.patch
export-log-2.6-rhel4.patch
@@ -17,7 +16,6 @@ qsnet-rhel4-2.6.patch
linux-2.6-binutils-2.16.patch
vm-tunables-rhel4.patch
tcp-rto_proc-2.6.9.patch
-iallocsem_consistency.patch
raid5-stats.patch
raid5-configurable-cachesize.patch
raid5-large-io.patch