From 42fb96c4d9d0d83cae0088bf68abbd6f9d1fbde1 Mon Sep 17 00:00:00 2001 From: jacob Date: Fri, 29 Jul 2005 23:54:55 +0000 Subject: [PATCH] update patches and scripts for SLES 9 SP2 --- .../patches/ext3-mballoc2-2.6-suse.patch | 92 +- .../kernel-2.6.5-2.6-suse-i686-bigsmp.config | 87 +- .../kernel-2.6.5-2.6-suse-i686-smp.config | 64 +- .../kernel-2.6.5-2.6-suse-i686.config | 87 +- .../kernel-2.6.5-2.6-suse-ia64-smp.config | 64 +- .../kernel-2.6.5-2.6-suse-ia64.config | 64 +- .../kernel-2.6.5-2.6-suse-x86_64-smp.config | 100 +- .../kernel-2.6.5-2.6-suse-x86_64.config | 100 +- .../patches/ext3-mballoc2-2.6-suse.patch | 92 +- lustre/kernel_patches/patches/qsnet-suse-2.6.patch | 1726 ++++++++++---------- lustre/kernel_patches/series/2.6-suse-newer.series | 8 - lustre/kernel_patches/targets/2.6-suse.target.in | 4 +- 12 files changed, 1187 insertions(+), 1301 deletions(-) diff --git a/ldiskfs/kernel_patches/patches/ext3-mballoc2-2.6-suse.patch b/ldiskfs/kernel_patches/patches/ext3-mballoc2-2.6-suse.patch index d38fb54..107de00 100644 --- a/ldiskfs/kernel_patches/patches/ext3-mballoc2-2.6-suse.patch +++ b/ldiskfs/kernel_patches/patches/ext3-mballoc2-2.6-suse.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.5-suse/fs/ext3/mballoc.c +Index: linux-stage/fs/ext3/mballoc.c =================================================================== ---- linux-2.6.5-suse.orig/fs/ext3/mballoc.c 2005-03-02 22:42:20.659360368 +0300 -+++ linux-2.6.5-suse/fs/ext3/mballoc.c 2005-03-11 16:13:13.000000000 +0300 +--- linux-stage.orig/fs/ext3/mballoc.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-stage/fs/ext3/mballoc.c 2005-07-28 16:10:14.951971768 -0400 @@ -0,0 +1,1864 @@ +/* + * Copyright(c) 2003, 2004, 2005, Cluster File Systems, Inc, info@clusterfs.com @@ -1867,10 +1867,10 @@ Index: linux-2.6.5-suse/fs/ext3/mballoc.c + return; +} + -Index: linux-2.6.5-suse/fs/ext3/super.c +Index: linux-stage/fs/ext3/super.c =================================================================== ---- linux-2.6.5-suse.orig/fs/ext3/super.c 2005-02-26 18:40:25.000000000 +0300 -+++ linux-2.6.5-suse/fs/ext3/super.c 2005-02-26 18:40:26.000000000 +0300 +--- linux-stage.orig/fs/ext3/super.c 2005-07-28 16:09:49.624822080 -0400 ++++ linux-stage/fs/ext3/super.c 2005-07-28 16:10:14.952971616 -0400 @@ -389,6 +389,7 @@ struct ext3_super_block *es = sbi->s_es; int i; @@ -1921,10 +1921,10 @@ Index: linux-2.6.5-suse/fs/ext3/super.c return 0; -Index: linux-2.6.5-suse/fs/ext3/Makefile +Index: linux-stage/fs/ext3/Makefile =================================================================== ---- linux-2.6.5-suse.orig/fs/ext3/Makefile 2005-02-26 18:40:25.000000000 +0300 -+++ linux-2.6.5-suse/fs/ext3/Makefile 2005-02-26 18:40:26.000000000 +0300 +--- linux-stage.orig/fs/ext3/Makefile 2005-07-28 16:09:49.623822232 -0400 ++++ linux-stage/fs/ext3/Makefile 2005-07-28 16:10:14.953971464 -0400 @@ -5,7 +5,7 @@ obj-$(CONFIG_EXT3_FS) += ext3.o @@ -1934,10 +1934,10 @@ Index: linux-2.6.5-suse/fs/ext3/Makefile ext3-$(CONFIG_EXT3_FS_XATTR) += xattr.o xattr_user.o xattr_trusted.o ext3-$(CONFIG_EXT3_FS_POSIX_ACL) += acl.o -Index: linux-2.6.5-suse/fs/ext3/balloc.c +Index: linux-stage/fs/ext3/balloc.c =================================================================== ---- linux-2.6.5-suse.orig/fs/ext3/balloc.c 2005-02-02 00:55:47.000000000 +0300 -+++ linux-2.6.5-suse/fs/ext3/balloc.c 2005-02-26 18:40:26.000000000 +0300 +--- linux-stage.orig/fs/ext3/balloc.c 2005-07-28 16:09:46.411310608 -0400 ++++ linux-stage/fs/ext3/balloc.c 2005-07-28 16:10:14.954971312 -0400 @@ -78,7 +78,7 @@ * * Return buffer_head on success or NULL in case of failure. @@ -1965,10 +1965,10 @@ Index: linux-2.6.5-suse/fs/ext3/balloc.c unsigned long goal, int *errp) { struct buffer_head *bitmap_bh = NULL; -Index: linux-2.6.5-suse/fs/ext3/namei.c +Index: linux-stage/fs/ext3/namei.c =================================================================== ---- linux-2.6.5-suse.orig/fs/ext3/namei.c 2005-02-26 18:40:19.000000000 +0300 -+++ linux-2.6.5-suse/fs/ext3/namei.c 2005-02-26 18:40:26.000000000 +0300 +--- linux-stage.orig/fs/ext3/namei.c 2005-07-28 16:09:48.092055096 -0400 ++++ linux-stage/fs/ext3/namei.c 2005-07-28 16:10:14.955971160 -0400 @@ -1640,7 +1640,7 @@ * If the create succeeds, we fill in the inode information * with d_instantiate(). @@ -1978,10 +1978,10 @@ Index: linux-2.6.5-suse/fs/ext3/namei.c struct nameidata *nd) { handle_t *handle; -Index: linux-2.6.5-suse/fs/ext3/inode.c +Index: linux-stage/fs/ext3/inode.c =================================================================== ---- linux-2.6.5-suse.orig/fs/ext3/inode.c 2005-02-26 18:40:25.000000000 +0300 -+++ linux-2.6.5-suse/fs/ext3/inode.c 2005-02-26 18:40:26.000000000 +0300 +--- linux-stage.orig/fs/ext3/inode.c 2005-07-28 16:09:49.622822384 -0400 ++++ linux-stage/fs/ext3/inode.c 2005-07-28 16:10:14.958970704 -0400 @@ -572,7 +572,7 @@ ext3_journal_forget(handle, branch[i].bh); } @@ -2000,7 +2000,7 @@ Index: linux-2.6.5-suse/fs/ext3/inode.c return err; } -@@ -1830,7 +1830,7 @@ +@@ -1835,7 +1835,7 @@ } } @@ -2009,7 +2009,7 @@ Index: linux-2.6.5-suse/fs/ext3/inode.c } /** -@@ -2001,7 +2001,7 @@ +@@ -2006,7 +2006,7 @@ ext3_journal_test_restart(handle, inode); } @@ -2018,11 +2018,11 @@ Index: linux-2.6.5-suse/fs/ext3/inode.c if (parent_bh) { /* -Index: linux-2.6.5-suse/fs/ext3/extents.c +Index: linux-stage/fs/ext3/extents.c =================================================================== ---- linux-2.6.5-suse.orig/fs/ext3/extents.c 2005-02-26 18:40:25.000000000 +0300 -+++ linux-2.6.5-suse/fs/ext3/extents.c 2005-02-26 18:40:26.000000000 +0300 -@@ -774,7 +774,7 @@ +--- linux-stage.orig/fs/ext3/extents.c 2005-07-28 16:09:49.619822840 -0400 ++++ linux-stage/fs/ext3/extents.c 2005-07-28 16:10:14.960970400 -0400 +@@ -771,7 +771,7 @@ for (i = 0; i < depth; i++) { if (!ablocks[i]) continue; @@ -2031,8 +2031,8 @@ Index: linux-2.6.5-suse/fs/ext3/extents.c } } kfree(ablocks); -@@ -1431,7 +1431,7 @@ - path->p_idx->ei_leaf); +@@ -1428,7 +1428,7 @@ + path->p_idx->ei_leaf); bh = sb_find_get_block(tree->inode->i_sb, path->p_idx->ei_leaf); ext3_forget(handle, 1, tree->inode, bh, path->p_idx->ei_leaf); - ext3_free_blocks(handle, tree->inode, path->p_idx->ei_leaf, 1); @@ -2040,7 +2040,7 @@ Index: linux-2.6.5-suse/fs/ext3/extents.c return err; } -@@ -1919,10 +1919,12 @@ +@@ -1913,10 +1913,12 @@ int needed = ext3_remove_blocks_credits(tree, ex, from, to); handle_t *handle = ext3_journal_start(tree->inode, needed); struct buffer_head *bh; @@ -2054,7 +2054,7 @@ Index: linux-2.6.5-suse/fs/ext3/extents.c if (from >= ex->ee_block && to == ex->ee_block + ex->ee_len - 1) { /* tail removal */ unsigned long num, start; -@@ -1934,7 +1936,7 @@ +@@ -1928,7 +1930,7 @@ bh = sb_find_get_block(tree->inode->i_sb, start + i); ext3_forget(handle, 0, tree->inode, bh, start + i); } @@ -2062,12 +2062,12 @@ Index: linux-2.6.5-suse/fs/ext3/extents.c + ext3_free_blocks(handle, tree->inode, start, num, metadata); } else if (from == ex->ee_block && to <= ex->ee_block + ex->ee_len - 1) { printk("strange request: removal %lu-%lu from %u:%u\n", - from, to, ex->ee_block, ex->ee_len); -Index: linux-2.6.5-suse/fs/ext3/xattr.c + from, to, ex->ee_block, ex->ee_len); +Index: linux-stage/fs/ext3/xattr.c =================================================================== ---- linux-2.6.5-suse.orig/fs/ext3/xattr.c 2005-02-26 18:40:22.000000000 +0300 -+++ linux-2.6.5-suse/fs/ext3/xattr.c 2005-02-26 18:40:26.000000000 +0300 -@@ -1366,7 +1366,7 @@ +--- linux-stage.orig/fs/ext3/xattr.c 2005-07-28 16:09:48.855938968 -0400 ++++ linux-stage/fs/ext3/xattr.c 2005-07-28 16:10:43.588618336 -0400 +@@ -1371,7 +1371,7 @@ new_bh = sb_getblk(sb, block); if (!new_bh) { getblk_failed: @@ -2076,7 +2076,7 @@ Index: linux-2.6.5-suse/fs/ext3/xattr.c error = -EIO; goto cleanup; } -@@ -1408,7 +1408,7 @@ +@@ -1411,7 +1411,7 @@ if (HDR(old_bh)->h_refcount == cpu_to_le32(1)) { /* Free the old block. */ ea_bdebug(old_bh, "freeing"); @@ -2085,19 +2085,19 @@ Index: linux-2.6.5-suse/fs/ext3/xattr.c /* ext3_forget() calls bforget() for us, but we let our caller release old_bh, so we need to -@@ -1504,7 +1504,7 @@ - lock_buffer(bh); - if (HDR(bh)->h_refcount == cpu_to_le32(1)) { - ext3_xattr_cache_remove(bh); +@@ -1519,7 +1519,7 @@ + mb_cache_entry_free(ce); + ce = NULL; + } - ext3_free_blocks(handle, inode, EXT3_I(inode)->i_file_acl, 1); + ext3_free_blocks(handle, inode, EXT3_I(inode)->i_file_acl, 1, 1); get_bh(bh); ext3_forget(handle, 1, inode, bh, EXT3_I(inode)->i_file_acl); } else { -Index: linux-2.6.5-suse/include/linux/ext3_fs.h +Index: linux-stage/include/linux/ext3_fs.h =================================================================== ---- linux-2.6.5-suse.orig/include/linux/ext3_fs.h 2005-02-26 18:40:25.000000000 +0300 -+++ linux-2.6.5-suse/include/linux/ext3_fs.h 2005-02-26 18:40:26.000000000 +0300 +--- linux-stage.orig/include/linux/ext3_fs.h 2005-07-28 16:09:49.626821776 -0400 ++++ linux-stage/include/linux/ext3_fs.h 2005-07-28 16:10:14.962970096 -0400 @@ -57,6 +57,14 @@ #define ext3_debug(f, a...) do {} while (0) #endif @@ -2121,7 +2121,7 @@ Index: linux-2.6.5-suse/include/linux/ext3_fs.h /* Compatibility, for having both ext2_fs.h and ext3_fs.h included at once */ #ifndef clear_opt -@@ -698,7 +707,7 @@ +@@ -700,7 +709,7 @@ extern unsigned long ext3_bg_num_gdb(struct super_block *sb, int group); extern int ext3_new_block (handle_t *, struct inode *, unsigned long, int *); extern void ext3_free_blocks (handle_t *, struct inode *, unsigned long, @@ -2130,7 +2130,7 @@ Index: linux-2.6.5-suse/include/linux/ext3_fs.h extern unsigned long ext3_count_free_blocks (struct super_block *); extern void ext3_check_blocks_bitmap (struct super_block *); extern struct ext3_group_desc * ext3_get_group_desc(struct super_block * sb, -@@ -820,6 +829,37 @@ +@@ -822,6 +831,37 @@ extern int ext3_ext_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg); @@ -2168,10 +2168,10 @@ Index: linux-2.6.5-suse/include/linux/ext3_fs.h #endif /* __KERNEL__ */ #define EXT3_IOC_CREATE_INUM _IOW('f', 5, long) -Index: linux-2.6.5-suse/include/linux/ext3_fs_sb.h +Index: linux-stage/include/linux/ext3_fs_sb.h =================================================================== ---- linux-2.6.5-suse.orig/include/linux/ext3_fs_sb.h 2005-02-26 18:40:20.000000000 +0300 -+++ linux-2.6.5-suse/include/linux/ext3_fs_sb.h 2005-02-26 18:40:26.000000000 +0300 +--- linux-stage.orig/include/linux/ext3_fs_sb.h 2005-07-28 16:09:48.346016488 -0400 ++++ linux-stage/include/linux/ext3_fs_sb.h 2005-07-28 16:10:14.963969944 -0400 @@ -23,10 +23,30 @@ #define EXT_INCLUDE #include diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-i686-bigsmp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-i686-bigsmp.config index beb776a..a84f323 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-i686-bigsmp.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-i686-bigsmp.config @@ -38,6 +38,7 @@ CONFIG_CKRM_TYPE_TASKCLASS=y CONFIG_CKRM_RES_NUMTASKS=m CONFIG_CKRM_CPU_SCHEDULE=y # CONFIG_CKRM_CPU_SCHEDULE_AT_BOOT is not set +CONFIG_CKRM_RES_BLKIO=y CONFIG_CKRM_TYPE_SOCKETCLASS=y CONFIG_CKRM_RBCE=m CONFIG_CKRM_CRBCE=m @@ -49,6 +50,7 @@ CONFIG_IOSCHED_NOOP=y CONFIG_IOSCHED_AS=y CONFIG_IOSCHED_DEADLINE=y CONFIG_IOSCHED_CFQ=y +CONFIG_IOSCHED_PS=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set # @@ -65,6 +67,7 @@ CONFIG_STOP_MACHINE=y # # Processor type and features # +CONFIG_MEM_MIRROR=y # CONFIG_X86_PC is not set # CONFIG_X86_ELAN is not set # CONFIG_X86_VOYAGER is not set @@ -144,16 +147,6 @@ CONFIG_BOOT_IOREMAP=y CONFIG_REGPARM=y # -# Performance-monitoring counters support -# -CONFIG_PERFCTR=y -CONFIG_KPERFCTR=y -# CONFIG_PERFCTR_DEBUG is not set -# CONFIG_PERFCTR_INIT_TESTS is not set -CONFIG_PERFCTR_VIRTUAL=y -CONFIG_PERFCTR_GLOBAL=y - -# # Special options # CONFIG_PROC_MM=y @@ -333,24 +326,16 @@ CONFIG_MTD_CFI_NOSWAP=y # CONFIG_MTD_CFI_BE_BYTE_SWAP is not set # CONFIG_MTD_CFI_LE_BYTE_SWAP is not set # CONFIG_MTD_CFI_GEOMETRY is not set -CONFIG_MTD_MAP_BANK_WIDTH_1=y -CONFIG_MTD_MAP_BANK_WIDTH_2=y -CONFIG_MTD_MAP_BANK_WIDTH_4=y -# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set -# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set -# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set -CONFIG_MTD_CFI_I1=y -CONFIG_MTD_CFI_I2=y -# CONFIG_MTD_CFI_I4 is not set -# CONFIG_MTD_CFI_I8 is not set CONFIG_MTD_CFI_INTELEXT=m CONFIG_MTD_CFI_AMDSTD=m -CONFIG_MTD_CFI_AMDSTD_RETRY=0 CONFIG_MTD_CFI_STAA=m -CONFIG_MTD_CFI_UTIL=m # CONFIG_MTD_RAM is not set # CONFIG_MTD_ROM is not set CONFIG_MTD_ABSENT=m +CONFIG_MTD_OBSOLETE_CHIPS=y +CONFIG_MTD_AMDSTD=m +CONFIG_MTD_SHARP=m +CONFIG_MTD_JEDEC=m # # Mapping drivers for chip access @@ -359,11 +344,13 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y CONFIG_MTD_PHYSMAP=m CONFIG_MTD_PHYSMAP_START=0x8000000 CONFIG_MTD_PHYSMAP_LEN=0x4000000 -CONFIG_MTD_PHYSMAP_BANKWIDTH=4 +CONFIG_MTD_PHYSMAP_BUSWIDTH=2 CONFIG_MTD_SC520CDP=m +CONFIG_MTD_OCTAGON=m +CONFIG_MTD_VMAX=m CONFIG_MTD_SCx200_DOCFLASH=m CONFIG_MTD_AMD76XROM=m -CONFIG_MTD_ICHXROM=m +CONFIG_MTD_ICH2ROM=m CONFIG_MTD_SCB2_FLASH=m CONFIG_MTD_L440GX=m CONFIG_MTD_PCI=m @@ -375,7 +362,6 @@ CONFIG_MTD_PMC551=m CONFIG_MTD_PMC551_BUGFIX=y # CONFIG_MTD_PMC551_DEBUG is not set CONFIG_MTD_SLRAM=m -# CONFIG_MTD_PHRAM is not set CONFIG_MTD_MTDRAM=m CONFIG_MTDRAM_TOTAL_SIZE=4096 CONFIG_MTDRAM_ERASE_SIZE=128 @@ -388,7 +374,6 @@ CONFIG_MTD_DOC2000=m CONFIG_MTD_DOC2001=m CONFIG_MTD_DOC2001PLUS=m CONFIG_MTD_DOCPROBE=m -CONFIG_MTD_DOCECC=m CONFIG_MTD_DOCPROBE_ADVANCED=y CONFIG_MTD_DOCPROBE_ADDRESS=0x0000 CONFIG_MTD_DOCPROBE_HIGH=y @@ -400,27 +385,6 @@ CONFIG_MTD_DOCPROBE_55AA=y CONFIG_MTD_NAND=m # CONFIG_MTD_NAND_VERIFY_WRITE is not set CONFIG_MTD_NAND_IDS=m -# CONFIG_MTD_NAND_DISKONCHIP is not set - -# -# Bluesmoke - error detection and reporting (RAS) -# -CONFIG_BLUESMOKE=m - -# -# Reporting subsystems -# -# CONFIG_BLUESMOKE_DEBUG is not set -CONFIG_BLUESMOKE_MM_EDAC=m - -# -# Bluesmoke system controller/chipset support -# -CONFIG_BLUESMOKE_AMD76X=m -# CONFIG_BLUESMOKE_E7XXX is not set -# CONFIG_BLUESMOKE_E752X is not set -# CONFIG_BLUESMOKE_I82875P is not set -CONFIG_BLUESMOKE_K8=m # # Parallel port support @@ -591,6 +555,7 @@ CONFIG_SCSI_PROC_FS=y # SCSI support type (disk, tape, CD-ROM) # CONFIG_BLK_DEV_SD=m +CONFIG_SCSI_DUMP=m CONFIG_SD_IOSTATS=y CONFIG_CHR_DEV_ST=m CONFIG_CHR_DEV_OSST=m @@ -616,6 +581,7 @@ CONFIG_SCSI_FC_ATTRS=m # SCSI low-level drivers # CONFIG_BLK_DEV_3W_XXXX_RAID=m +CONFIG_SCSI_3W_9XXX=m CONFIG_SCSI_7000FASST=m CONFIG_SCSI_ACARD=m CONFIG_SCSI_AHA152X=m @@ -637,7 +603,6 @@ CONFIG_AIC79XX_RESET_DELAY_MS=15000 # CONFIG_AIC79XX_DEBUG_ENABLE is not set CONFIG_AIC79XX_DEBUG_MASK=0 CONFIG_AIC79XX_REG_PRETTY_PRINT=y -# CONFIG_SCSI_AIC79XX_NEW is not set CONFIG_SCSI_DPT_I2O=m CONFIG_SCSI_ADVANSYS=m CONFIG_SCSI_IN2000=m @@ -646,11 +611,17 @@ CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_MAILBOX=m CONFIG_MEGARAID_LEGACY=m CONFIG_SCSI_SATA=y +CONFIG_SCSI_SATA_AHCI=m CONFIG_SCSI_SATA_SVW=m CONFIG_SCSI_ATA_PIIX=m +CONFIG_SCSI_SATA_NV=m +CONFIG_SCSI_PATA_PDC2027X=m CONFIG_SCSI_SATA_PROMISE=m +CONFIG_SCSI_SATA_QSTOR=m +CONFIG_SCSI_SATA_SX4=m CONFIG_SCSI_SATA_SIL=m CONFIG_SCSI_SATA_SIS=m +CONFIG_SCSI_SATA_ULI=m CONFIG_SCSI_SATA_VIA=m CONFIG_SCSI_SATA_VITESSE=m CONFIG_SCSI_BUSLOGIC=m @@ -697,7 +668,6 @@ CONFIG_SCSI_QLA22XX=m CONFIG_SCSI_QLA2300=m CONFIG_SCSI_QLA2322=m CONFIG_SCSI_QLA6312=m -CONFIG_SCSI_QLA6322=m CONFIG_SCSI_QLA2XXX_FAILOVER=y CONFIG_SCSI_QLA4XXX=m CONFIG_SCSI_QLA4XXX_FAILOVER=y @@ -748,10 +718,11 @@ CONFIG_MD_RAID6=m CONFIG_MD_MULTIPATH=m CONFIG_BLK_DEV_DM=m CONFIG_DM_CRYPT=m -CONFIG_DM_MULTIPATH=m CONFIG_DM_SNAPSHOT=m CONFIG_DM_MIRROR=m CONFIG_DM_ZERO=m +CONFIG_DM_MULTIPATH=m +CONFIG_DM_MULTIPATH_EMC=m CONFIG_DM_FLAKEY=m CONFIG_BLK_DEV_DM_BBR=m @@ -900,6 +871,7 @@ CONFIG_BRIDGE_NETFILTER=y # IP: Netfilter Configuration # CONFIG_IP_NF_CONNTRACK=m +CONFIG_IP_NF_CT_PROTO_SCTP=m CONFIG_IP_NF_FTP=m CONFIG_IP_NF_IRC=m CONFIG_IP_NF_TFTP=m @@ -926,6 +898,7 @@ CONFIG_IP_NF_MATCH_STATE=m CONFIG_IP_NF_MATCH_CONNTRACK=m CONFIG_IP_NF_MATCH_OWNER=m CONFIG_IP_NF_MATCH_PHYSDEV=m +CONFIG_IP_NF_MATCH_SCTP=m CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_NAT=m @@ -945,6 +918,7 @@ CONFIG_IP_NF_TARGET_TOS=m CONFIG_IP_NF_TARGET_ECN=m CONFIG_IP_NF_TARGET_DSCP=m CONFIG_IP_NF_TARGET_MARK=m +CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_NF_TARGET_CLASSIFY=m CONFIG_IP_NF_TARGET_LOG=m CONFIG_IP_NF_TARGET_ULOG=m @@ -1211,8 +1185,6 @@ CONFIG_ACENIC=m CONFIG_DL2K=m CONFIG_E1000=m CONFIG_E1000_NAPI=y -CONFIG_E1000_NEW=m -CONFIG_E1000_NEW_NAPI=y CONFIG_NS83820=m CONFIG_HAMACHI=m CONFIG_YELLOWFIN=m @@ -1221,9 +1193,7 @@ CONFIG_SIS190=m CONFIG_SK98LIN=m CONFIG_TIGON3=m CONFIG_NET_BROADCOM=m -CONFIG_NET_BROADCOM_NEW=m CONFIG_NET_BCM44=m -CONFIG_TIGON3_NEW=m # # Ethernet (10000 Mbit) @@ -1324,7 +1294,6 @@ CONFIG_EIP=m CONFIG_RMS=m CONFIG_JTAG=m CONFIG_NET_FC=y -CONFIG_NET_LPFC=m CONFIG_RCPCI=m CONFIG_SHAPER=m CONFIG_NETCONSOLE=m @@ -1993,6 +1962,7 @@ CONFIG_SENSORS_LM83=m CONFIG_SENSORS_LM85=m CONFIG_SENSORS_LM90=m CONFIG_SENSORS_VIA686A=m +CONFIG_SENSORS_VT1211=m CONFIG_SENSORS_W83781D=m CONFIG_SENSORS_W83L785TS=m CONFIG_SENSORS_W83627HF=m @@ -2296,6 +2266,7 @@ CONFIG_SND_INTEL8X0M=m CONFIG_SND_SONICVIBES=m CONFIG_SND_VIA82XX=m CONFIG_SND_VX222=m +CONFIG_SND_HDA_INTEL=m # # ALSA USB devices @@ -2611,11 +2582,13 @@ CONFIG_JFS_DMAPI=y CONFIG_JFS_STATISTICS=y CONFIG_FS_POSIX_ACL=y CONFIG_XFS_FS=m +CONFIG_XFS_EXPORT=y CONFIG_XFS_RT=y CONFIG_XFS_QUOTA=m CONFIG_XFS_DMAPI=y CONFIG_XFS_SECURITY=y CONFIG_XFS_POSIX_ACL=y +CONFIG_OCFS2_FS=m CONFIG_MINIX_FS=y CONFIG_ROMFS_FS=m CONFIG_DMAPI=m @@ -2658,6 +2631,7 @@ CONFIG_TMPFS=y CONFIG_HUGETLBFS=y CONFIG_HUGETLB_PAGE=y CONFIG_RAMFS=y +CONFIG_CONFIGFS_FS=m CONFIG_RELAYFS_FS=m # CONFIG_KLOG_CHANNEL is not set @@ -2842,6 +2816,7 @@ CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_DEVELOP=y # CONFIG_SECURITY_SELINUX_MLS is not set +CONFIG_SECURITY_SUBDOMAIN=m # # IBM Crypto Hardware support @@ -2885,7 +2860,7 @@ CONFIG_ZLIB_DEFLATE=m # CONFIG_SUSE_KERNEL=y CONFIG_CFGNAME="bigsmp" -CONFIG_RELEASE="7.141" +CONFIG_RELEASE="7.191" CONFIG_X86_SMP=y CONFIG_X86_HT=y CONFIG_X86_BIOS_REBOOT=y diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-i686-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-i686-smp.config index f0a8a4b..a84f323 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-i686-smp.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-i686-smp.config @@ -18,6 +18,7 @@ CONFIG_CLEAN_COMPILE=y # CONFIG_SWAP=y CONFIG_SYSVIPC=y +CONFIG_POSIX_MQUEUE=y CONFIG_BSD_PROCESS_ACCT=y CONFIG_SYSCTL=y CONFIG_LOG_BUF_SHIFT=17 @@ -35,6 +36,9 @@ CONFIG_CKRM=y CONFIG_RCFS_FS=m CONFIG_CKRM_TYPE_TASKCLASS=y CONFIG_CKRM_RES_NUMTASKS=m +CONFIG_CKRM_CPU_SCHEDULE=y +# CONFIG_CKRM_CPU_SCHEDULE_AT_BOOT is not set +CONFIG_CKRM_RES_BLKIO=y CONFIG_CKRM_TYPE_SOCKETCLASS=y CONFIG_CKRM_RBCE=m CONFIG_CKRM_CRBCE=m @@ -46,6 +50,7 @@ CONFIG_IOSCHED_NOOP=y CONFIG_IOSCHED_AS=y CONFIG_IOSCHED_DEADLINE=y CONFIG_IOSCHED_CFQ=y +CONFIG_IOSCHED_PS=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set # @@ -62,6 +67,7 @@ CONFIG_STOP_MACHINE=y # # Processor type and features # +CONFIG_MEM_MIRROR=y # CONFIG_X86_PC is not set # CONFIG_X86_ELAN is not set # CONFIG_X86_VOYAGER is not set @@ -188,6 +194,8 @@ CONFIG_APM_DISPLAY_BLANK=y # CONFIG_APM_RTC_IS_GMT is not set CONFIG_APM_ALLOW_INTS=y # CONFIG_APM_REAL_MODE_POWER_OFF is not set +CONFIG_IOPROC=y +CONFIG_PTRACK=y # # CPU Frequency scaling @@ -264,6 +272,7 @@ CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM=y CONFIG_HOTPLUG_PCI_IBM=m CONFIG_HOTPLUG_PCI_AMD=m CONFIG_HOTPLUG_PCI_ACPI=m +CONFIG_HOTPLUG_PCI_ACPI_IBM=m CONFIG_HOTPLUG_PCI_CPCI=y CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m @@ -293,10 +302,8 @@ CONFIG_FW_LOADER=m # CONFIG_MTD=m # CONFIG_MTD_DEBUG is not set -CONFIG_MTD_PARTITIONS=m +# CONFIG_MTD_PARTITIONS is not set CONFIG_MTD_CONCAT=m -CONFIG_MTD_REDBOOT_PARTS=m -CONFIG_MTD_CMDLINE_PARTS=m # # User Modules And Translation Layers @@ -338,20 +345,13 @@ CONFIG_MTD_PHYSMAP=m CONFIG_MTD_PHYSMAP_START=0x8000000 CONFIG_MTD_PHYSMAP_LEN=0x4000000 CONFIG_MTD_PHYSMAP_BUSWIDTH=2 -CONFIG_MTD_PNC2000=m CONFIG_MTD_SC520CDP=m -CONFIG_MTD_NETSC520=m -CONFIG_MTD_SBC_GXX=m -CONFIG_MTD_ELAN_104NC=m CONFIG_MTD_OCTAGON=m CONFIG_MTD_VMAX=m CONFIG_MTD_SCx200_DOCFLASH=m CONFIG_MTD_AMD76XROM=m CONFIG_MTD_ICH2ROM=m CONFIG_MTD_SCB2_FLASH=m -CONFIG_MTD_NETtel=m -CONFIG_MTD_DILNETPC=m -CONFIG_MTD_DILNETPC_BOOTSIZE=0x80000 CONFIG_MTD_L440GX=m CONFIG_MTD_PCI=m @@ -451,7 +451,6 @@ CONFIG_PARIDE_ON26=m CONFIG_BLK_CPQ_DA=m CONFIG_BLK_CPQ_CISS_DA=m CONFIG_CISS_SCSI_TAPE=y -CONFIG_BLK_CPQ_CISS_DA_NEW=m CONFIG_BLK_DEV_DAC960=m CONFIG_BLK_DEV_UMEM=m CONFIG_BLK_DEV_LOOP=y @@ -556,6 +555,8 @@ CONFIG_SCSI_PROC_FS=y # SCSI support type (disk, tape, CD-ROM) # CONFIG_BLK_DEV_SD=m +CONFIG_SCSI_DUMP=m +CONFIG_SD_IOSTATS=y CONFIG_CHR_DEV_ST=m CONFIG_CHR_DEV_OSST=m CONFIG_BLK_DEV_SR=m @@ -580,6 +581,7 @@ CONFIG_SCSI_FC_ATTRS=m # SCSI low-level drivers # CONFIG_BLK_DEV_3W_XXXX_RAID=m +CONFIG_SCSI_3W_9XXX=m CONFIG_SCSI_7000FASST=m CONFIG_SCSI_ACARD=m CONFIG_SCSI_AHA152X=m @@ -601,7 +603,7 @@ CONFIG_AIC79XX_RESET_DELAY_MS=15000 # CONFIG_AIC79XX_DEBUG_ENABLE is not set CONFIG_AIC79XX_DEBUG_MASK=0 CONFIG_AIC79XX_REG_PRETTY_PRINT=y -# CONFIG_SCSI_AIC79XX_NEW is not set +CONFIG_SCSI_DPT_I2O=m CONFIG_SCSI_ADVANSYS=m CONFIG_SCSI_IN2000=m CONFIG_MEGARAID_NEWGEN=y @@ -609,11 +611,17 @@ CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_MAILBOX=m CONFIG_MEGARAID_LEGACY=m CONFIG_SCSI_SATA=y +CONFIG_SCSI_SATA_AHCI=m CONFIG_SCSI_SATA_SVW=m CONFIG_SCSI_ATA_PIIX=m +CONFIG_SCSI_SATA_NV=m +CONFIG_SCSI_PATA_PDC2027X=m CONFIG_SCSI_SATA_PROMISE=m +CONFIG_SCSI_SATA_QSTOR=m +CONFIG_SCSI_SATA_SX4=m CONFIG_SCSI_SATA_SIL=m CONFIG_SCSI_SATA_SIS=m +CONFIG_SCSI_SATA_ULI=m CONFIG_SCSI_SATA_VIA=m CONFIG_SCSI_SATA_VITESSE=m CONFIG_SCSI_BUSLOGIC=m @@ -660,7 +668,6 @@ CONFIG_SCSI_QLA22XX=m CONFIG_SCSI_QLA2300=m CONFIG_SCSI_QLA2322=m CONFIG_SCSI_QLA6312=m -CONFIG_SCSI_QLA6322=m CONFIG_SCSI_QLA2XXX_FAILOVER=y CONFIG_SCSI_QLA4XXX=m CONFIG_SCSI_QLA4XXX_FAILOVER=y @@ -711,10 +718,11 @@ CONFIG_MD_RAID6=m CONFIG_MD_MULTIPATH=m CONFIG_BLK_DEV_DM=m CONFIG_DM_CRYPT=m -CONFIG_DM_MULTIPATH=m CONFIG_DM_SNAPSHOT=m CONFIG_DM_MIRROR=m CONFIG_DM_ZERO=m +CONFIG_DM_MULTIPATH=m +CONFIG_DM_MULTIPATH_EMC=m CONFIG_DM_FLAKEY=m CONFIG_BLK_DEV_DM_BBR=m @@ -863,6 +871,7 @@ CONFIG_BRIDGE_NETFILTER=y # IP: Netfilter Configuration # CONFIG_IP_NF_CONNTRACK=m +CONFIG_IP_NF_CT_PROTO_SCTP=m CONFIG_IP_NF_FTP=m CONFIG_IP_NF_IRC=m CONFIG_IP_NF_TFTP=m @@ -889,6 +898,7 @@ CONFIG_IP_NF_MATCH_STATE=m CONFIG_IP_NF_MATCH_CONNTRACK=m CONFIG_IP_NF_MATCH_OWNER=m CONFIG_IP_NF_MATCH_PHYSDEV=m +CONFIG_IP_NF_MATCH_SCTP=m CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_NAT=m @@ -908,6 +918,7 @@ CONFIG_IP_NF_TARGET_TOS=m CONFIG_IP_NF_TARGET_ECN=m CONFIG_IP_NF_TARGET_DSCP=m CONFIG_IP_NF_TARGET_MARK=m +CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_NF_TARGET_CLASSIFY=m CONFIG_IP_NF_TARGET_LOG=m CONFIG_IP_NF_TARGET_ULOG=m @@ -1174,8 +1185,6 @@ CONFIG_ACENIC=m CONFIG_DL2K=m CONFIG_E1000=m CONFIG_E1000_NAPI=y -CONFIG_E1000_NEW=m -CONFIG_E1000_NEW_NAPI=y CONFIG_NS83820=m CONFIG_HAMACHI=m CONFIG_YELLOWFIN=m @@ -1184,9 +1193,7 @@ CONFIG_SIS190=m CONFIG_SK98LIN=m CONFIG_TIGON3=m CONFIG_NET_BROADCOM=m -CONFIG_NET_BROADCOM_NEW=m CONFIG_NET_BCM44=m -CONFIG_TIGON3_NEW=m # # Ethernet (10000 Mbit) @@ -1275,8 +1282,18 @@ CONFIG_SKISA=m CONFIG_PROTEON=m CONFIG_ABYSS=m CONFIG_SMCTR=m + +# +# Quadrics QsNet +# +CONFIG_QSNET=m +CONFIG_ELAN3=m +CONFIG_ELAN4=m +CONFIG_EP=m +CONFIG_EIP=m +CONFIG_RMS=m +CONFIG_JTAG=m CONFIG_NET_FC=y -CONFIG_NET_LPFC=m CONFIG_RCPCI=m CONFIG_SHAPER=m CONFIG_NETCONSOLE=m @@ -1682,6 +1699,7 @@ CONFIG_KEYBOARD_SUNKBD=m # CONFIG_KEYBOARD_LKKBD is not set CONFIG_KEYBOARD_XTKBD=m CONFIG_KEYBOARD_NEWTON=m +# CONFIG_KEYBOARD_POSFILTER is not set CONFIG_INPUT_MOUSE=y CONFIG_MOUSE_PS2=y CONFIG_MOUSE_SERIAL=m @@ -1944,6 +1962,7 @@ CONFIG_SENSORS_LM83=m CONFIG_SENSORS_LM85=m CONFIG_SENSORS_LM90=m CONFIG_SENSORS_VIA686A=m +CONFIG_SENSORS_VT1211=m CONFIG_SENSORS_W83781D=m CONFIG_SENSORS_W83L785TS=m CONFIG_SENSORS_W83627HF=m @@ -2247,6 +2266,7 @@ CONFIG_SND_INTEL8X0M=m CONFIG_SND_SONICVIBES=m CONFIG_SND_VIA82XX=m CONFIG_SND_VX222=m +CONFIG_SND_HDA_INTEL=m # # ALSA USB devices @@ -2562,11 +2582,13 @@ CONFIG_JFS_DMAPI=y CONFIG_JFS_STATISTICS=y CONFIG_FS_POSIX_ACL=y CONFIG_XFS_FS=m +CONFIG_XFS_EXPORT=y CONFIG_XFS_RT=y CONFIG_XFS_QUOTA=m CONFIG_XFS_DMAPI=y CONFIG_XFS_SECURITY=y CONFIG_XFS_POSIX_ACL=y +CONFIG_OCFS2_FS=m CONFIG_MINIX_FS=y CONFIG_ROMFS_FS=m CONFIG_DMAPI=m @@ -2609,6 +2631,7 @@ CONFIG_TMPFS=y CONFIG_HUGETLBFS=y CONFIG_HUGETLB_PAGE=y CONFIG_RAMFS=y +CONFIG_CONFIGFS_FS=m CONFIG_RELAYFS_FS=m # CONFIG_KLOG_CHANNEL is not set @@ -2793,6 +2816,7 @@ CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_DEVELOP=y # CONFIG_SECURITY_SELINUX_MLS is not set +CONFIG_SECURITY_SUBDOMAIN=m # # IBM Crypto Hardware support @@ -2836,7 +2860,7 @@ CONFIG_ZLIB_DEFLATE=m # CONFIG_SUSE_KERNEL=y CONFIG_CFGNAME="bigsmp" -CONFIG_RELEASE="SLES9_SP1_BRANCH_2004110217390391" +CONFIG_RELEASE="7.191" CONFIG_X86_SMP=y CONFIG_X86_HT=y CONFIG_X86_BIOS_REBOOT=y diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-i686.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-i686.config index beb776a..a84f323 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-i686.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-i686.config @@ -38,6 +38,7 @@ CONFIG_CKRM_TYPE_TASKCLASS=y CONFIG_CKRM_RES_NUMTASKS=m CONFIG_CKRM_CPU_SCHEDULE=y # CONFIG_CKRM_CPU_SCHEDULE_AT_BOOT is not set +CONFIG_CKRM_RES_BLKIO=y CONFIG_CKRM_TYPE_SOCKETCLASS=y CONFIG_CKRM_RBCE=m CONFIG_CKRM_CRBCE=m @@ -49,6 +50,7 @@ CONFIG_IOSCHED_NOOP=y CONFIG_IOSCHED_AS=y CONFIG_IOSCHED_DEADLINE=y CONFIG_IOSCHED_CFQ=y +CONFIG_IOSCHED_PS=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set # @@ -65,6 +67,7 @@ CONFIG_STOP_MACHINE=y # # Processor type and features # +CONFIG_MEM_MIRROR=y # CONFIG_X86_PC is not set # CONFIG_X86_ELAN is not set # CONFIG_X86_VOYAGER is not set @@ -144,16 +147,6 @@ CONFIG_BOOT_IOREMAP=y CONFIG_REGPARM=y # -# Performance-monitoring counters support -# -CONFIG_PERFCTR=y -CONFIG_KPERFCTR=y -# CONFIG_PERFCTR_DEBUG is not set -# CONFIG_PERFCTR_INIT_TESTS is not set -CONFIG_PERFCTR_VIRTUAL=y -CONFIG_PERFCTR_GLOBAL=y - -# # Special options # CONFIG_PROC_MM=y @@ -333,24 +326,16 @@ CONFIG_MTD_CFI_NOSWAP=y # CONFIG_MTD_CFI_BE_BYTE_SWAP is not set # CONFIG_MTD_CFI_LE_BYTE_SWAP is not set # CONFIG_MTD_CFI_GEOMETRY is not set -CONFIG_MTD_MAP_BANK_WIDTH_1=y -CONFIG_MTD_MAP_BANK_WIDTH_2=y -CONFIG_MTD_MAP_BANK_WIDTH_4=y -# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set -# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set -# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set -CONFIG_MTD_CFI_I1=y -CONFIG_MTD_CFI_I2=y -# CONFIG_MTD_CFI_I4 is not set -# CONFIG_MTD_CFI_I8 is not set CONFIG_MTD_CFI_INTELEXT=m CONFIG_MTD_CFI_AMDSTD=m -CONFIG_MTD_CFI_AMDSTD_RETRY=0 CONFIG_MTD_CFI_STAA=m -CONFIG_MTD_CFI_UTIL=m # CONFIG_MTD_RAM is not set # CONFIG_MTD_ROM is not set CONFIG_MTD_ABSENT=m +CONFIG_MTD_OBSOLETE_CHIPS=y +CONFIG_MTD_AMDSTD=m +CONFIG_MTD_SHARP=m +CONFIG_MTD_JEDEC=m # # Mapping drivers for chip access @@ -359,11 +344,13 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y CONFIG_MTD_PHYSMAP=m CONFIG_MTD_PHYSMAP_START=0x8000000 CONFIG_MTD_PHYSMAP_LEN=0x4000000 -CONFIG_MTD_PHYSMAP_BANKWIDTH=4 +CONFIG_MTD_PHYSMAP_BUSWIDTH=2 CONFIG_MTD_SC520CDP=m +CONFIG_MTD_OCTAGON=m +CONFIG_MTD_VMAX=m CONFIG_MTD_SCx200_DOCFLASH=m CONFIG_MTD_AMD76XROM=m -CONFIG_MTD_ICHXROM=m +CONFIG_MTD_ICH2ROM=m CONFIG_MTD_SCB2_FLASH=m CONFIG_MTD_L440GX=m CONFIG_MTD_PCI=m @@ -375,7 +362,6 @@ CONFIG_MTD_PMC551=m CONFIG_MTD_PMC551_BUGFIX=y # CONFIG_MTD_PMC551_DEBUG is not set CONFIG_MTD_SLRAM=m -# CONFIG_MTD_PHRAM is not set CONFIG_MTD_MTDRAM=m CONFIG_MTDRAM_TOTAL_SIZE=4096 CONFIG_MTDRAM_ERASE_SIZE=128 @@ -388,7 +374,6 @@ CONFIG_MTD_DOC2000=m CONFIG_MTD_DOC2001=m CONFIG_MTD_DOC2001PLUS=m CONFIG_MTD_DOCPROBE=m -CONFIG_MTD_DOCECC=m CONFIG_MTD_DOCPROBE_ADVANCED=y CONFIG_MTD_DOCPROBE_ADDRESS=0x0000 CONFIG_MTD_DOCPROBE_HIGH=y @@ -400,27 +385,6 @@ CONFIG_MTD_DOCPROBE_55AA=y CONFIG_MTD_NAND=m # CONFIG_MTD_NAND_VERIFY_WRITE is not set CONFIG_MTD_NAND_IDS=m -# CONFIG_MTD_NAND_DISKONCHIP is not set - -# -# Bluesmoke - error detection and reporting (RAS) -# -CONFIG_BLUESMOKE=m - -# -# Reporting subsystems -# -# CONFIG_BLUESMOKE_DEBUG is not set -CONFIG_BLUESMOKE_MM_EDAC=m - -# -# Bluesmoke system controller/chipset support -# -CONFIG_BLUESMOKE_AMD76X=m -# CONFIG_BLUESMOKE_E7XXX is not set -# CONFIG_BLUESMOKE_E752X is not set -# CONFIG_BLUESMOKE_I82875P is not set -CONFIG_BLUESMOKE_K8=m # # Parallel port support @@ -591,6 +555,7 @@ CONFIG_SCSI_PROC_FS=y # SCSI support type (disk, tape, CD-ROM) # CONFIG_BLK_DEV_SD=m +CONFIG_SCSI_DUMP=m CONFIG_SD_IOSTATS=y CONFIG_CHR_DEV_ST=m CONFIG_CHR_DEV_OSST=m @@ -616,6 +581,7 @@ CONFIG_SCSI_FC_ATTRS=m # SCSI low-level drivers # CONFIG_BLK_DEV_3W_XXXX_RAID=m +CONFIG_SCSI_3W_9XXX=m CONFIG_SCSI_7000FASST=m CONFIG_SCSI_ACARD=m CONFIG_SCSI_AHA152X=m @@ -637,7 +603,6 @@ CONFIG_AIC79XX_RESET_DELAY_MS=15000 # CONFIG_AIC79XX_DEBUG_ENABLE is not set CONFIG_AIC79XX_DEBUG_MASK=0 CONFIG_AIC79XX_REG_PRETTY_PRINT=y -# CONFIG_SCSI_AIC79XX_NEW is not set CONFIG_SCSI_DPT_I2O=m CONFIG_SCSI_ADVANSYS=m CONFIG_SCSI_IN2000=m @@ -646,11 +611,17 @@ CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_MAILBOX=m CONFIG_MEGARAID_LEGACY=m CONFIG_SCSI_SATA=y +CONFIG_SCSI_SATA_AHCI=m CONFIG_SCSI_SATA_SVW=m CONFIG_SCSI_ATA_PIIX=m +CONFIG_SCSI_SATA_NV=m +CONFIG_SCSI_PATA_PDC2027X=m CONFIG_SCSI_SATA_PROMISE=m +CONFIG_SCSI_SATA_QSTOR=m +CONFIG_SCSI_SATA_SX4=m CONFIG_SCSI_SATA_SIL=m CONFIG_SCSI_SATA_SIS=m +CONFIG_SCSI_SATA_ULI=m CONFIG_SCSI_SATA_VIA=m CONFIG_SCSI_SATA_VITESSE=m CONFIG_SCSI_BUSLOGIC=m @@ -697,7 +668,6 @@ CONFIG_SCSI_QLA22XX=m CONFIG_SCSI_QLA2300=m CONFIG_SCSI_QLA2322=m CONFIG_SCSI_QLA6312=m -CONFIG_SCSI_QLA6322=m CONFIG_SCSI_QLA2XXX_FAILOVER=y CONFIG_SCSI_QLA4XXX=m CONFIG_SCSI_QLA4XXX_FAILOVER=y @@ -748,10 +718,11 @@ CONFIG_MD_RAID6=m CONFIG_MD_MULTIPATH=m CONFIG_BLK_DEV_DM=m CONFIG_DM_CRYPT=m -CONFIG_DM_MULTIPATH=m CONFIG_DM_SNAPSHOT=m CONFIG_DM_MIRROR=m CONFIG_DM_ZERO=m +CONFIG_DM_MULTIPATH=m +CONFIG_DM_MULTIPATH_EMC=m CONFIG_DM_FLAKEY=m CONFIG_BLK_DEV_DM_BBR=m @@ -900,6 +871,7 @@ CONFIG_BRIDGE_NETFILTER=y # IP: Netfilter Configuration # CONFIG_IP_NF_CONNTRACK=m +CONFIG_IP_NF_CT_PROTO_SCTP=m CONFIG_IP_NF_FTP=m CONFIG_IP_NF_IRC=m CONFIG_IP_NF_TFTP=m @@ -926,6 +898,7 @@ CONFIG_IP_NF_MATCH_STATE=m CONFIG_IP_NF_MATCH_CONNTRACK=m CONFIG_IP_NF_MATCH_OWNER=m CONFIG_IP_NF_MATCH_PHYSDEV=m +CONFIG_IP_NF_MATCH_SCTP=m CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_NAT=m @@ -945,6 +918,7 @@ CONFIG_IP_NF_TARGET_TOS=m CONFIG_IP_NF_TARGET_ECN=m CONFIG_IP_NF_TARGET_DSCP=m CONFIG_IP_NF_TARGET_MARK=m +CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_NF_TARGET_CLASSIFY=m CONFIG_IP_NF_TARGET_LOG=m CONFIG_IP_NF_TARGET_ULOG=m @@ -1211,8 +1185,6 @@ CONFIG_ACENIC=m CONFIG_DL2K=m CONFIG_E1000=m CONFIG_E1000_NAPI=y -CONFIG_E1000_NEW=m -CONFIG_E1000_NEW_NAPI=y CONFIG_NS83820=m CONFIG_HAMACHI=m CONFIG_YELLOWFIN=m @@ -1221,9 +1193,7 @@ CONFIG_SIS190=m CONFIG_SK98LIN=m CONFIG_TIGON3=m CONFIG_NET_BROADCOM=m -CONFIG_NET_BROADCOM_NEW=m CONFIG_NET_BCM44=m -CONFIG_TIGON3_NEW=m # # Ethernet (10000 Mbit) @@ -1324,7 +1294,6 @@ CONFIG_EIP=m CONFIG_RMS=m CONFIG_JTAG=m CONFIG_NET_FC=y -CONFIG_NET_LPFC=m CONFIG_RCPCI=m CONFIG_SHAPER=m CONFIG_NETCONSOLE=m @@ -1993,6 +1962,7 @@ CONFIG_SENSORS_LM83=m CONFIG_SENSORS_LM85=m CONFIG_SENSORS_LM90=m CONFIG_SENSORS_VIA686A=m +CONFIG_SENSORS_VT1211=m CONFIG_SENSORS_W83781D=m CONFIG_SENSORS_W83L785TS=m CONFIG_SENSORS_W83627HF=m @@ -2296,6 +2266,7 @@ CONFIG_SND_INTEL8X0M=m CONFIG_SND_SONICVIBES=m CONFIG_SND_VIA82XX=m CONFIG_SND_VX222=m +CONFIG_SND_HDA_INTEL=m # # ALSA USB devices @@ -2611,11 +2582,13 @@ CONFIG_JFS_DMAPI=y CONFIG_JFS_STATISTICS=y CONFIG_FS_POSIX_ACL=y CONFIG_XFS_FS=m +CONFIG_XFS_EXPORT=y CONFIG_XFS_RT=y CONFIG_XFS_QUOTA=m CONFIG_XFS_DMAPI=y CONFIG_XFS_SECURITY=y CONFIG_XFS_POSIX_ACL=y +CONFIG_OCFS2_FS=m CONFIG_MINIX_FS=y CONFIG_ROMFS_FS=m CONFIG_DMAPI=m @@ -2658,6 +2631,7 @@ CONFIG_TMPFS=y CONFIG_HUGETLBFS=y CONFIG_HUGETLB_PAGE=y CONFIG_RAMFS=y +CONFIG_CONFIGFS_FS=m CONFIG_RELAYFS_FS=m # CONFIG_KLOG_CHANNEL is not set @@ -2842,6 +2816,7 @@ CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_DEVELOP=y # CONFIG_SECURITY_SELINUX_MLS is not set +CONFIG_SECURITY_SUBDOMAIN=m # # IBM Crypto Hardware support @@ -2885,7 +2860,7 @@ CONFIG_ZLIB_DEFLATE=m # CONFIG_SUSE_KERNEL=y CONFIG_CFGNAME="bigsmp" -CONFIG_RELEASE="7.141" +CONFIG_RELEASE="7.191" CONFIG_X86_SMP=y CONFIG_X86_HT=y CONFIG_X86_BIOS_REBOOT=y diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-ia64-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-ia64-smp.config index 48f481b..b27e735 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-ia64-smp.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-ia64-smp.config @@ -35,6 +35,7 @@ CONFIG_CKRM_TYPE_TASKCLASS=y CONFIG_CKRM_RES_NUMTASKS=m CONFIG_CKRM_CPU_SCHEDULE=y # CONFIG_CKRM_CPU_SCHEDULE_AT_BOOT is not set +CONFIG_CKRM_RES_BLKIO=y CONFIG_CKRM_TYPE_SOCKETCLASS=y CONFIG_CKRM_RBCE=m CONFIG_CKRM_CRBCE=m @@ -47,6 +48,7 @@ CONFIG_IOSCHED_NOOP=y CONFIG_IOSCHED_AS=y CONFIG_IOSCHED_DEADLINE=y CONFIG_IOSCHED_CFQ=y +CONFIG_IOSCHED_PS=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set # @@ -95,9 +97,12 @@ CONFIG_NR_CPUS=128 CONFIG_HAVE_DEC_LOCK=y CONFIG_IA32_SUPPORT=y CONFIG_COMPAT=y +CONFIG_IA64_MCA_RECOVERY=m CONFIG_PERFMON=y CONFIG_IA64_PALINFO=y CONFIG_EFI_VARS=y +CONFIG_IOPROC=y +CONFIG_PTRACK=y CONFIG_BINFMT_ELF=y CONFIG_BINFMT_MISC=m @@ -123,8 +128,6 @@ CONFIG_ACPI_POWER=y CONFIG_ACPI_PCI=y CONFIG_ACPI_SYSTEM=y CONFIG_ACPI_INITRD=y -CONFIG_IOPROC=y -CONFIG_PTRACK=y # # Bus options (PCI, PCMCIA) @@ -196,24 +199,16 @@ CONFIG_MTD_CFI_NOSWAP=y # CONFIG_MTD_CFI_BE_BYTE_SWAP is not set # CONFIG_MTD_CFI_LE_BYTE_SWAP is not set # CONFIG_MTD_CFI_GEOMETRY is not set -CONFIG_MTD_MAP_BANK_WIDTH_1=y -CONFIG_MTD_MAP_BANK_WIDTH_2=y -CONFIG_MTD_MAP_BANK_WIDTH_4=y -# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set -# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set -# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set -CONFIG_MTD_CFI_I1=y -CONFIG_MTD_CFI_I2=y -# CONFIG_MTD_CFI_I4 is not set -# CONFIG_MTD_CFI_I8 is not set CONFIG_MTD_CFI_INTELEXT=m CONFIG_MTD_CFI_AMDSTD=m -CONFIG_MTD_CFI_AMDSTD_RETRY=0 CONFIG_MTD_CFI_STAA=m -CONFIG_MTD_CFI_UTIL=m # CONFIG_MTD_RAM is not set # CONFIG_MTD_ROM is not set CONFIG_MTD_ABSENT=m +CONFIG_MTD_OBSOLETE_CHIPS=y +CONFIG_MTD_AMDSTD=m +CONFIG_MTD_SHARP=m +CONFIG_MTD_JEDEC=m # # Mapping drivers for chip access @@ -222,7 +217,7 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y CONFIG_MTD_PHYSMAP=m CONFIG_MTD_PHYSMAP_START=0x8000000 CONFIG_MTD_PHYSMAP_LEN=0x4000000 -CONFIG_MTD_PHYSMAP_BANKWIDTH=2 +CONFIG_MTD_PHYSMAP_BUSWIDTH=2 CONFIG_MTD_PCI=m # @@ -232,7 +227,6 @@ CONFIG_MTD_PMC551=m CONFIG_MTD_PMC551_BUGFIX=y # CONFIG_MTD_PMC551_DEBUG is not set CONFIG_MTD_SLRAM=m -# CONFIG_MTD_PHRAM is not set CONFIG_MTD_MTDRAM=m CONFIG_MTDRAM_TOTAL_SIZE=4096 CONFIG_MTDRAM_ERASE_SIZE=128 @@ -245,7 +239,6 @@ CONFIG_MTD_DOC2000=m CONFIG_MTD_DOC2001=m CONFIG_MTD_DOC2001PLUS=m CONFIG_MTD_DOCPROBE=m -CONFIG_MTD_DOCECC=m CONFIG_MTD_DOCPROBE_ADVANCED=y CONFIG_MTD_DOCPROBE_ADDRESS=0x0000 CONFIG_MTD_DOCPROBE_HIGH=y @@ -257,12 +250,6 @@ CONFIG_MTD_DOCPROBE_55AA=y CONFIG_MTD_NAND=m # CONFIG_MTD_NAND_VERIFY_WRITE is not set CONFIG_MTD_NAND_IDS=m -# CONFIG_MTD_NAND_DISKONCHIP is not set - -# -# Bluesmoke - error detection and reporting (RAS) -# -# CONFIG_BLUESMOKE is not set # # Parallel port support @@ -402,6 +389,7 @@ CONFIG_SCSI_PROC_FS=y # SCSI support type (disk, tape, CD-ROM) # CONFIG_BLK_DEV_SD=m +CONFIG_SCSI_DUMP=m CONFIG_SD_IOSTATS=y CONFIG_CHR_DEV_ST=m CONFIG_CHR_DEV_OSST=m @@ -427,6 +415,7 @@ CONFIG_SCSI_FC_ATTRS=m # SCSI low-level drivers # CONFIG_BLK_DEV_3W_XXXX_RAID=m +CONFIG_SCSI_3W_9XXX=m CONFIG_SCSI_ACARD=m CONFIG_SCSI_AACRAID=m CONFIG_SCSI_AIC7XXX=m @@ -445,18 +434,23 @@ CONFIG_AIC79XX_RESET_DELAY_MS=15000 # CONFIG_AIC79XX_DEBUG_ENABLE is not set CONFIG_AIC79XX_DEBUG_MASK=0 CONFIG_AIC79XX_REG_PRETTY_PRINT=y -# CONFIG_SCSI_AIC79XX_NEW is not set CONFIG_SCSI_ADVANSYS=m CONFIG_MEGARAID_NEWGEN=y CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_MAILBOX=m CONFIG_MEGARAID_LEGACY=m CONFIG_SCSI_SATA=y +CONFIG_SCSI_SATA_AHCI=m CONFIG_SCSI_SATA_SVW=m CONFIG_SCSI_ATA_PIIX=m +CONFIG_SCSI_SATA_NV=m +CONFIG_SCSI_PATA_PDC2027X=m CONFIG_SCSI_SATA_PROMISE=m +CONFIG_SCSI_SATA_QSTOR=m +CONFIG_SCSI_SATA_SX4=m CONFIG_SCSI_SATA_SIL=m CONFIG_SCSI_SATA_SIS=m +CONFIG_SCSI_SATA_ULI=m CONFIG_SCSI_SATA_VIA=m CONFIG_SCSI_SATA_VITESSE=m # CONFIG_SCSI_BUSLOGIC is not set @@ -489,7 +483,6 @@ CONFIG_SCSI_QLA22XX=m CONFIG_SCSI_QLA2300=m CONFIG_SCSI_QLA2322=m CONFIG_SCSI_QLA6312=m -CONFIG_SCSI_QLA6322=m CONFIG_SCSI_QLA2XXX_FAILOVER=y CONFIG_SCSI_QLA4XXX=m CONFIG_SCSI_QLA4XXX_FAILOVER=y @@ -516,10 +509,11 @@ CONFIG_MD_RAID6=m CONFIG_MD_MULTIPATH=m CONFIG_BLK_DEV_DM=m CONFIG_DM_CRYPT=m -CONFIG_DM_MULTIPATH=m CONFIG_DM_SNAPSHOT=m CONFIG_DM_MIRROR=m CONFIG_DM_ZERO=m +CONFIG_DM_MULTIPATH=m +CONFIG_DM_MULTIPATH_EMC=m CONFIG_DM_FLAKEY=m CONFIG_BLK_DEV_DM_BBR=m @@ -668,6 +662,7 @@ CONFIG_BRIDGE_NETFILTER=y # IP: Netfilter Configuration # CONFIG_IP_NF_CONNTRACK=m +CONFIG_IP_NF_CT_PROTO_SCTP=m CONFIG_IP_NF_FTP=m CONFIG_IP_NF_IRC=m CONFIG_IP_NF_TFTP=m @@ -694,6 +689,7 @@ CONFIG_IP_NF_MATCH_STATE=m CONFIG_IP_NF_MATCH_CONNTRACK=m CONFIG_IP_NF_MATCH_OWNER=m CONFIG_IP_NF_MATCH_PHYSDEV=m +CONFIG_IP_NF_MATCH_SCTP=m CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_NAT=m @@ -713,6 +709,7 @@ CONFIG_IP_NF_TARGET_TOS=m CONFIG_IP_NF_TARGET_ECN=m CONFIG_IP_NF_TARGET_DSCP=m CONFIG_IP_NF_TARGET_MARK=m +CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_NF_TARGET_CLASSIFY=m CONFIG_IP_NF_TARGET_LOG=m CONFIG_IP_NF_TARGET_ULOG=m @@ -936,8 +933,6 @@ CONFIG_ACENIC=m CONFIG_DL2K=m CONFIG_E1000=m CONFIG_E1000_NAPI=y -CONFIG_E1000_NEW=m -CONFIG_E1000_NEW_NAPI=y CONFIG_NS83820=m CONFIG_HAMACHI=m CONFIG_YELLOWFIN=m @@ -946,9 +941,7 @@ CONFIG_R8169=m CONFIG_SK98LIN=m CONFIG_TIGON3=m CONFIG_NET_BROADCOM=m -CONFIG_NET_BROADCOM_NEW=m CONFIG_NET_BCM44=m -CONFIG_TIGON3_NEW=m # # Ethernet (10000 Mbit) @@ -1041,7 +1034,6 @@ CONFIG_EIP=m CONFIG_RMS=m CONFIG_JTAG=m CONFIG_NET_FC=y -CONFIG_NET_LPFC=m CONFIG_SHAPER=m CONFIG_NETCONSOLE=m @@ -1455,8 +1447,9 @@ CONFIG_STALDRV=y CONFIG_SGI_L1_SERIAL=y CONFIG_SGI_L1_SERIAL_CONSOLE=y CONFIG_FETCHOP=m -CONFIG_SGI_IOC4_SERIAL=m CONFIG_SGI_SNSC=y +CONFIG_SGI_TIOCX=y +CONFIG_SGI_MBCS=m # # Serial drivers @@ -1543,6 +1536,7 @@ CONFIG_AGP_HP_ZX1=m CONFIG_SYNCLINK_CS=m CONFIG_RAW_DRIVER=m CONFIG_MAX_RAW_DEVS=4096 +CONFIG_HANGCHECK_TIMER=m CONFIG_MMTIMER=m CONFIG_VTUNE=m @@ -1614,6 +1608,7 @@ CONFIG_SENSORS_LM83=m CONFIG_SENSORS_LM85=m # CONFIG_SENSORS_LM90 is not set CONFIG_SENSORS_VIA686A=m +CONFIG_SENSORS_VT1211=m CONFIG_SENSORS_W83781D=m # CONFIG_SENSORS_W83L785TS is not set CONFIG_SENSORS_W83627HF=m @@ -1853,6 +1848,7 @@ CONFIG_SND_INTEL8X0M=m CONFIG_SND_SONICVIBES=m CONFIG_SND_VIA82XX=m CONFIG_SND_VX222=m +CONFIG_SND_HDA_INTEL=m # # ALSA USB devices @@ -2117,11 +2113,13 @@ CONFIG_REISERFS_FS_SECURITY=y # CONFIG_JFS_FS is not set CONFIG_FS_POSIX_ACL=y CONFIG_XFS_FS=m +CONFIG_XFS_EXPORT=y CONFIG_XFS_RT=y CONFIG_XFS_QUOTA=m CONFIG_XFS_DMAPI=y CONFIG_XFS_SECURITY=y CONFIG_XFS_POSIX_ACL=y +CONFIG_OCFS2_FS=m CONFIG_MINIX_FS=y CONFIG_ROMFS_FS=m CONFIG_DMAPI=m @@ -2164,6 +2162,7 @@ CONFIG_TMPFS=y CONFIG_HUGETLBFS=y CONFIG_HUGETLB_PAGE=y CONFIG_RAMFS=y +CONFIG_CONFIGFS_FS=m CONFIG_RELAYFS_FS=m # CONFIG_KLOG_CHANNEL is not set @@ -2359,6 +2358,7 @@ CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_DEVELOP=y # CONFIG_SECURITY_SELINUX_MLS is not set +CONFIG_SECURITY_SUBDOMAIN=m # # Cryptographic options diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-ia64.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-ia64.config index 48f481b..b27e735 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-ia64.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-ia64.config @@ -35,6 +35,7 @@ CONFIG_CKRM_TYPE_TASKCLASS=y CONFIG_CKRM_RES_NUMTASKS=m CONFIG_CKRM_CPU_SCHEDULE=y # CONFIG_CKRM_CPU_SCHEDULE_AT_BOOT is not set +CONFIG_CKRM_RES_BLKIO=y CONFIG_CKRM_TYPE_SOCKETCLASS=y CONFIG_CKRM_RBCE=m CONFIG_CKRM_CRBCE=m @@ -47,6 +48,7 @@ CONFIG_IOSCHED_NOOP=y CONFIG_IOSCHED_AS=y CONFIG_IOSCHED_DEADLINE=y CONFIG_IOSCHED_CFQ=y +CONFIG_IOSCHED_PS=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set # @@ -95,9 +97,12 @@ CONFIG_NR_CPUS=128 CONFIG_HAVE_DEC_LOCK=y CONFIG_IA32_SUPPORT=y CONFIG_COMPAT=y +CONFIG_IA64_MCA_RECOVERY=m CONFIG_PERFMON=y CONFIG_IA64_PALINFO=y CONFIG_EFI_VARS=y +CONFIG_IOPROC=y +CONFIG_PTRACK=y CONFIG_BINFMT_ELF=y CONFIG_BINFMT_MISC=m @@ -123,8 +128,6 @@ CONFIG_ACPI_POWER=y CONFIG_ACPI_PCI=y CONFIG_ACPI_SYSTEM=y CONFIG_ACPI_INITRD=y -CONFIG_IOPROC=y -CONFIG_PTRACK=y # # Bus options (PCI, PCMCIA) @@ -196,24 +199,16 @@ CONFIG_MTD_CFI_NOSWAP=y # CONFIG_MTD_CFI_BE_BYTE_SWAP is not set # CONFIG_MTD_CFI_LE_BYTE_SWAP is not set # CONFIG_MTD_CFI_GEOMETRY is not set -CONFIG_MTD_MAP_BANK_WIDTH_1=y -CONFIG_MTD_MAP_BANK_WIDTH_2=y -CONFIG_MTD_MAP_BANK_WIDTH_4=y -# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set -# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set -# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set -CONFIG_MTD_CFI_I1=y -CONFIG_MTD_CFI_I2=y -# CONFIG_MTD_CFI_I4 is not set -# CONFIG_MTD_CFI_I8 is not set CONFIG_MTD_CFI_INTELEXT=m CONFIG_MTD_CFI_AMDSTD=m -CONFIG_MTD_CFI_AMDSTD_RETRY=0 CONFIG_MTD_CFI_STAA=m -CONFIG_MTD_CFI_UTIL=m # CONFIG_MTD_RAM is not set # CONFIG_MTD_ROM is not set CONFIG_MTD_ABSENT=m +CONFIG_MTD_OBSOLETE_CHIPS=y +CONFIG_MTD_AMDSTD=m +CONFIG_MTD_SHARP=m +CONFIG_MTD_JEDEC=m # # Mapping drivers for chip access @@ -222,7 +217,7 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y CONFIG_MTD_PHYSMAP=m CONFIG_MTD_PHYSMAP_START=0x8000000 CONFIG_MTD_PHYSMAP_LEN=0x4000000 -CONFIG_MTD_PHYSMAP_BANKWIDTH=2 +CONFIG_MTD_PHYSMAP_BUSWIDTH=2 CONFIG_MTD_PCI=m # @@ -232,7 +227,6 @@ CONFIG_MTD_PMC551=m CONFIG_MTD_PMC551_BUGFIX=y # CONFIG_MTD_PMC551_DEBUG is not set CONFIG_MTD_SLRAM=m -# CONFIG_MTD_PHRAM is not set CONFIG_MTD_MTDRAM=m CONFIG_MTDRAM_TOTAL_SIZE=4096 CONFIG_MTDRAM_ERASE_SIZE=128 @@ -245,7 +239,6 @@ CONFIG_MTD_DOC2000=m CONFIG_MTD_DOC2001=m CONFIG_MTD_DOC2001PLUS=m CONFIG_MTD_DOCPROBE=m -CONFIG_MTD_DOCECC=m CONFIG_MTD_DOCPROBE_ADVANCED=y CONFIG_MTD_DOCPROBE_ADDRESS=0x0000 CONFIG_MTD_DOCPROBE_HIGH=y @@ -257,12 +250,6 @@ CONFIG_MTD_DOCPROBE_55AA=y CONFIG_MTD_NAND=m # CONFIG_MTD_NAND_VERIFY_WRITE is not set CONFIG_MTD_NAND_IDS=m -# CONFIG_MTD_NAND_DISKONCHIP is not set - -# -# Bluesmoke - error detection and reporting (RAS) -# -# CONFIG_BLUESMOKE is not set # # Parallel port support @@ -402,6 +389,7 @@ CONFIG_SCSI_PROC_FS=y # SCSI support type (disk, tape, CD-ROM) # CONFIG_BLK_DEV_SD=m +CONFIG_SCSI_DUMP=m CONFIG_SD_IOSTATS=y CONFIG_CHR_DEV_ST=m CONFIG_CHR_DEV_OSST=m @@ -427,6 +415,7 @@ CONFIG_SCSI_FC_ATTRS=m # SCSI low-level drivers # CONFIG_BLK_DEV_3W_XXXX_RAID=m +CONFIG_SCSI_3W_9XXX=m CONFIG_SCSI_ACARD=m CONFIG_SCSI_AACRAID=m CONFIG_SCSI_AIC7XXX=m @@ -445,18 +434,23 @@ CONFIG_AIC79XX_RESET_DELAY_MS=15000 # CONFIG_AIC79XX_DEBUG_ENABLE is not set CONFIG_AIC79XX_DEBUG_MASK=0 CONFIG_AIC79XX_REG_PRETTY_PRINT=y -# CONFIG_SCSI_AIC79XX_NEW is not set CONFIG_SCSI_ADVANSYS=m CONFIG_MEGARAID_NEWGEN=y CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_MAILBOX=m CONFIG_MEGARAID_LEGACY=m CONFIG_SCSI_SATA=y +CONFIG_SCSI_SATA_AHCI=m CONFIG_SCSI_SATA_SVW=m CONFIG_SCSI_ATA_PIIX=m +CONFIG_SCSI_SATA_NV=m +CONFIG_SCSI_PATA_PDC2027X=m CONFIG_SCSI_SATA_PROMISE=m +CONFIG_SCSI_SATA_QSTOR=m +CONFIG_SCSI_SATA_SX4=m CONFIG_SCSI_SATA_SIL=m CONFIG_SCSI_SATA_SIS=m +CONFIG_SCSI_SATA_ULI=m CONFIG_SCSI_SATA_VIA=m CONFIG_SCSI_SATA_VITESSE=m # CONFIG_SCSI_BUSLOGIC is not set @@ -489,7 +483,6 @@ CONFIG_SCSI_QLA22XX=m CONFIG_SCSI_QLA2300=m CONFIG_SCSI_QLA2322=m CONFIG_SCSI_QLA6312=m -CONFIG_SCSI_QLA6322=m CONFIG_SCSI_QLA2XXX_FAILOVER=y CONFIG_SCSI_QLA4XXX=m CONFIG_SCSI_QLA4XXX_FAILOVER=y @@ -516,10 +509,11 @@ CONFIG_MD_RAID6=m CONFIG_MD_MULTIPATH=m CONFIG_BLK_DEV_DM=m CONFIG_DM_CRYPT=m -CONFIG_DM_MULTIPATH=m CONFIG_DM_SNAPSHOT=m CONFIG_DM_MIRROR=m CONFIG_DM_ZERO=m +CONFIG_DM_MULTIPATH=m +CONFIG_DM_MULTIPATH_EMC=m CONFIG_DM_FLAKEY=m CONFIG_BLK_DEV_DM_BBR=m @@ -668,6 +662,7 @@ CONFIG_BRIDGE_NETFILTER=y # IP: Netfilter Configuration # CONFIG_IP_NF_CONNTRACK=m +CONFIG_IP_NF_CT_PROTO_SCTP=m CONFIG_IP_NF_FTP=m CONFIG_IP_NF_IRC=m CONFIG_IP_NF_TFTP=m @@ -694,6 +689,7 @@ CONFIG_IP_NF_MATCH_STATE=m CONFIG_IP_NF_MATCH_CONNTRACK=m CONFIG_IP_NF_MATCH_OWNER=m CONFIG_IP_NF_MATCH_PHYSDEV=m +CONFIG_IP_NF_MATCH_SCTP=m CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_NAT=m @@ -713,6 +709,7 @@ CONFIG_IP_NF_TARGET_TOS=m CONFIG_IP_NF_TARGET_ECN=m CONFIG_IP_NF_TARGET_DSCP=m CONFIG_IP_NF_TARGET_MARK=m +CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_NF_TARGET_CLASSIFY=m CONFIG_IP_NF_TARGET_LOG=m CONFIG_IP_NF_TARGET_ULOG=m @@ -936,8 +933,6 @@ CONFIG_ACENIC=m CONFIG_DL2K=m CONFIG_E1000=m CONFIG_E1000_NAPI=y -CONFIG_E1000_NEW=m -CONFIG_E1000_NEW_NAPI=y CONFIG_NS83820=m CONFIG_HAMACHI=m CONFIG_YELLOWFIN=m @@ -946,9 +941,7 @@ CONFIG_R8169=m CONFIG_SK98LIN=m CONFIG_TIGON3=m CONFIG_NET_BROADCOM=m -CONFIG_NET_BROADCOM_NEW=m CONFIG_NET_BCM44=m -CONFIG_TIGON3_NEW=m # # Ethernet (10000 Mbit) @@ -1041,7 +1034,6 @@ CONFIG_EIP=m CONFIG_RMS=m CONFIG_JTAG=m CONFIG_NET_FC=y -CONFIG_NET_LPFC=m CONFIG_SHAPER=m CONFIG_NETCONSOLE=m @@ -1455,8 +1447,9 @@ CONFIG_STALDRV=y CONFIG_SGI_L1_SERIAL=y CONFIG_SGI_L1_SERIAL_CONSOLE=y CONFIG_FETCHOP=m -CONFIG_SGI_IOC4_SERIAL=m CONFIG_SGI_SNSC=y +CONFIG_SGI_TIOCX=y +CONFIG_SGI_MBCS=m # # Serial drivers @@ -1543,6 +1536,7 @@ CONFIG_AGP_HP_ZX1=m CONFIG_SYNCLINK_CS=m CONFIG_RAW_DRIVER=m CONFIG_MAX_RAW_DEVS=4096 +CONFIG_HANGCHECK_TIMER=m CONFIG_MMTIMER=m CONFIG_VTUNE=m @@ -1614,6 +1608,7 @@ CONFIG_SENSORS_LM83=m CONFIG_SENSORS_LM85=m # CONFIG_SENSORS_LM90 is not set CONFIG_SENSORS_VIA686A=m +CONFIG_SENSORS_VT1211=m CONFIG_SENSORS_W83781D=m # CONFIG_SENSORS_W83L785TS is not set CONFIG_SENSORS_W83627HF=m @@ -1853,6 +1848,7 @@ CONFIG_SND_INTEL8X0M=m CONFIG_SND_SONICVIBES=m CONFIG_SND_VIA82XX=m CONFIG_SND_VX222=m +CONFIG_SND_HDA_INTEL=m # # ALSA USB devices @@ -2117,11 +2113,13 @@ CONFIG_REISERFS_FS_SECURITY=y # CONFIG_JFS_FS is not set CONFIG_FS_POSIX_ACL=y CONFIG_XFS_FS=m +CONFIG_XFS_EXPORT=y CONFIG_XFS_RT=y CONFIG_XFS_QUOTA=m CONFIG_XFS_DMAPI=y CONFIG_XFS_SECURITY=y CONFIG_XFS_POSIX_ACL=y +CONFIG_OCFS2_FS=m CONFIG_MINIX_FS=y CONFIG_ROMFS_FS=m CONFIG_DMAPI=m @@ -2164,6 +2162,7 @@ CONFIG_TMPFS=y CONFIG_HUGETLBFS=y CONFIG_HUGETLB_PAGE=y CONFIG_RAMFS=y +CONFIG_CONFIGFS_FS=m CONFIG_RELAYFS_FS=m # CONFIG_KLOG_CHANNEL is not set @@ -2359,6 +2358,7 @@ CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_DEVELOP=y # CONFIG_SECURITY_SELINUX_MLS is not set +CONFIG_SECURITY_SUBDOMAIN=m # # Cryptographic options diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-x86_64-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-x86_64-smp.config index 0730819..bb4f8e0 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-x86_64-smp.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-x86_64-smp.config @@ -9,6 +9,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_X86_CMPXCHG=y CONFIG_EARLY_PRINTK=y CONFIG_HPET_TIMER=y +CONFIG_X86_PM_TIMER=y CONFIG_HPET_EMULATE_RTC=y CONFIG_GENERIC_ISA_DMA=y @@ -44,6 +45,7 @@ CONFIG_CKRM_TYPE_TASKCLASS=y CONFIG_CKRM_RES_NUMTASKS=m CONFIG_CKRM_CPU_SCHEDULE=y # CONFIG_CKRM_CPU_SCHEDULE_AT_BOOT is not set +CONFIG_CKRM_RES_BLKIO=y CONFIG_CKRM_TYPE_SOCKETCLASS=y CONFIG_CKRM_RBCE=m CONFIG_CKRM_CRBCE=m @@ -55,6 +57,7 @@ CONFIG_IOSCHED_NOOP=y CONFIG_IOSCHED_AS=y CONFIG_IOSCHED_DEADLINE=y CONFIG_IOSCHED_CFQ=y +CONFIG_IOSCHED_PS=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set # @@ -98,16 +101,6 @@ CONFIG_SWIOTLB=y CONFIG_X86_MCE=y # -# Performance-monitoring counters support -# -CONFIG_PERFCTR=m -CONFIG_KPERFCTR=y -# CONFIG_PERFCTR_DEBUG is not set -# CONFIG_PERFCTR_INIT_TESTS is not set -CONFIG_PERFCTR_VIRTUAL=y -CONFIG_PERFCTR_GLOBAL=y - -# # Power management options # CONFIG_PM=y @@ -137,8 +130,6 @@ CONFIG_ACPI_POWER=y CONFIG_ACPI_PCI=y CONFIG_ACPI_SYSTEM=y CONFIG_ACPI_INITRD=y -CONFIG_IOPROC=y -CONFIG_PTRACK=y # # CPU Frequency scaling @@ -208,7 +199,6 @@ CONFIG_IA32_AOUT=y CONFIG_COMPAT=y CONFIG_SYSVIPC_COMPAT=y CONFIG_UID16=y -CONFIG_KEXEC=y # # Device Drivers @@ -249,24 +239,16 @@ CONFIG_MTD_CFI_NOSWAP=y # CONFIG_MTD_CFI_BE_BYTE_SWAP is not set # CONFIG_MTD_CFI_LE_BYTE_SWAP is not set # CONFIG_MTD_CFI_GEOMETRY is not set -CONFIG_MTD_MAP_BANK_WIDTH_1=y -CONFIG_MTD_MAP_BANK_WIDTH_2=y -CONFIG_MTD_MAP_BANK_WIDTH_4=y -# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set -# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set -# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set -CONFIG_MTD_CFI_I1=y -CONFIG_MTD_CFI_I2=y -# CONFIG_MTD_CFI_I4 is not set -# CONFIG_MTD_CFI_I8 is not set CONFIG_MTD_CFI_INTELEXT=m CONFIG_MTD_CFI_AMDSTD=m -CONFIG_MTD_CFI_AMDSTD_RETRY=0 CONFIG_MTD_CFI_STAA=m -CONFIG_MTD_CFI_UTIL=m # CONFIG_MTD_RAM is not set # CONFIG_MTD_ROM is not set CONFIG_MTD_ABSENT=m +CONFIG_MTD_OBSOLETE_CHIPS=y +CONFIG_MTD_AMDSTD=m +CONFIG_MTD_SHARP=m +CONFIG_MTD_JEDEC=m # # Mapping drivers for chip access @@ -275,11 +257,13 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y CONFIG_MTD_PHYSMAP=m CONFIG_MTD_PHYSMAP_START=0x8000000 CONFIG_MTD_PHYSMAP_LEN=0x4000000 -CONFIG_MTD_PHYSMAP_BANKWIDTH=4 +CONFIG_MTD_PHYSMAP_BUSWIDTH=2 # CONFIG_MTD_SC520CDP is not set +CONFIG_MTD_OCTAGON=m +CONFIG_MTD_VMAX=m CONFIG_MTD_SCx200_DOCFLASH=m CONFIG_MTD_AMD76XROM=m -CONFIG_MTD_ICHXROM=m +CONFIG_MTD_ICH2ROM=m CONFIG_MTD_SCB2_FLASH=m # CONFIG_MTD_L440GX is not set CONFIG_MTD_PCI=m @@ -291,7 +275,6 @@ CONFIG_MTD_PMC551=m CONFIG_MTD_PMC551_BUGFIX=y # CONFIG_MTD_PMC551_DEBUG is not set CONFIG_MTD_SLRAM=m -CONFIG_MTD_PHRAM=m CONFIG_MTD_MTDRAM=m CONFIG_MTDRAM_TOTAL_SIZE=4096 CONFIG_MTDRAM_ERASE_SIZE=128 @@ -304,7 +287,6 @@ CONFIG_MTD_DOC2000=m CONFIG_MTD_DOC2001=m CONFIG_MTD_DOC2001PLUS=m CONFIG_MTD_DOCPROBE=m -CONFIG_MTD_DOCECC=m CONFIG_MTD_DOCPROBE_ADVANCED=y CONFIG_MTD_DOCPROBE_ADDRESS=0x0000 CONFIG_MTD_DOCPROBE_HIGH=y @@ -316,27 +298,6 @@ CONFIG_MTD_DOCPROBE_55AA=y CONFIG_MTD_NAND=m # CONFIG_MTD_NAND_VERIFY_WRITE is not set CONFIG_MTD_NAND_IDS=m -# CONFIG_MTD_NAND_DISKONCHIP is not set - -# -# Bluesmoke - error detection and reporting (RAS) -# -CONFIG_BLUESMOKE=m - -# -# Reporting subsystems -# -# CONFIG_BLUESMOKE_DEBUG is not set -CONFIG_BLUESMOKE_MM_EDAC=m - -# -# Bluesmoke system controller/chipset support -# -CONFIG_BLUESMOKE_AMD76X=m -# CONFIG_BLUESMOKE_E7XXX is not set -# CONFIG_BLUESMOKE_E752X is not set -# CONFIG_BLUESMOKE_I82875P is not set -CONFIG_BLUESMOKE_K8=m # # Parallel port support @@ -483,7 +444,7 @@ CONFIG_SCSI_PROC_FS=y # SCSI support type (disk, tape, CD-ROM) # CONFIG_BLK_DEV_SD=m -CONFIG_SD_IOSTATS=y +CONFIG_SCSI_DUMP=m CONFIG_CHR_DEV_ST=m CONFIG_CHR_DEV_OSST=m CONFIG_BLK_DEV_SR=m @@ -508,6 +469,7 @@ CONFIG_SCSI_FC_ATTRS=m # SCSI low-level drivers # CONFIG_BLK_DEV_3W_XXXX_RAID=m +CONFIG_SCSI_3W_9XXX=m CONFIG_SCSI_ACARD=m CONFIG_SCSI_AACRAID=m CONFIG_SCSI_AIC7XXX=m @@ -526,18 +488,23 @@ CONFIG_AIC79XX_RESET_DELAY_MS=15000 # CONFIG_AIC79XX_DEBUG_ENABLE is not set CONFIG_AIC79XX_DEBUG_MASK=0 CONFIG_AIC79XX_REG_PRETTY_PRINT=y -CONFIG_SCSI_AIC79XX_NEW=m CONFIG_SCSI_ADVANSYS=m CONFIG_MEGARAID_NEWGEN=y CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_MAILBOX=m CONFIG_MEGARAID_LEGACY=m CONFIG_SCSI_SATA=y +CONFIG_SCSI_SATA_AHCI=m CONFIG_SCSI_SATA_SVW=m CONFIG_SCSI_ATA_PIIX=m +CONFIG_SCSI_SATA_NV=m +CONFIG_SCSI_PATA_PDC2027X=m CONFIG_SCSI_SATA_PROMISE=m +CONFIG_SCSI_SATA_QSTOR=m +CONFIG_SCSI_SATA_SX4=m CONFIG_SCSI_SATA_SIL=m CONFIG_SCSI_SATA_SIS=m +CONFIG_SCSI_SATA_ULI=m CONFIG_SCSI_SATA_VIA=m CONFIG_SCSI_SATA_VITESSE=m CONFIG_SCSI_BUSLOGIC=m @@ -574,7 +541,6 @@ CONFIG_SCSI_QLA22XX=m CONFIG_SCSI_QLA2300=m CONFIG_SCSI_QLA2322=m CONFIG_SCSI_QLA6312=m -CONFIG_SCSI_QLA6322=m CONFIG_SCSI_QLA2XXX_FAILOVER=y CONFIG_SCSI_QLA4XXX=m CONFIG_SCSI_QLA4XXX_FAILOVER=y @@ -601,10 +567,11 @@ CONFIG_MD_RAID6=m CONFIG_MD_MULTIPATH=m CONFIG_BLK_DEV_DM=m CONFIG_DM_CRYPT=m -CONFIG_DM_MULTIPATH=m CONFIG_DM_SNAPSHOT=m CONFIG_DM_MIRROR=m CONFIG_DM_ZERO=m +CONFIG_DM_MULTIPATH=m +CONFIG_DM_MULTIPATH_EMC=m CONFIG_DM_FLAKEY=m CONFIG_BLK_DEV_DM_BBR=m @@ -756,6 +723,7 @@ CONFIG_BRIDGE_NETFILTER=y # IP: Netfilter Configuration # CONFIG_IP_NF_CONNTRACK=m +CONFIG_IP_NF_CT_PROTO_SCTP=m CONFIG_IP_NF_FTP=m CONFIG_IP_NF_IRC=m CONFIG_IP_NF_TFTP=m @@ -782,6 +750,7 @@ CONFIG_IP_NF_MATCH_STATE=m CONFIG_IP_NF_MATCH_CONNTRACK=m CONFIG_IP_NF_MATCH_OWNER=m CONFIG_IP_NF_MATCH_PHYSDEV=m +CONFIG_IP_NF_MATCH_SCTP=m CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_NAT=m @@ -801,6 +770,7 @@ CONFIG_IP_NF_TARGET_TOS=m CONFIG_IP_NF_TARGET_ECN=m CONFIG_IP_NF_TARGET_DSCP=m CONFIG_IP_NF_TARGET_MARK=m +CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_NF_TARGET_CLASSIFY=m CONFIG_IP_NF_TARGET_LOG=m CONFIG_IP_NF_TARGET_ULOG=m @@ -1017,8 +987,6 @@ CONFIG_ACENIC=m CONFIG_DL2K=m CONFIG_E1000=m CONFIG_E1000_NAPI=y -CONFIG_E1000_NEW=m -CONFIG_E1000_NEW_NAPI=y CONFIG_NS83820=m CONFIG_HAMACHI=m CONFIG_YELLOWFIN=m @@ -1027,9 +995,7 @@ CONFIG_SIS190=m CONFIG_SK98LIN=m CONFIG_TIGON3=m CONFIG_NET_BROADCOM=m -CONFIG_NET_BROADCOM_NEW=m CONFIG_NET_BCM44=m -CONFIG_TIGON3_NEW=m # # Ethernet (10000 Mbit) @@ -1111,19 +1077,7 @@ CONFIG_3C359=m CONFIG_TMS380TR=m CONFIG_TMSPCI=m CONFIG_ABYSS=m - -# -# Quadrics QsNet -# -CONFIG_QSNET=m -CONFIG_ELAN3=m -CONFIG_ELAN4=m -CONFIG_EP=m -CONFIG_EIP=m -CONFIG_RMS=m -CONFIG_JTAG=m CONFIG_NET_FC=y -CONFIG_NET_LPFC=m CONFIG_SHAPER=m CONFIG_NETCONSOLE=m @@ -1661,6 +1615,7 @@ CONFIG_SENSORS_LM83=m CONFIG_SENSORS_LM85=m CONFIG_SENSORS_LM90=m CONFIG_SENSORS_VIA686A=m +CONFIG_SENSORS_VT1211=m CONFIG_SENSORS_W83781D=m CONFIG_SENSORS_W83L785TS=m CONFIG_SENSORS_W83627HF=m @@ -1921,6 +1876,7 @@ CONFIG_SND_INTEL8X0M=m CONFIG_SND_SONICVIBES=m CONFIG_SND_VIA82XX=m CONFIG_SND_VX222=m +CONFIG_SND_HDA_INTEL=m # # ALSA USB devices @@ -2232,11 +2188,13 @@ CONFIG_JFS_DMAPI=y CONFIG_JFS_STATISTICS=y CONFIG_FS_POSIX_ACL=y CONFIG_XFS_FS=m +CONFIG_XFS_EXPORT=y CONFIG_XFS_RT=y CONFIG_XFS_QUOTA=m CONFIG_XFS_DMAPI=y CONFIG_XFS_SECURITY=y CONFIG_XFS_POSIX_ACL=y +CONFIG_OCFS2_FS=m CONFIG_MINIX_FS=y CONFIG_ROMFS_FS=m CONFIG_DMAPI=m @@ -2279,6 +2237,7 @@ CONFIG_TMPFS=y CONFIG_HUGETLBFS=y CONFIG_HUGETLB_PAGE=y CONFIG_RAMFS=y +CONFIG_CONFIGFS_FS=m CONFIG_RELAYFS_FS=m # CONFIG_KLOG_CHANNEL is not set @@ -2458,6 +2417,7 @@ CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_DEVELOP=y # CONFIG_SECURITY_SELINUX_MLS is not set +CONFIG_SECURITY_SUBDOMAIN=m # # Cryptographic options diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-x86_64.config index 0730819..bb4f8e0 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-x86_64.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-x86_64.config @@ -9,6 +9,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_X86_CMPXCHG=y CONFIG_EARLY_PRINTK=y CONFIG_HPET_TIMER=y +CONFIG_X86_PM_TIMER=y CONFIG_HPET_EMULATE_RTC=y CONFIG_GENERIC_ISA_DMA=y @@ -44,6 +45,7 @@ CONFIG_CKRM_TYPE_TASKCLASS=y CONFIG_CKRM_RES_NUMTASKS=m CONFIG_CKRM_CPU_SCHEDULE=y # CONFIG_CKRM_CPU_SCHEDULE_AT_BOOT is not set +CONFIG_CKRM_RES_BLKIO=y CONFIG_CKRM_TYPE_SOCKETCLASS=y CONFIG_CKRM_RBCE=m CONFIG_CKRM_CRBCE=m @@ -55,6 +57,7 @@ CONFIG_IOSCHED_NOOP=y CONFIG_IOSCHED_AS=y CONFIG_IOSCHED_DEADLINE=y CONFIG_IOSCHED_CFQ=y +CONFIG_IOSCHED_PS=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set # @@ -98,16 +101,6 @@ CONFIG_SWIOTLB=y CONFIG_X86_MCE=y # -# Performance-monitoring counters support -# -CONFIG_PERFCTR=m -CONFIG_KPERFCTR=y -# CONFIG_PERFCTR_DEBUG is not set -# CONFIG_PERFCTR_INIT_TESTS is not set -CONFIG_PERFCTR_VIRTUAL=y -CONFIG_PERFCTR_GLOBAL=y - -# # Power management options # CONFIG_PM=y @@ -137,8 +130,6 @@ CONFIG_ACPI_POWER=y CONFIG_ACPI_PCI=y CONFIG_ACPI_SYSTEM=y CONFIG_ACPI_INITRD=y -CONFIG_IOPROC=y -CONFIG_PTRACK=y # # CPU Frequency scaling @@ -208,7 +199,6 @@ CONFIG_IA32_AOUT=y CONFIG_COMPAT=y CONFIG_SYSVIPC_COMPAT=y CONFIG_UID16=y -CONFIG_KEXEC=y # # Device Drivers @@ -249,24 +239,16 @@ CONFIG_MTD_CFI_NOSWAP=y # CONFIG_MTD_CFI_BE_BYTE_SWAP is not set # CONFIG_MTD_CFI_LE_BYTE_SWAP is not set # CONFIG_MTD_CFI_GEOMETRY is not set -CONFIG_MTD_MAP_BANK_WIDTH_1=y -CONFIG_MTD_MAP_BANK_WIDTH_2=y -CONFIG_MTD_MAP_BANK_WIDTH_4=y -# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set -# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set -# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set -CONFIG_MTD_CFI_I1=y -CONFIG_MTD_CFI_I2=y -# CONFIG_MTD_CFI_I4 is not set -# CONFIG_MTD_CFI_I8 is not set CONFIG_MTD_CFI_INTELEXT=m CONFIG_MTD_CFI_AMDSTD=m -CONFIG_MTD_CFI_AMDSTD_RETRY=0 CONFIG_MTD_CFI_STAA=m -CONFIG_MTD_CFI_UTIL=m # CONFIG_MTD_RAM is not set # CONFIG_MTD_ROM is not set CONFIG_MTD_ABSENT=m +CONFIG_MTD_OBSOLETE_CHIPS=y +CONFIG_MTD_AMDSTD=m +CONFIG_MTD_SHARP=m +CONFIG_MTD_JEDEC=m # # Mapping drivers for chip access @@ -275,11 +257,13 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y CONFIG_MTD_PHYSMAP=m CONFIG_MTD_PHYSMAP_START=0x8000000 CONFIG_MTD_PHYSMAP_LEN=0x4000000 -CONFIG_MTD_PHYSMAP_BANKWIDTH=4 +CONFIG_MTD_PHYSMAP_BUSWIDTH=2 # CONFIG_MTD_SC520CDP is not set +CONFIG_MTD_OCTAGON=m +CONFIG_MTD_VMAX=m CONFIG_MTD_SCx200_DOCFLASH=m CONFIG_MTD_AMD76XROM=m -CONFIG_MTD_ICHXROM=m +CONFIG_MTD_ICH2ROM=m CONFIG_MTD_SCB2_FLASH=m # CONFIG_MTD_L440GX is not set CONFIG_MTD_PCI=m @@ -291,7 +275,6 @@ CONFIG_MTD_PMC551=m CONFIG_MTD_PMC551_BUGFIX=y # CONFIG_MTD_PMC551_DEBUG is not set CONFIG_MTD_SLRAM=m -CONFIG_MTD_PHRAM=m CONFIG_MTD_MTDRAM=m CONFIG_MTDRAM_TOTAL_SIZE=4096 CONFIG_MTDRAM_ERASE_SIZE=128 @@ -304,7 +287,6 @@ CONFIG_MTD_DOC2000=m CONFIG_MTD_DOC2001=m CONFIG_MTD_DOC2001PLUS=m CONFIG_MTD_DOCPROBE=m -CONFIG_MTD_DOCECC=m CONFIG_MTD_DOCPROBE_ADVANCED=y CONFIG_MTD_DOCPROBE_ADDRESS=0x0000 CONFIG_MTD_DOCPROBE_HIGH=y @@ -316,27 +298,6 @@ CONFIG_MTD_DOCPROBE_55AA=y CONFIG_MTD_NAND=m # CONFIG_MTD_NAND_VERIFY_WRITE is not set CONFIG_MTD_NAND_IDS=m -# CONFIG_MTD_NAND_DISKONCHIP is not set - -# -# Bluesmoke - error detection and reporting (RAS) -# -CONFIG_BLUESMOKE=m - -# -# Reporting subsystems -# -# CONFIG_BLUESMOKE_DEBUG is not set -CONFIG_BLUESMOKE_MM_EDAC=m - -# -# Bluesmoke system controller/chipset support -# -CONFIG_BLUESMOKE_AMD76X=m -# CONFIG_BLUESMOKE_E7XXX is not set -# CONFIG_BLUESMOKE_E752X is not set -# CONFIG_BLUESMOKE_I82875P is not set -CONFIG_BLUESMOKE_K8=m # # Parallel port support @@ -483,7 +444,7 @@ CONFIG_SCSI_PROC_FS=y # SCSI support type (disk, tape, CD-ROM) # CONFIG_BLK_DEV_SD=m -CONFIG_SD_IOSTATS=y +CONFIG_SCSI_DUMP=m CONFIG_CHR_DEV_ST=m CONFIG_CHR_DEV_OSST=m CONFIG_BLK_DEV_SR=m @@ -508,6 +469,7 @@ CONFIG_SCSI_FC_ATTRS=m # SCSI low-level drivers # CONFIG_BLK_DEV_3W_XXXX_RAID=m +CONFIG_SCSI_3W_9XXX=m CONFIG_SCSI_ACARD=m CONFIG_SCSI_AACRAID=m CONFIG_SCSI_AIC7XXX=m @@ -526,18 +488,23 @@ CONFIG_AIC79XX_RESET_DELAY_MS=15000 # CONFIG_AIC79XX_DEBUG_ENABLE is not set CONFIG_AIC79XX_DEBUG_MASK=0 CONFIG_AIC79XX_REG_PRETTY_PRINT=y -CONFIG_SCSI_AIC79XX_NEW=m CONFIG_SCSI_ADVANSYS=m CONFIG_MEGARAID_NEWGEN=y CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_MAILBOX=m CONFIG_MEGARAID_LEGACY=m CONFIG_SCSI_SATA=y +CONFIG_SCSI_SATA_AHCI=m CONFIG_SCSI_SATA_SVW=m CONFIG_SCSI_ATA_PIIX=m +CONFIG_SCSI_SATA_NV=m +CONFIG_SCSI_PATA_PDC2027X=m CONFIG_SCSI_SATA_PROMISE=m +CONFIG_SCSI_SATA_QSTOR=m +CONFIG_SCSI_SATA_SX4=m CONFIG_SCSI_SATA_SIL=m CONFIG_SCSI_SATA_SIS=m +CONFIG_SCSI_SATA_ULI=m CONFIG_SCSI_SATA_VIA=m CONFIG_SCSI_SATA_VITESSE=m CONFIG_SCSI_BUSLOGIC=m @@ -574,7 +541,6 @@ CONFIG_SCSI_QLA22XX=m CONFIG_SCSI_QLA2300=m CONFIG_SCSI_QLA2322=m CONFIG_SCSI_QLA6312=m -CONFIG_SCSI_QLA6322=m CONFIG_SCSI_QLA2XXX_FAILOVER=y CONFIG_SCSI_QLA4XXX=m CONFIG_SCSI_QLA4XXX_FAILOVER=y @@ -601,10 +567,11 @@ CONFIG_MD_RAID6=m CONFIG_MD_MULTIPATH=m CONFIG_BLK_DEV_DM=m CONFIG_DM_CRYPT=m -CONFIG_DM_MULTIPATH=m CONFIG_DM_SNAPSHOT=m CONFIG_DM_MIRROR=m CONFIG_DM_ZERO=m +CONFIG_DM_MULTIPATH=m +CONFIG_DM_MULTIPATH_EMC=m CONFIG_DM_FLAKEY=m CONFIG_BLK_DEV_DM_BBR=m @@ -756,6 +723,7 @@ CONFIG_BRIDGE_NETFILTER=y # IP: Netfilter Configuration # CONFIG_IP_NF_CONNTRACK=m +CONFIG_IP_NF_CT_PROTO_SCTP=m CONFIG_IP_NF_FTP=m CONFIG_IP_NF_IRC=m CONFIG_IP_NF_TFTP=m @@ -782,6 +750,7 @@ CONFIG_IP_NF_MATCH_STATE=m CONFIG_IP_NF_MATCH_CONNTRACK=m CONFIG_IP_NF_MATCH_OWNER=m CONFIG_IP_NF_MATCH_PHYSDEV=m +CONFIG_IP_NF_MATCH_SCTP=m CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_NAT=m @@ -801,6 +770,7 @@ CONFIG_IP_NF_TARGET_TOS=m CONFIG_IP_NF_TARGET_ECN=m CONFIG_IP_NF_TARGET_DSCP=m CONFIG_IP_NF_TARGET_MARK=m +CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_NF_TARGET_CLASSIFY=m CONFIG_IP_NF_TARGET_LOG=m CONFIG_IP_NF_TARGET_ULOG=m @@ -1017,8 +987,6 @@ CONFIG_ACENIC=m CONFIG_DL2K=m CONFIG_E1000=m CONFIG_E1000_NAPI=y -CONFIG_E1000_NEW=m -CONFIG_E1000_NEW_NAPI=y CONFIG_NS83820=m CONFIG_HAMACHI=m CONFIG_YELLOWFIN=m @@ -1027,9 +995,7 @@ CONFIG_SIS190=m CONFIG_SK98LIN=m CONFIG_TIGON3=m CONFIG_NET_BROADCOM=m -CONFIG_NET_BROADCOM_NEW=m CONFIG_NET_BCM44=m -CONFIG_TIGON3_NEW=m # # Ethernet (10000 Mbit) @@ -1111,19 +1077,7 @@ CONFIG_3C359=m CONFIG_TMS380TR=m CONFIG_TMSPCI=m CONFIG_ABYSS=m - -# -# Quadrics QsNet -# -CONFIG_QSNET=m -CONFIG_ELAN3=m -CONFIG_ELAN4=m -CONFIG_EP=m -CONFIG_EIP=m -CONFIG_RMS=m -CONFIG_JTAG=m CONFIG_NET_FC=y -CONFIG_NET_LPFC=m CONFIG_SHAPER=m CONFIG_NETCONSOLE=m @@ -1661,6 +1615,7 @@ CONFIG_SENSORS_LM83=m CONFIG_SENSORS_LM85=m CONFIG_SENSORS_LM90=m CONFIG_SENSORS_VIA686A=m +CONFIG_SENSORS_VT1211=m CONFIG_SENSORS_W83781D=m CONFIG_SENSORS_W83L785TS=m CONFIG_SENSORS_W83627HF=m @@ -1921,6 +1876,7 @@ CONFIG_SND_INTEL8X0M=m CONFIG_SND_SONICVIBES=m CONFIG_SND_VIA82XX=m CONFIG_SND_VX222=m +CONFIG_SND_HDA_INTEL=m # # ALSA USB devices @@ -2232,11 +2188,13 @@ CONFIG_JFS_DMAPI=y CONFIG_JFS_STATISTICS=y CONFIG_FS_POSIX_ACL=y CONFIG_XFS_FS=m +CONFIG_XFS_EXPORT=y CONFIG_XFS_RT=y CONFIG_XFS_QUOTA=m CONFIG_XFS_DMAPI=y CONFIG_XFS_SECURITY=y CONFIG_XFS_POSIX_ACL=y +CONFIG_OCFS2_FS=m CONFIG_MINIX_FS=y CONFIG_ROMFS_FS=m CONFIG_DMAPI=m @@ -2279,6 +2237,7 @@ CONFIG_TMPFS=y CONFIG_HUGETLBFS=y CONFIG_HUGETLB_PAGE=y CONFIG_RAMFS=y +CONFIG_CONFIGFS_FS=m CONFIG_RELAYFS_FS=m # CONFIG_KLOG_CHANNEL is not set @@ -2458,6 +2417,7 @@ CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_DEVELOP=y # CONFIG_SECURITY_SELINUX_MLS is not set +CONFIG_SECURITY_SUBDOMAIN=m # # Cryptographic options diff --git a/lustre/kernel_patches/patches/ext3-mballoc2-2.6-suse.patch b/lustre/kernel_patches/patches/ext3-mballoc2-2.6-suse.patch index d38fb54..107de00 100644 --- a/lustre/kernel_patches/patches/ext3-mballoc2-2.6-suse.patch +++ b/lustre/kernel_patches/patches/ext3-mballoc2-2.6-suse.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.5-suse/fs/ext3/mballoc.c +Index: linux-stage/fs/ext3/mballoc.c =================================================================== ---- linux-2.6.5-suse.orig/fs/ext3/mballoc.c 2005-03-02 22:42:20.659360368 +0300 -+++ linux-2.6.5-suse/fs/ext3/mballoc.c 2005-03-11 16:13:13.000000000 +0300 +--- linux-stage.orig/fs/ext3/mballoc.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-stage/fs/ext3/mballoc.c 2005-07-28 16:10:14.951971768 -0400 @@ -0,0 +1,1864 @@ +/* + * Copyright(c) 2003, 2004, 2005, Cluster File Systems, Inc, info@clusterfs.com @@ -1867,10 +1867,10 @@ Index: linux-2.6.5-suse/fs/ext3/mballoc.c + return; +} + -Index: linux-2.6.5-suse/fs/ext3/super.c +Index: linux-stage/fs/ext3/super.c =================================================================== ---- linux-2.6.5-suse.orig/fs/ext3/super.c 2005-02-26 18:40:25.000000000 +0300 -+++ linux-2.6.5-suse/fs/ext3/super.c 2005-02-26 18:40:26.000000000 +0300 +--- linux-stage.orig/fs/ext3/super.c 2005-07-28 16:09:49.624822080 -0400 ++++ linux-stage/fs/ext3/super.c 2005-07-28 16:10:14.952971616 -0400 @@ -389,6 +389,7 @@ struct ext3_super_block *es = sbi->s_es; int i; @@ -1921,10 +1921,10 @@ Index: linux-2.6.5-suse/fs/ext3/super.c return 0; -Index: linux-2.6.5-suse/fs/ext3/Makefile +Index: linux-stage/fs/ext3/Makefile =================================================================== ---- linux-2.6.5-suse.orig/fs/ext3/Makefile 2005-02-26 18:40:25.000000000 +0300 -+++ linux-2.6.5-suse/fs/ext3/Makefile 2005-02-26 18:40:26.000000000 +0300 +--- linux-stage.orig/fs/ext3/Makefile 2005-07-28 16:09:49.623822232 -0400 ++++ linux-stage/fs/ext3/Makefile 2005-07-28 16:10:14.953971464 -0400 @@ -5,7 +5,7 @@ obj-$(CONFIG_EXT3_FS) += ext3.o @@ -1934,10 +1934,10 @@ Index: linux-2.6.5-suse/fs/ext3/Makefile ext3-$(CONFIG_EXT3_FS_XATTR) += xattr.o xattr_user.o xattr_trusted.o ext3-$(CONFIG_EXT3_FS_POSIX_ACL) += acl.o -Index: linux-2.6.5-suse/fs/ext3/balloc.c +Index: linux-stage/fs/ext3/balloc.c =================================================================== ---- linux-2.6.5-suse.orig/fs/ext3/balloc.c 2005-02-02 00:55:47.000000000 +0300 -+++ linux-2.6.5-suse/fs/ext3/balloc.c 2005-02-26 18:40:26.000000000 +0300 +--- linux-stage.orig/fs/ext3/balloc.c 2005-07-28 16:09:46.411310608 -0400 ++++ linux-stage/fs/ext3/balloc.c 2005-07-28 16:10:14.954971312 -0400 @@ -78,7 +78,7 @@ * * Return buffer_head on success or NULL in case of failure. @@ -1965,10 +1965,10 @@ Index: linux-2.6.5-suse/fs/ext3/balloc.c unsigned long goal, int *errp) { struct buffer_head *bitmap_bh = NULL; -Index: linux-2.6.5-suse/fs/ext3/namei.c +Index: linux-stage/fs/ext3/namei.c =================================================================== ---- linux-2.6.5-suse.orig/fs/ext3/namei.c 2005-02-26 18:40:19.000000000 +0300 -+++ linux-2.6.5-suse/fs/ext3/namei.c 2005-02-26 18:40:26.000000000 +0300 +--- linux-stage.orig/fs/ext3/namei.c 2005-07-28 16:09:48.092055096 -0400 ++++ linux-stage/fs/ext3/namei.c 2005-07-28 16:10:14.955971160 -0400 @@ -1640,7 +1640,7 @@ * If the create succeeds, we fill in the inode information * with d_instantiate(). @@ -1978,10 +1978,10 @@ Index: linux-2.6.5-suse/fs/ext3/namei.c struct nameidata *nd) { handle_t *handle; -Index: linux-2.6.5-suse/fs/ext3/inode.c +Index: linux-stage/fs/ext3/inode.c =================================================================== ---- linux-2.6.5-suse.orig/fs/ext3/inode.c 2005-02-26 18:40:25.000000000 +0300 -+++ linux-2.6.5-suse/fs/ext3/inode.c 2005-02-26 18:40:26.000000000 +0300 +--- linux-stage.orig/fs/ext3/inode.c 2005-07-28 16:09:49.622822384 -0400 ++++ linux-stage/fs/ext3/inode.c 2005-07-28 16:10:14.958970704 -0400 @@ -572,7 +572,7 @@ ext3_journal_forget(handle, branch[i].bh); } @@ -2000,7 +2000,7 @@ Index: linux-2.6.5-suse/fs/ext3/inode.c return err; } -@@ -1830,7 +1830,7 @@ +@@ -1835,7 +1835,7 @@ } } @@ -2009,7 +2009,7 @@ Index: linux-2.6.5-suse/fs/ext3/inode.c } /** -@@ -2001,7 +2001,7 @@ +@@ -2006,7 +2006,7 @@ ext3_journal_test_restart(handle, inode); } @@ -2018,11 +2018,11 @@ Index: linux-2.6.5-suse/fs/ext3/inode.c if (parent_bh) { /* -Index: linux-2.6.5-suse/fs/ext3/extents.c +Index: linux-stage/fs/ext3/extents.c =================================================================== ---- linux-2.6.5-suse.orig/fs/ext3/extents.c 2005-02-26 18:40:25.000000000 +0300 -+++ linux-2.6.5-suse/fs/ext3/extents.c 2005-02-26 18:40:26.000000000 +0300 -@@ -774,7 +774,7 @@ +--- linux-stage.orig/fs/ext3/extents.c 2005-07-28 16:09:49.619822840 -0400 ++++ linux-stage/fs/ext3/extents.c 2005-07-28 16:10:14.960970400 -0400 +@@ -771,7 +771,7 @@ for (i = 0; i < depth; i++) { if (!ablocks[i]) continue; @@ -2031,8 +2031,8 @@ Index: linux-2.6.5-suse/fs/ext3/extents.c } } kfree(ablocks); -@@ -1431,7 +1431,7 @@ - path->p_idx->ei_leaf); +@@ -1428,7 +1428,7 @@ + path->p_idx->ei_leaf); bh = sb_find_get_block(tree->inode->i_sb, path->p_idx->ei_leaf); ext3_forget(handle, 1, tree->inode, bh, path->p_idx->ei_leaf); - ext3_free_blocks(handle, tree->inode, path->p_idx->ei_leaf, 1); @@ -2040,7 +2040,7 @@ Index: linux-2.6.5-suse/fs/ext3/extents.c return err; } -@@ -1919,10 +1919,12 @@ +@@ -1913,10 +1913,12 @@ int needed = ext3_remove_blocks_credits(tree, ex, from, to); handle_t *handle = ext3_journal_start(tree->inode, needed); struct buffer_head *bh; @@ -2054,7 +2054,7 @@ Index: linux-2.6.5-suse/fs/ext3/extents.c if (from >= ex->ee_block && to == ex->ee_block + ex->ee_len - 1) { /* tail removal */ unsigned long num, start; -@@ -1934,7 +1936,7 @@ +@@ -1928,7 +1930,7 @@ bh = sb_find_get_block(tree->inode->i_sb, start + i); ext3_forget(handle, 0, tree->inode, bh, start + i); } @@ -2062,12 +2062,12 @@ Index: linux-2.6.5-suse/fs/ext3/extents.c + ext3_free_blocks(handle, tree->inode, start, num, metadata); } else if (from == ex->ee_block && to <= ex->ee_block + ex->ee_len - 1) { printk("strange request: removal %lu-%lu from %u:%u\n", - from, to, ex->ee_block, ex->ee_len); -Index: linux-2.6.5-suse/fs/ext3/xattr.c + from, to, ex->ee_block, ex->ee_len); +Index: linux-stage/fs/ext3/xattr.c =================================================================== ---- linux-2.6.5-suse.orig/fs/ext3/xattr.c 2005-02-26 18:40:22.000000000 +0300 -+++ linux-2.6.5-suse/fs/ext3/xattr.c 2005-02-26 18:40:26.000000000 +0300 -@@ -1366,7 +1366,7 @@ +--- linux-stage.orig/fs/ext3/xattr.c 2005-07-28 16:09:48.855938968 -0400 ++++ linux-stage/fs/ext3/xattr.c 2005-07-28 16:10:43.588618336 -0400 +@@ -1371,7 +1371,7 @@ new_bh = sb_getblk(sb, block); if (!new_bh) { getblk_failed: @@ -2076,7 +2076,7 @@ Index: linux-2.6.5-suse/fs/ext3/xattr.c error = -EIO; goto cleanup; } -@@ -1408,7 +1408,7 @@ +@@ -1411,7 +1411,7 @@ if (HDR(old_bh)->h_refcount == cpu_to_le32(1)) { /* Free the old block. */ ea_bdebug(old_bh, "freeing"); @@ -2085,19 +2085,19 @@ Index: linux-2.6.5-suse/fs/ext3/xattr.c /* ext3_forget() calls bforget() for us, but we let our caller release old_bh, so we need to -@@ -1504,7 +1504,7 @@ - lock_buffer(bh); - if (HDR(bh)->h_refcount == cpu_to_le32(1)) { - ext3_xattr_cache_remove(bh); +@@ -1519,7 +1519,7 @@ + mb_cache_entry_free(ce); + ce = NULL; + } - ext3_free_blocks(handle, inode, EXT3_I(inode)->i_file_acl, 1); + ext3_free_blocks(handle, inode, EXT3_I(inode)->i_file_acl, 1, 1); get_bh(bh); ext3_forget(handle, 1, inode, bh, EXT3_I(inode)->i_file_acl); } else { -Index: linux-2.6.5-suse/include/linux/ext3_fs.h +Index: linux-stage/include/linux/ext3_fs.h =================================================================== ---- linux-2.6.5-suse.orig/include/linux/ext3_fs.h 2005-02-26 18:40:25.000000000 +0300 -+++ linux-2.6.5-suse/include/linux/ext3_fs.h 2005-02-26 18:40:26.000000000 +0300 +--- linux-stage.orig/include/linux/ext3_fs.h 2005-07-28 16:09:49.626821776 -0400 ++++ linux-stage/include/linux/ext3_fs.h 2005-07-28 16:10:14.962970096 -0400 @@ -57,6 +57,14 @@ #define ext3_debug(f, a...) do {} while (0) #endif @@ -2121,7 +2121,7 @@ Index: linux-2.6.5-suse/include/linux/ext3_fs.h /* Compatibility, for having both ext2_fs.h and ext3_fs.h included at once */ #ifndef clear_opt -@@ -698,7 +707,7 @@ +@@ -700,7 +709,7 @@ extern unsigned long ext3_bg_num_gdb(struct super_block *sb, int group); extern int ext3_new_block (handle_t *, struct inode *, unsigned long, int *); extern void ext3_free_blocks (handle_t *, struct inode *, unsigned long, @@ -2130,7 +2130,7 @@ Index: linux-2.6.5-suse/include/linux/ext3_fs.h extern unsigned long ext3_count_free_blocks (struct super_block *); extern void ext3_check_blocks_bitmap (struct super_block *); extern struct ext3_group_desc * ext3_get_group_desc(struct super_block * sb, -@@ -820,6 +829,37 @@ +@@ -822,6 +831,37 @@ extern int ext3_ext_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg); @@ -2168,10 +2168,10 @@ Index: linux-2.6.5-suse/include/linux/ext3_fs.h #endif /* __KERNEL__ */ #define EXT3_IOC_CREATE_INUM _IOW('f', 5, long) -Index: linux-2.6.5-suse/include/linux/ext3_fs_sb.h +Index: linux-stage/include/linux/ext3_fs_sb.h =================================================================== ---- linux-2.6.5-suse.orig/include/linux/ext3_fs_sb.h 2005-02-26 18:40:20.000000000 +0300 -+++ linux-2.6.5-suse/include/linux/ext3_fs_sb.h 2005-02-26 18:40:26.000000000 +0300 +--- linux-stage.orig/include/linux/ext3_fs_sb.h 2005-07-28 16:09:48.346016488 -0400 ++++ linux-stage/include/linux/ext3_fs_sb.h 2005-07-28 16:10:14.963969944 -0400 @@ -23,10 +23,30 @@ #define EXT_INCLUDE #include diff --git a/lustre/kernel_patches/patches/qsnet-suse-2.6.patch b/lustre/kernel_patches/patches/qsnet-suse-2.6.patch index d4d9be1..33d453c 100644 --- a/lustre/kernel_patches/patches/qsnet-suse-2.6.patch +++ b/lustre/kernel_patches/patches/qsnet-suse-2.6.patch @@ -1,8 +1,8 @@ -Index: linux-2.6.5/arch/i386/defconfig +Index: linux-2.6.5-7.191/arch/i386/defconfig =================================================================== ---- linux-2.6.5.orig/arch/i386/defconfig 2005-02-01 16:56:13.000000000 -0500 -+++ linux-2.6.5/arch/i386/defconfig 2005-05-11 12:10:12.362944128 -0400 -@@ -137,6 +137,8 @@ +--- linux-2.6.5-7.191.orig/arch/i386/defconfig 2005-06-28 12:24:26.000000000 -0400 ++++ linux-2.6.5-7.191/arch/i386/defconfig 2005-07-28 14:52:52.764691504 -0400 +@@ -139,6 +139,8 @@ CONFIG_EFI=y CONFIG_BOOT_IOREMAP=y CONFIG_REGPARM=y @@ -11,11 +11,11 @@ Index: linux-2.6.5/arch/i386/defconfig # # Special options -Index: linux-2.6.5/arch/i386/Kconfig +Index: linux-2.6.5-7.191/arch/i386/Kconfig =================================================================== ---- linux-2.6.5.orig/arch/i386/Kconfig 2005-05-11 12:10:10.831176992 -0400 -+++ linux-2.6.5/arch/i386/Kconfig 2005-05-11 12:10:12.363943976 -0400 -@@ -1024,6 +1024,9 @@ +--- linux-2.6.5-7.191.orig/arch/i386/Kconfig 2005-06-28 12:24:15.000000000 -0400 ++++ linux-2.6.5-7.191/arch/i386/Kconfig 2005-07-28 14:52:52.765691352 -0400 +@@ -1030,6 +1030,9 @@ a work-around for a number of buggy BIOSes. Switch this option on if your computer crashes instead of powering off properly. @@ -25,10 +25,10 @@ Index: linux-2.6.5/arch/i386/Kconfig endmenu source "arch/i386/kernel/cpu/cpufreq/Kconfig" -Index: linux-2.6.5/arch/i386/mm/hugetlbpage.c +Index: linux-2.6.5-7.191/arch/i386/mm/hugetlbpage.c =================================================================== ---- linux-2.6.5.orig/arch/i386/mm/hugetlbpage.c 2005-02-01 16:56:06.000000000 -0500 -+++ linux-2.6.5/arch/i386/mm/hugetlbpage.c 2005-05-11 12:10:12.364943824 -0400 +--- linux-2.6.5-7.191.orig/arch/i386/mm/hugetlbpage.c 2005-06-28 12:24:09.000000000 -0400 ++++ linux-2.6.5-7.191/arch/i386/mm/hugetlbpage.c 2005-07-28 14:52:52.766691200 -0400 @@ -16,6 +16,7 @@ #include #include @@ -45,11 +45,11 @@ Index: linux-2.6.5/arch/i386/mm/hugetlbpage.c unmap_hugepage_range(vma, start, start + length); spin_unlock(&mm->page_table_lock); } -Index: linux-2.6.5/arch/ia64/defconfig +Index: linux-2.6.5-7.191/arch/ia64/defconfig =================================================================== ---- linux-2.6.5.orig/arch/ia64/defconfig 2005-02-01 16:56:13.000000000 -0500 -+++ linux-2.6.5/arch/ia64/defconfig 2005-05-11 12:10:12.365943672 -0400 -@@ -100,6 +100,8 @@ +--- linux-2.6.5-7.191.orig/arch/ia64/defconfig 2005-06-28 12:24:26.000000000 -0400 ++++ linux-2.6.5-7.191/arch/ia64/defconfig 2005-07-28 14:52:52.767691048 -0400 +@@ -103,6 +103,8 @@ CONFIG_EFI_VARS=y CONFIG_BINFMT_ELF=y CONFIG_BINFMT_MISC=m @@ -58,11 +58,11 @@ Index: linux-2.6.5/arch/ia64/defconfig # # Power management and ACPI -Index: linux-2.6.5/arch/ia64/Kconfig +Index: linux-2.6.5-7.191/arch/ia64/Kconfig =================================================================== ---- linux-2.6.5.orig/arch/ia64/Kconfig 2005-02-01 16:55:45.000000000 -0500 -+++ linux-2.6.5/arch/ia64/Kconfig 2005-05-11 12:10:12.366943520 -0400 -@@ -315,6 +315,8 @@ +--- linux-2.6.5-7.191.orig/arch/ia64/Kconfig 2005-06-28 12:24:20.000000000 -0400 ++++ linux-2.6.5-7.191/arch/ia64/Kconfig 2005-07-28 14:52:52.768690896 -0400 +@@ -323,6 +323,8 @@ To use this option, you have to check that the "/proc file system support" (CONFIG_PROC_FS) is enabled, too. @@ -71,10 +71,10 @@ Index: linux-2.6.5/arch/ia64/Kconfig source "fs/Kconfig.binfmt" endmenu -Index: linux-2.6.5/arch/ia64/mm/hugetlbpage.c +Index: linux-2.6.5-7.191/arch/ia64/mm/hugetlbpage.c =================================================================== ---- linux-2.6.5.orig/arch/ia64/mm/hugetlbpage.c 2005-02-01 16:55:55.000000000 -0500 -+++ linux-2.6.5/arch/ia64/mm/hugetlbpage.c 2005-05-11 12:10:12.367943368 -0400 +--- linux-2.6.5-7.191.orig/arch/ia64/mm/hugetlbpage.c 2005-06-28 12:24:04.000000000 -0400 ++++ linux-2.6.5-7.191/arch/ia64/mm/hugetlbpage.c 2005-07-28 14:52:52.768690896 -0400 @@ -19,6 +19,7 @@ #include #include @@ -91,11 +91,11 @@ Index: linux-2.6.5/arch/ia64/mm/hugetlbpage.c unmap_hugepage_range(vma, start, start + length); spin_unlock(&mm->page_table_lock); } -Index: linux-2.6.5/arch/x86_64/defconfig +Index: linux-2.6.5-7.191/arch/x86_64/defconfig =================================================================== ---- linux-2.6.5.orig/arch/x86_64/defconfig 2005-02-01 16:56:13.000000000 -0500 -+++ linux-2.6.5/arch/x86_64/defconfig 2005-05-11 12:10:12.368943216 -0400 -@@ -89,6 +89,8 @@ +--- linux-2.6.5-7.191.orig/arch/x86_64/defconfig 2005-06-28 12:24:26.000000000 -0400 ++++ linux-2.6.5-7.191/arch/x86_64/defconfig 2005-07-28 14:52:52.770690592 -0400 +@@ -91,6 +91,8 @@ CONFIG_GART_IOMMU=y CONFIG_SWIOTLB=y CONFIG_X86_MCE=y @@ -104,11 +104,11 @@ Index: linux-2.6.5/arch/x86_64/defconfig # # Power management options -Index: linux-2.6.5/arch/x86_64/Kconfig +Index: linux-2.6.5-7.191/arch/x86_64/Kconfig =================================================================== ---- linux-2.6.5.orig/arch/x86_64/Kconfig 2005-05-11 12:10:11.101135952 -0400 -+++ linux-2.6.5/arch/x86_64/Kconfig 2005-05-11 12:10:12.368943216 -0400 -@@ -329,6 +329,9 @@ +--- linux-2.6.5-7.191.orig/arch/x86_64/Kconfig 2005-06-28 12:24:23.000000000 -0400 ++++ linux-2.6.5-7.191/arch/x86_64/Kconfig 2005-07-28 14:52:52.770690592 -0400 +@@ -341,6 +341,9 @@ source "arch/x86_64/kernel/cpufreq/Kconfig" @@ -118,10 +118,10 @@ Index: linux-2.6.5/arch/x86_64/Kconfig endmenu menu "Bus options (PCI etc.)" -Index: linux-2.6.5/Documentation/vm/ioproc.txt +Index: linux-2.6.5-7.191/Documentation/vm/ioproc.txt =================================================================== ---- linux-2.6.5.orig/Documentation/vm/ioproc.txt 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/Documentation/vm/ioproc.txt 2005-05-11 12:10:12.369943064 -0400 +--- linux-2.6.5-7.191.orig/Documentation/vm/ioproc.txt 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/Documentation/vm/ioproc.txt 2005-07-28 14:52:52.771690440 -0400 @@ -0,0 +1,468 @@ +Linux IOPROC patch overview +=========================== @@ -591,10 +591,10 @@ Index: linux-2.6.5/Documentation/vm/ioproc.txt + + +-- Last update DavidAddison - 17 Aug 2004 -Index: linux-2.6.5/drivers/net/qsnet/eip/eip_linux.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/eip/eip_linux.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/eip/eip_linux.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/eip/eip_linux.c 2005-05-11 12:10:12.372942608 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/eip/eip_linux.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/eip/eip_linux.c 2005-07-28 14:52:52.774689984 -0400 @@ -0,0 +1,1576 @@ +/* + * Copyright (c) 2003 by Quadrics Ltd. @@ -2172,10 +2172,10 @@ Index: linux-2.6.5/drivers/net/qsnet/eip/eip_linux.c + * c-file-style: "linux" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/eip/eip_linux.h +Index: linux-2.6.5-7.191/drivers/net/qsnet/eip/eip_linux.h =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/eip/eip_linux.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/eip/eip_linux.h 2005-05-11 12:10:12.373942456 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/eip/eip_linux.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/eip/eip_linux.h 2005-07-28 14:52:52.775689832 -0400 @@ -0,0 +1,399 @@ +/* + * Copyright (c) 2003 by Quadrics Ltd. @@ -2576,10 +2576,10 @@ Index: linux-2.6.5/drivers/net/qsnet/eip/eip_linux.h + * c-file-style: "linux" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/eip/eip_stats.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/eip/eip_stats.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/eip/eip_stats.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/eip/eip_stats.c 2005-05-11 12:10:12.374942304 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/eip/eip_stats.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/eip/eip_stats.c 2005-07-28 14:52:52.776689680 -0400 @@ -0,0 +1,375 @@ +/* + * Copyright (c) 2003 by Quadrics Ltd. @@ -2956,10 +2956,10 @@ Index: linux-2.6.5/drivers/net/qsnet/eip/eip_stats.c + * c-file-style: "linux" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/eip/eip_stats.h +Index: linux-2.6.5-7.191/drivers/net/qsnet/eip/eip_stats.h =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/eip/eip_stats.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/eip/eip_stats.h 2005-05-11 12:10:12.374942304 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/eip/eip_stats.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/eip/eip_stats.h 2005-07-28 14:52:52.776689680 -0400 @@ -0,0 +1,22 @@ +/* + * Copyright (c) 2003 by Quadrics Ltd. @@ -2983,10 +2983,10 @@ Index: linux-2.6.5/drivers/net/qsnet/eip/eip_stats.h +void eip_stats_dump(void); + +#endif /* __EIP_STATS_H */ -Index: linux-2.6.5/drivers/net/qsnet/eip/Makefile +Index: linux-2.6.5-7.191/drivers/net/qsnet/eip/Makefile =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/eip/Makefile 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/eip/Makefile 2005-05-11 12:10:12.374942304 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/eip/Makefile 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/eip/Makefile 2005-07-28 14:52:52.776689680 -0400 @@ -0,0 +1,15 @@ +# +# Makefile for Quadrics QsNet @@ -3003,10 +3003,10 @@ Index: linux-2.6.5/drivers/net/qsnet/eip/Makefile +eip-objs := eip_linux.o eip_stats.o + +EXTRA_CFLAGS += -DDEBUG -DDEBUG_PRINTF -DDEBUG_ASSERT -Index: linux-2.6.5/drivers/net/qsnet/eip/Makefile.conf +Index: linux-2.6.5-7.191/drivers/net/qsnet/eip/Makefile.conf =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/eip/Makefile.conf 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/eip/Makefile.conf 2005-05-11 12:10:12.375942152 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/eip/Makefile.conf 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/eip/Makefile.conf 2005-07-28 14:52:52.777689528 -0400 @@ -0,0 +1,10 @@ +# Flags for generating QsNet Linux Kernel Makefiles +MODNAME = eip.o @@ -3018,16 +3018,16 @@ Index: linux-2.6.5/drivers/net/qsnet/eip/Makefile.conf +# EXTRALINES START + +# EXTRALINES END -Index: linux-2.6.5/drivers/net/qsnet/eip/quadrics_version.h +Index: linux-2.6.5-7.191/drivers/net/qsnet/eip/quadrics_version.h =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/eip/quadrics_version.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/eip/quadrics_version.h 2005-05-11 12:10:12.375942152 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/eip/quadrics_version.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/eip/quadrics_version.h 2005-07-28 14:52:52.777689528 -0400 @@ -0,0 +1 @@ +#define QUADRICS_VERSION "4.31qsnet" -Index: linux-2.6.5/drivers/net/qsnet/elan/bitmap.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/elan/bitmap.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/elan/bitmap.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/elan/bitmap.c 2005-05-11 12:10:12.375942152 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/elan/bitmap.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/elan/bitmap.c 2005-07-28 14:52:52.777689528 -0400 @@ -0,0 +1,287 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -3316,10 +3316,10 @@ Index: linux-2.6.5/drivers/net/qsnet/elan/bitmap.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/elan/capability.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/elan/capability.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/elan/capability.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/elan/capability.c 2005-05-11 12:10:12.376942000 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/elan/capability.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/elan/capability.c 2005-07-28 14:52:52.779689224 -0400 @@ -0,0 +1,628 @@ +/* + * Copyright (c) 2003 by Quadrics Ltd. @@ -3949,10 +3949,10 @@ Index: linux-2.6.5/drivers/net/qsnet/elan/capability.c + * c-file-style: "linux" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/elan/capability_general.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/elan/capability_general.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/elan/capability_general.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/elan/capability_general.c 2005-05-11 12:10:12.377941848 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/elan/capability_general.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/elan/capability_general.c 2005-07-28 14:52:52.779689224 -0400 @@ -0,0 +1,446 @@ +/* + * Copyright (c) 2003 by Quadrics Ltd. @@ -4400,10 +4400,10 @@ Index: linux-2.6.5/drivers/net/qsnet/elan/capability_general.c + * c-file-style: "linux" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/elan/device.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/elan/device.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/elan/device.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/elan/device.c 2005-05-11 12:10:12.378941696 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/elan/device.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/elan/device.c 2005-07-28 14:52:52.780689072 -0400 @@ -0,0 +1,147 @@ +/* + * Copyright (c) 2003 by Quadrics Ltd. @@ -4552,10 +4552,10 @@ Index: linux-2.6.5/drivers/net/qsnet/elan/device.c + * c-file-style: "linux" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/elan/devinfo.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/elan/devinfo.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/elan/devinfo.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/elan/devinfo.c 2005-05-11 12:10:12.378941696 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/elan/devinfo.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/elan/devinfo.c 2005-07-28 14:52:52.780689072 -0400 @@ -0,0 +1,78 @@ +/* + * Copyright (c) 2003 by Quadrics Ltd. @@ -4635,10 +4635,10 @@ Index: linux-2.6.5/drivers/net/qsnet/elan/devinfo.c + * c-file-style: "linux" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/elan/elanmod.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/elan/elanmod.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/elan/elanmod.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/elan/elanmod.c 2005-05-11 12:10:12.378941696 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/elan/elanmod.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/elan/elanmod.c 2005-07-28 14:52:52.781688920 -0400 @@ -0,0 +1,149 @@ +/* + * Copyright (c) 2003 by Quadrics Ltd. @@ -4789,10 +4789,10 @@ Index: linux-2.6.5/drivers/net/qsnet/elan/elanmod.c + * c-file-style: "linux" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/elan/elanmod_linux.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/elan/elanmod_linux.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/elan/elanmod_linux.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/elan/elanmod_linux.c 2005-05-11 12:10:12.379941544 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/elan/elanmod_linux.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/elan/elanmod_linux.c 2005-07-28 14:52:52.781688920 -0400 @@ -0,0 +1,410 @@ +/* + * Copyright (c) 2003 by Quadrics Ltd. @@ -5204,10 +5204,10 @@ Index: linux-2.6.5/drivers/net/qsnet/elan/elanmod_linux.c + * c-file-style: "linux" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/elan/Makefile +Index: linux-2.6.5-7.191/drivers/net/qsnet/elan/Makefile =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/elan/Makefile 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/elan/Makefile 2005-05-11 12:10:12.379941544 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/elan/Makefile 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/elan/Makefile 2005-07-28 14:52:52.782688768 -0400 @@ -0,0 +1,15 @@ +# +# Makefile for Quadrics QsNet @@ -5224,10 +5224,10 @@ Index: linux-2.6.5/drivers/net/qsnet/elan/Makefile +elan-objs := elanmod.o device.o stats.o devinfo.o capability.o elanmod_linux.o capability_general.o bitmap.o + +EXTRA_CFLAGS += -DDEBUG -DDEBUG_PRINTF -DDEBUG_ASSERT -Index: linux-2.6.5/drivers/net/qsnet/elan/Makefile.conf +Index: linux-2.6.5-7.191/drivers/net/qsnet/elan/Makefile.conf =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/elan/Makefile.conf 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/elan/Makefile.conf 2005-05-11 12:10:12.380941392 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/elan/Makefile.conf 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/elan/Makefile.conf 2005-07-28 14:52:52.782688768 -0400 @@ -0,0 +1,10 @@ +# Flags for generating QsNet Linux Kernel Makefiles +MODNAME = elan.o @@ -5239,16 +5239,16 @@ Index: linux-2.6.5/drivers/net/qsnet/elan/Makefile.conf +# EXTRALINES START + +# EXTRALINES END -Index: linux-2.6.5/drivers/net/qsnet/elan/quadrics_version.h +Index: linux-2.6.5-7.191/drivers/net/qsnet/elan/quadrics_version.h =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/elan/quadrics_version.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/elan/quadrics_version.h 2005-05-11 12:10:12.380941392 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/elan/quadrics_version.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/elan/quadrics_version.h 2005-07-28 14:52:52.782688768 -0400 @@ -0,0 +1 @@ +#define QUADRICS_VERSION "4.31qsnet" -Index: linux-2.6.5/drivers/net/qsnet/elan/stats.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/elan/stats.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/elan/stats.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/elan/stats.c 2005-05-11 12:10:12.380941392 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/elan/stats.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/elan/stats.c 2005-07-28 14:52:52.783688616 -0400 @@ -0,0 +1,277 @@ +/* + * Copyright (c) 2003 by Quadrics Ltd. @@ -5527,10 +5527,10 @@ Index: linux-2.6.5/drivers/net/qsnet/elan/stats.c + * c-file-style: "linux" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/elan3/context.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/elan3/context.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/elan3/context.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/elan3/context.c 2005-05-11 12:10:12.384940784 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/elan3/context.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/elan3/context.c 2005-07-28 14:52:52.786688160 -0400 @@ -0,0 +1,2101 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -7633,10 +7633,10 @@ Index: linux-2.6.5/drivers/net/qsnet/elan3/context.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/elan3/context_linux.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/elan3/context_linux.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/elan3/context_linux.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/elan3/context_linux.c 2005-05-11 12:10:12.398938656 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/elan3/context_linux.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/elan3/context_linux.c 2005-07-28 14:52:52.787688008 -0400 @@ -0,0 +1,229 @@ +/* + * Copyright (c) 2003 by Quadrics Limited. @@ -7867,10 +7867,10 @@ Index: linux-2.6.5/drivers/net/qsnet/elan3/context_linux.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/elan3/cproc.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/elan3/cproc.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/elan3/cproc.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/elan3/cproc.c 2005-05-11 12:10:12.399938504 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/elan3/cproc.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/elan3/cproc.c 2005-07-28 14:52:52.788687856 -0400 @@ -0,0 +1,539 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -8411,10 +8411,10 @@ Index: linux-2.6.5/drivers/net/qsnet/elan3/cproc.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/elan3/dproc.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/elan3/dproc.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/elan3/dproc.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/elan3/dproc.c 2005-05-11 12:10:12.400938352 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/elan3/dproc.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/elan3/dproc.c 2005-07-28 14:52:52.789687704 -0400 @@ -0,0 +1,553 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -8969,10 +8969,10 @@ Index: linux-2.6.5/drivers/net/qsnet/elan3/dproc.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/elan3/elan3mmu_generic.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/elan3/elan3mmu_generic.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/elan3/elan3mmu_generic.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/elan3/elan3mmu_generic.c 2005-05-11 12:10:12.405937592 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/elan3/elan3mmu_generic.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/elan3/elan3mmu_generic.c 2005-07-28 14:52:52.795686792 -0400 @@ -0,0 +1,3255 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -12229,10 +12229,10 @@ Index: linux-2.6.5/drivers/net/qsnet/elan3/elan3mmu_generic.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/elan3/elan3mmu_linux.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/elan3/elan3mmu_linux.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/elan3/elan3mmu_linux.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/elan3/elan3mmu_linux.c 2005-05-11 12:10:12.406937440 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/elan3/elan3mmu_linux.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/elan3/elan3mmu_linux.c 2005-07-28 14:52:52.795686792 -0400 @@ -0,0 +1,284 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -12518,10 +12518,10 @@ Index: linux-2.6.5/drivers/net/qsnet/elan3/elan3mmu_linux.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/elan3/elan3ops.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/elan3/elan3ops.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/elan3/elan3ops.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/elan3/elan3ops.c 2005-05-11 12:10:12.407937288 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/elan3/elan3ops.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/elan3/elan3ops.c 2005-07-28 14:52:52.796686640 -0400 @@ -0,0 +1,170 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -12693,10 +12693,10 @@ Index: linux-2.6.5/drivers/net/qsnet/elan3/elan3ops.c + * c-file-style: "linux" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/elan3/elandebug.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/elan3/elandebug.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/elan3/elandebug.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/elan3/elandebug.c 2005-05-11 12:10:12.407937288 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/elan3/elandebug.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/elan3/elandebug.c 2005-07-28 14:52:52.796686640 -0400 @@ -0,0 +1,151 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -12849,10 +12849,10 @@ Index: linux-2.6.5/drivers/net/qsnet/elan3/elandebug.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/elan3/elandev_generic.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/elan3/elandev_generic.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/elan3/elandev_generic.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/elan3/elandev_generic.c 2005-05-11 12:10:12.410936832 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/elan3/elandev_generic.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/elan3/elandev_generic.c 2005-07-28 14:52:52.799686184 -0400 @@ -0,0 +1,1862 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -14716,10 +14716,10 @@ Index: linux-2.6.5/drivers/net/qsnet/elan3/elandev_generic.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/elan3/elandev_linux.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/elan3/elandev_linux.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/elan3/elandev_linux.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/elan3/elandev_linux.c 2005-05-11 12:10:12.414936224 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/elan3/elandev_linux.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/elan3/elandev_linux.c 2005-07-28 14:52:52.803685576 -0400 @@ -0,0 +1,2358 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -17079,10 +17079,10 @@ Index: linux-2.6.5/drivers/net/qsnet/elan3/elandev_linux.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/elan3/elansyscall.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/elan3/elansyscall.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/elan3/elansyscall.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/elan3/elansyscall.c 2005-05-11 12:10:12.416935920 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/elan3/elansyscall.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/elan3/elansyscall.c 2005-07-28 14:52:52.805685272 -0400 @@ -0,0 +1,1230 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -18314,10 +18314,10 @@ Index: linux-2.6.5/drivers/net/qsnet/elan3/elansyscall.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/elan3/eventcookie.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/elan3/eventcookie.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/elan3/eventcookie.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/elan3/eventcookie.c 2005-05-11 12:10:12.416935920 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/elan3/eventcookie.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/elan3/eventcookie.c 2005-07-28 14:52:52.806685120 -0400 @@ -0,0 +1,324 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -18643,10 +18643,10 @@ Index: linux-2.6.5/drivers/net/qsnet/elan3/eventcookie.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/elan3/iproc.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/elan3/iproc.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/elan3/iproc.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/elan3/iproc.c 2005-05-11 12:10:12.418935616 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/elan3/iproc.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/elan3/iproc.c 2005-07-28 14:52:52.808684816 -0400 @@ -0,0 +1,925 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -19573,10 +19573,10 @@ Index: linux-2.6.5/drivers/net/qsnet/elan3/iproc.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/elan3/Makefile +Index: linux-2.6.5-7.191/drivers/net/qsnet/elan3/Makefile =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/elan3/Makefile 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/elan3/Makefile 2005-05-11 12:10:12.418935616 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/elan3/Makefile 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/elan3/Makefile 2005-07-28 14:52:52.808684816 -0400 @@ -0,0 +1,15 @@ +# +# Makefile for Quadrics QsNet @@ -19593,10 +19593,10 @@ Index: linux-2.6.5/drivers/net/qsnet/elan3/Makefile +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 -Index: linux-2.6.5/drivers/net/qsnet/elan3/Makefile.conf +Index: linux-2.6.5-7.191/drivers/net/qsnet/elan3/Makefile.conf =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/elan3/Makefile.conf 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/elan3/Makefile.conf 2005-05-11 12:10:12.419935464 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/elan3/Makefile.conf 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/elan3/Makefile.conf 2005-07-28 14:52:52.808684816 -0400 @@ -0,0 +1,10 @@ +# Flags for generating QsNet Linux Kernel Makefiles +MODNAME = elan3.o @@ -19608,10 +19608,10 @@ Index: linux-2.6.5/drivers/net/qsnet/elan3/Makefile.conf +# EXTRALINES START + +# EXTRALINES END -Index: linux-2.6.5/drivers/net/qsnet/elan3/minames.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/elan3/minames.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/elan3/minames.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/elan3/minames.c 2005-05-11 12:10:12.419935464 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/elan3/minames.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/elan3/minames.c 2005-07-28 14:52:52.809684664 -0400 @@ -0,0 +1,38 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -19651,10 +19651,10 @@ Index: linux-2.6.5/drivers/net/qsnet/elan3/minames.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/elan3/network_error.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/elan3/network_error.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/elan3/network_error.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/elan3/network_error.c 2005-05-11 12:10:12.420935312 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/elan3/network_error.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/elan3/network_error.c 2005-07-28 14:52:52.810684512 -0400 @@ -0,0 +1,777 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -20433,10 +20433,10 @@ Index: linux-2.6.5/drivers/net/qsnet/elan3/network_error.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/elan3/procfs_linux.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/elan3/procfs_linux.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/elan3/procfs_linux.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/elan3/procfs_linux.c 2005-05-11 12:10:12.421935160 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/elan3/procfs_linux.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/elan3/procfs_linux.c 2005-07-28 14:52:52.810684512 -0400 @@ -0,0 +1,195 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -20633,16 +20633,16 @@ Index: linux-2.6.5/drivers/net/qsnet/elan3/procfs_linux.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/elan3/quadrics_version.h +Index: linux-2.6.5-7.191/drivers/net/qsnet/elan3/quadrics_version.h =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/elan3/quadrics_version.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/elan3/quadrics_version.h 2005-05-11 12:10:12.421935160 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/elan3/quadrics_version.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/elan3/quadrics_version.h 2005-07-28 14:52:52.811684360 -0400 @@ -0,0 +1 @@ +#define QUADRICS_VERSION "4.31qsnet" -Index: linux-2.6.5/drivers/net/qsnet/elan3/routecheck.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/elan3/routecheck.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/elan3/routecheck.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/elan3/routecheck.c 2005-05-11 12:10:12.422935008 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/elan3/routecheck.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/elan3/routecheck.c 2005-07-28 14:52:52.811684360 -0400 @@ -0,0 +1,313 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -20957,10 +20957,10 @@ Index: linux-2.6.5/drivers/net/qsnet/elan3/routecheck.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/elan3/route_table.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/elan3/route_table.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/elan3/route_table.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/elan3/route_table.c 2005-05-11 12:10:12.423934856 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/elan3/route_table.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/elan3/route_table.c 2005-07-28 14:52:52.812684208 -0400 @@ -0,0 +1,560 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -21522,10 +21522,10 @@ Index: linux-2.6.5/drivers/net/qsnet/elan3/route_table.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/elan3/sdram.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/elan3/sdram.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/elan3/sdram.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/elan3/sdram.c 2005-05-11 12:10:12.436932880 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/elan3/sdram.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/elan3/sdram.c 2005-07-28 14:52:52.814683904 -0400 @@ -0,0 +1,807 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -22334,10 +22334,10 @@ Index: linux-2.6.5/drivers/net/qsnet/elan3/sdram.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/elan3/tproc.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/elan3/tproc.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/elan3/tproc.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/elan3/tproc.c 2005-05-11 12:10:12.438932576 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/elan3/tproc.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/elan3/tproc.c 2005-07-28 14:52:52.815683752 -0400 @@ -0,0 +1,778 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -23117,10 +23117,10 @@ Index: linux-2.6.5/drivers/net/qsnet/elan3/tproc.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/elan3/tprocinsts.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/elan3/tprocinsts.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/elan3/tprocinsts.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/elan3/tprocinsts.c 2005-05-11 12:10:12.438932576 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/elan3/tprocinsts.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/elan3/tprocinsts.c 2005-07-28 14:52:52.816683600 -0400 @@ -0,0 +1,401 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -23523,10 +23523,10 @@ Index: linux-2.6.5/drivers/net/qsnet/elan3/tprocinsts.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/elan3/tproc_linux.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/elan3/tproc_linux.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/elan3/tproc_linux.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/elan3/tproc_linux.c 2005-05-11 13:24:43.188275368 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/elan3/tproc_linux.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/elan3/tproc_linux.c 2005-07-28 14:52:52.817683448 -0400 @@ -0,0 +1,215 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -23743,10 +23743,10 @@ Index: linux-2.6.5/drivers/net/qsnet/elan3/tproc_linux.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/elan3/virtual_process.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/elan3/virtual_process.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/elan3/virtual_process.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/elan3/virtual_process.c 2005-05-11 12:10:12.440932272 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/elan3/virtual_process.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/elan3/virtual_process.c 2005-07-28 14:52:52.818683296 -0400 @@ -0,0 +1,884 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -24632,10 +24632,10 @@ Index: linux-2.6.5/drivers/net/qsnet/elan3/virtual_process.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/elan4/debug.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/elan4/debug.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/elan4/debug.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/elan4/debug.c 2005-05-11 12:10:12.441932120 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/elan4/debug.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/elan4/debug.c 2005-07-28 14:52:52.819683144 -0400 @@ -0,0 +1,94 @@ +/* + * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd. @@ -24731,10 +24731,10 @@ Index: linux-2.6.5/drivers/net/qsnet/elan4/debug.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/elan4/device.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/elan4/device.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/elan4/device.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/elan4/device.c 2005-05-11 12:10:12.446931360 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/elan4/device.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/elan4/device.c 2005-07-28 14:52:52.824682384 -0400 @@ -0,0 +1,2916 @@ +/* + * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd. @@ -27652,10 +27652,10 @@ Index: linux-2.6.5/drivers/net/qsnet/elan4/device.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/elan4/device_Linux.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/elan4/device_Linux.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/elan4/device_Linux.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/elan4/device_Linux.c 2005-05-11 12:10:12.450930752 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/elan4/device_Linux.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/elan4/device_Linux.c 2005-07-28 14:52:52.828681776 -0400 @@ -0,0 +1,2760 @@ +/* + * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd. @@ -30417,10 +30417,10 @@ Index: linux-2.6.5/drivers/net/qsnet/elan4/device_Linux.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/elan4/i2c.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/elan4/i2c.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/elan4/i2c.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/elan4/i2c.c 2005-05-11 12:10:12.450930752 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/elan4/i2c.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/elan4/i2c.c 2005-07-28 14:52:52.829681624 -0400 @@ -0,0 +1,248 @@ +/* + * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd. @@ -30670,10 +30670,10 @@ Index: linux-2.6.5/drivers/net/qsnet/elan4/i2c.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/elan4/intcookie.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/elan4/intcookie.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/elan4/intcookie.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/elan4/intcookie.c 2005-05-11 12:10:12.451930600 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/elan4/intcookie.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/elan4/intcookie.c 2005-07-28 14:52:52.829681624 -0400 @@ -0,0 +1,371 @@ +/* + * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd. @@ -31046,10 +31046,10 @@ Index: linux-2.6.5/drivers/net/qsnet/elan4/intcookie.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/elan4/Makefile +Index: linux-2.6.5-7.191/drivers/net/qsnet/elan4/Makefile =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/elan4/Makefile 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/elan4/Makefile 2005-05-11 12:10:12.451930600 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/elan4/Makefile 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/elan4/Makefile 2005-07-28 14:52:52.830681472 -0400 @@ -0,0 +1,15 @@ +# +# Makefile for Quadrics QsNet @@ -31066,10 +31066,10 @@ Index: linux-2.6.5/drivers/net/qsnet/elan4/Makefile +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 -Index: linux-2.6.5/drivers/net/qsnet/elan4/Makefile.conf +Index: linux-2.6.5-7.191/drivers/net/qsnet/elan4/Makefile.conf =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/elan4/Makefile.conf 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/elan4/Makefile.conf 2005-05-11 12:10:12.452930448 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/elan4/Makefile.conf 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/elan4/Makefile.conf 2005-07-28 14:52:52.830681472 -0400 @@ -0,0 +1,10 @@ +# Flags for generating QsNet Linux Kernel Makefiles +MODNAME = elan4.o @@ -31081,10 +31081,10 @@ Index: linux-2.6.5/drivers/net/qsnet/elan4/Makefile.conf +# EXTRALINES START + +# EXTRALINES END -Index: linux-2.6.5/drivers/net/qsnet/elan4/mmu.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/elan4/mmu.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/elan4/mmu.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/elan4/mmu.c 2005-05-11 12:10:12.453930296 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/elan4/mmu.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/elan4/mmu.c 2005-07-28 14:52:52.832681168 -0400 @@ -0,0 +1,862 @@ +/* + * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd. @@ -31948,10 +31948,10 @@ Index: linux-2.6.5/drivers/net/qsnet/elan4/mmu.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/elan4/mmu_Linux.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/elan4/mmu_Linux.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/elan4/mmu_Linux.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/elan4/mmu_Linux.c 2005-05-11 12:10:12.454930144 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/elan4/mmu_Linux.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/elan4/mmu_Linux.c 2005-07-28 14:52:52.832681168 -0400 @@ -0,0 +1,265 @@ +/* + * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd. @@ -32218,10 +32218,10 @@ Index: linux-2.6.5/drivers/net/qsnet/elan4/mmu_Linux.c + +EXPORT_SYMBOL(elan4mmu_phys2pte); +EXPORT_SYMBOL(elan4mmu_pte2phys); -Index: linux-2.6.5/drivers/net/qsnet/elan4/neterr.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/elan4/neterr.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/elan4/neterr.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/elan4/neterr.c 2005-05-11 12:10:12.455929992 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/elan4/neterr.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/elan4/neterr.c 2005-07-28 14:52:52.833681016 -0400 @@ -0,0 +1,270 @@ +/* + * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd. @@ -32493,10 +32493,10 @@ Index: linux-2.6.5/drivers/net/qsnet/elan4/neterr.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/elan4/procfs_Linux.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/elan4/procfs_Linux.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/elan4/procfs_Linux.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/elan4/procfs_Linux.c 2005-05-11 12:10:12.457929688 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/elan4/procfs_Linux.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/elan4/procfs_Linux.c 2005-07-28 14:52:52.835680712 -0400 @@ -0,0 +1,1074 @@ +/* + * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd. @@ -33572,16 +33572,16 @@ Index: linux-2.6.5/drivers/net/qsnet/elan4/procfs_Linux.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/elan4/quadrics_version.h +Index: linux-2.6.5-7.191/drivers/net/qsnet/elan4/quadrics_version.h =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/elan4/quadrics_version.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/elan4/quadrics_version.h 2005-05-11 12:10:12.457929688 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/elan4/quadrics_version.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/elan4/quadrics_version.h 2005-07-28 14:52:52.835680712 -0400 @@ -0,0 +1 @@ +#define QUADRICS_VERSION "4.31qsnet" -Index: linux-2.6.5/drivers/net/qsnet/elan4/regions.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/elan4/regions.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/elan4/regions.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/elan4/regions.c 2005-05-11 12:10:12.462928928 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/elan4/regions.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/elan4/regions.c 2005-07-28 14:52:52.836680560 -0400 @@ -0,0 +1,609 @@ +/* + * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd. @@ -34192,10 +34192,10 @@ Index: linux-2.6.5/drivers/net/qsnet/elan4/regions.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/elan4/routetable.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/elan4/routetable.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/elan4/routetable.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/elan4/routetable.c 2005-05-11 12:10:12.463928776 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/elan4/routetable.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/elan4/routetable.c 2005-07-28 14:52:52.837680408 -0400 @@ -0,0 +1,249 @@ +/* + * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd. @@ -34446,10 +34446,10 @@ Index: linux-2.6.5/drivers/net/qsnet/elan4/routetable.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/elan4/sdram.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/elan4/sdram.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/elan4/sdram.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/elan4/sdram.c 2005-05-11 12:10:12.464928624 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/elan4/sdram.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/elan4/sdram.c 2005-07-28 14:52:52.839680104 -0400 @@ -0,0 +1,1039 @@ +/* + * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd. @@ -35490,10 +35490,10 @@ Index: linux-2.6.5/drivers/net/qsnet/elan4/sdram.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/elan4/trap.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/elan4/trap.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/elan4/trap.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/elan4/trap.c 2005-05-11 12:10:12.466928320 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/elan4/trap.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/elan4/trap.c 2005-07-28 14:52:52.840679952 -0400 @@ -0,0 +1,777 @@ +/* + * Copyright (c) 2002-2003 by Quadrics Ltd. @@ -36272,10 +36272,10 @@ Index: linux-2.6.5/drivers/net/qsnet/elan4/trap.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/elan4/user.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/elan4/user.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/elan4/user.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/elan4/user.c 2005-05-11 12:10:12.471927560 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/elan4/user.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/elan4/user.c 2005-07-28 14:52:52.846679040 -0400 @@ -0,0 +1,3362 @@ +/* + * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd. @@ -39639,10 +39639,10 @@ Index: linux-2.6.5/drivers/net/qsnet/elan4/user.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/elan4/user_ddcq.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/elan4/user_ddcq.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/elan4/user_ddcq.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/elan4/user_ddcq.c 2005-05-11 12:10:12.472927408 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/elan4/user_ddcq.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/elan4/user_ddcq.c 2005-07-28 14:52:52.847678888 -0400 @@ -0,0 +1,226 @@ +/* + * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd. @@ -39870,10 +39870,10 @@ Index: linux-2.6.5/drivers/net/qsnet/elan4/user_ddcq.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/elan4/user_Linux.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/elan4/user_Linux.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/elan4/user_Linux.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/elan4/user_Linux.c 2005-05-11 12:10:12.473927256 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/elan4/user_Linux.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/elan4/user_Linux.c 2005-07-28 14:52:52.847678888 -0400 @@ -0,0 +1,377 @@ +/* + * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd. @@ -40252,10 +40252,10 @@ Index: linux-2.6.5/drivers/net/qsnet/elan4/user_Linux.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/ep/asm_elan4_thread.S +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/asm_elan4_thread.S =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/asm_elan4_thread.S 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/asm_elan4_thread.S 2005-05-11 12:10:12.473927256 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/asm_elan4_thread.S 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/asm_elan4_thread.S 2005-07-28 14:52:52.848678736 -0400 @@ -0,0 +1,78 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -40335,10 +40335,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/asm_elan4_thread.S + jmpl %r2+8, %r0 // and return + add %sp, 192, %sp + -Index: linux-2.6.5/drivers/net/qsnet/ep/assym_elan4.h +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/assym_elan4.h =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/assym_elan4.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/assym_elan4.h 2005-05-11 12:10:12.474927104 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/assym_elan4.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/assym_elan4.h 2005-07-28 14:52:52.848678736 -0400 @@ -0,0 +1,20 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -40360,10 +40360,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/assym_elan4.h +#define EP4_RXD_NEXT 664 +#define EP4_RXD_QUEUED 728 +#define EP4_RXD_DEBUG 944 -Index: linux-2.6.5/drivers/net/qsnet/ep/cm.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/cm.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/cm.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/cm.c 2005-05-11 12:10:12.479926344 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/cm.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/cm.c 2005-07-28 14:52:52.853677976 -0400 @@ -0,0 +1,3000 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -43365,10 +43365,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/cm.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/ep/cm.h +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/cm.h =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/cm.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/cm.h 2005-05-11 12:10:12.480926192 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/cm.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/cm.h 2005-07-28 14:52:52.854677824 -0400 @@ -0,0 +1,412 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -43782,10 +43782,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/cm.h + */ +#endif /* __ELAN_CM_H */ + -Index: linux-2.6.5/drivers/net/qsnet/ep/cm_procfs.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/cm_procfs.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/cm_procfs.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/cm_procfs.c 2005-05-11 12:10:12.480926192 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/cm_procfs.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/cm_procfs.c 2005-07-28 14:52:52.855677672 -0400 @@ -0,0 +1,254 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -44041,10 +44041,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/cm_procfs.c + + remove_proc_entry ("machine_id", ep_config_root); +} -Index: linux-2.6.5/drivers/net/qsnet/ep/commands_elan4.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/commands_elan4.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/commands_elan4.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/commands_elan4.c 2005-05-11 12:10:12.481926040 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/commands_elan4.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/commands_elan4.c 2005-07-28 14:52:52.855677672 -0400 @@ -0,0 +1,173 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -44219,10 +44219,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/commands_elan4.c + elan4_command_write (cq, *ptr++, i); +} + -Index: linux-2.6.5/drivers/net/qsnet/ep/conf_linux.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/conf_linux.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/conf_linux.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/conf_linux.c 2005-05-11 12:10:12.481926040 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/conf_linux.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/conf_linux.c 2005-07-28 14:52:52.856677520 -0400 @@ -0,0 +1,309 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -44533,10 +44533,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/conf_linux.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/ep/conf_linux.h +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/conf_linux.h =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/conf_linux.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/conf_linux.h 2005-05-11 12:10:12.482925888 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/conf_linux.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/conf_linux.h 2005-07-28 14:52:52.856677520 -0400 @@ -0,0 +1,29 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -44567,10 +44567,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/conf_linux.h + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/ep/debug.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/debug.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/debug.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/debug.c 2005-05-11 12:10:12.482925888 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/debug.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/debug.c 2005-07-28 14:52:52.857677368 -0400 @@ -0,0 +1,145 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -44717,10 +44717,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/debug.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/ep/debug_elan4.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/debug_elan4.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/debug_elan4.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/debug_elan4.c 2005-05-11 12:10:12.482925888 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/debug_elan4.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/debug_elan4.c 2005-07-28 14:52:52.857677368 -0400 @@ -0,0 +1,59 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -44781,10 +44781,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/debug_elan4.c + ep_display_rmap (rail->r_generic.ElanAllocator.ResourceMap); +} + -Index: linux-2.6.5/drivers/net/qsnet/ep/debug.h +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/debug.h =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/debug.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/debug.h 2005-05-11 12:10:12.483925736 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/debug.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/debug.h 2005-07-28 14:52:52.857677368 -0400 @@ -0,0 +1,109 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -44895,10 +44895,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/debug.h + */ +#endif /* _ELAN3_EPDEBUG_H */ + -Index: linux-2.6.5/drivers/net/qsnet/ep/epcomms_asm_elan4_thread.S +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/epcomms_asm_elan4_thread.S =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/epcomms_asm_elan4_thread.S 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/epcomms_asm_elan4_thread.S 2005-05-11 12:10:12.483925736 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/epcomms_asm_elan4_thread.S 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/epcomms_asm_elan4_thread.S 2005-07-28 14:52:52.858677216 -0400 @@ -0,0 +1,133 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -45033,10 +45033,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/epcomms_asm_elan4_thread.S + jmpl %r7+8, %r0 // and return + add %sp, 192, %sp + -Index: linux-2.6.5/drivers/net/qsnet/ep/epcomms.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/epcomms.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/epcomms.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/epcomms.c 2005-05-11 12:10:12.484925584 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/epcomms.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/epcomms.c 2005-07-28 14:52:52.859677064 -0400 @@ -0,0 +1,484 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -45522,10 +45522,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/epcomms.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/ep/epcomms_elan3.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/epcomms_elan3.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/epcomms_elan3.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/epcomms_elan3.c 2005-05-11 12:10:12.485925432 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/epcomms_elan3.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/epcomms_elan3.c 2005-07-28 14:52:52.859677064 -0400 @@ -0,0 +1,191 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -45718,10 +45718,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/epcomms_elan3.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/ep/epcomms_elan3.h +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/epcomms_elan3.h =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/epcomms_elan3.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/epcomms_elan3.h 2005-05-11 12:10:12.485925432 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/epcomms_elan3.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/epcomms_elan3.h 2005-07-28 14:52:52.860676912 -0400 @@ -0,0 +1,330 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -46053,10 +46053,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/epcomms_elan3.h + * End: + */ +#endif /* __EPCOMMS_ELAN3_H */ -Index: linux-2.6.5/drivers/net/qsnet/ep/epcomms_elan3_thread.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/epcomms_elan3_thread.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/epcomms_elan3_thread.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/epcomms_elan3_thread.c 2005-05-11 12:10:12.486925280 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/epcomms_elan3_thread.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/epcomms_elan3_thread.c 2005-07-28 14:52:52.861676760 -0400 @@ -0,0 +1,296 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -46354,10 +46354,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/epcomms_elan3_thread.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/ep/epcomms_elan4.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/epcomms_elan4.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/epcomms_elan4.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/epcomms_elan4.c 2005-05-11 12:10:12.487925128 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/epcomms_elan4.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/epcomms_elan4.c 2005-07-28 14:52:52.862676608 -0400 @@ -0,0 +1,392 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -46751,10 +46751,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/epcomms_elan4.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/ep/epcomms_elan4.h +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/epcomms_elan4.h =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/epcomms_elan4.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/epcomms_elan4.h 2005-05-11 12:10:12.488924976 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/epcomms_elan4.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/epcomms_elan4.h 2005-07-28 14:52:52.863676456 -0400 @@ -0,0 +1,470 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -47226,10 +47226,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/epcomms_elan4.h + * End: + */ +#endif /* __EPCOMMS_ELAN4_H */ -Index: linux-2.6.5/drivers/net/qsnet/ep/epcomms_elan4_thread.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/epcomms_elan4_thread.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/epcomms_elan4_thread.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/epcomms_elan4_thread.c 2005-05-11 12:10:12.489924824 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/epcomms_elan4_thread.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/epcomms_elan4_thread.c 2005-07-28 14:52:52.864676304 -0400 @@ -0,0 +1,346 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -47577,10 +47577,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/epcomms_elan4_thread.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/ep/epcommsFwd.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/epcommsFwd.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/epcommsFwd.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/epcommsFwd.c 2005-05-11 12:10:12.490924672 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/epcommsFwd.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/epcommsFwd.c 2005-07-28 14:52:52.864676304 -0400 @@ -0,0 +1,310 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -47892,10 +47892,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/epcommsFwd.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/ep/epcommsRx.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/epcommsRx.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/epcommsRx.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/epcommsRx.c 2005-05-11 12:10:12.492924368 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/epcommsRx.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/epcommsRx.c 2005-07-28 14:52:52.866676000 -0400 @@ -0,0 +1,1205 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -49102,10 +49102,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/epcommsRx.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/ep/epcommsRx_elan3.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/epcommsRx_elan3.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/epcommsRx_elan3.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/epcommsRx_elan3.c 2005-05-11 12:10:12.495923912 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/epcommsRx_elan3.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/epcommsRx_elan3.c 2005-07-28 14:52:52.870675392 -0400 @@ -0,0 +1,1776 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -50883,10 +50883,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/epcommsRx_elan3.c + /* EP3_RCVR_RAIL * ep4rcvr_rail = (EP3_RCVR_RAIL *) rcvr_rail; */ +} + -Index: linux-2.6.5/drivers/net/qsnet/ep/epcommsRx_elan4.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/epcommsRx_elan4.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/epcommsRx_elan4.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/epcommsRx_elan4.c 2005-05-11 12:10:12.499923304 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/epcommsRx_elan4.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/epcommsRx_elan4.c 2005-07-28 14:52:52.874674784 -0400 @@ -0,0 +1,1758 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -52646,10 +52646,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/epcommsRx_elan4.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/ep/epcommsTx.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/epcommsTx.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/epcommsTx.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/epcommsTx.c 2005-05-11 12:10:12.501923000 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/epcommsTx.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/epcommsTx.c 2005-07-28 14:52:52.876674480 -0400 @@ -0,0 +1,919 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -53570,10 +53570,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/epcommsTx.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/ep/epcommsTx_elan3.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/epcommsTx_elan3.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/epcommsTx_elan3.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/epcommsTx_elan3.c 2005-05-11 12:10:12.503922696 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/epcommsTx_elan3.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/epcommsTx_elan3.c 2005-07-28 14:52:52.878674176 -0400 @@ -0,0 +1,1173 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -54748,10 +54748,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/epcommsTx_elan3.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/ep/epcommsTx_elan4.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/epcommsTx_elan4.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/epcommsTx_elan4.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/epcommsTx_elan4.c 2005-05-11 12:10:12.506922240 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/epcommsTx_elan4.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/epcommsTx_elan4.c 2005-07-28 14:52:52.881673720 -0400 @@ -0,0 +1,1389 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -56142,10 +56142,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/epcommsTx_elan4.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/ep/ep_procfs.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/ep_procfs.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/ep_procfs.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/ep_procfs.c 2005-05-11 12:10:12.506922240 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/ep_procfs.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/ep_procfs.c 2005-07-28 14:52:52.881673720 -0400 @@ -0,0 +1,331 @@ + +/* @@ -56478,10 +56478,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/ep_procfs.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/ep/kalloc.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/kalloc.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/kalloc.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/kalloc.c 2005-05-11 12:10:12.507922088 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/kalloc.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/kalloc.c 2005-07-28 14:52:52.882673568 -0400 @@ -0,0 +1,677 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -57160,10 +57160,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/kalloc.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/ep/kcomm.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/kcomm.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/kcomm.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/kcomm.c 2005-05-11 12:10:12.510921632 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/kcomm.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/kcomm.c 2005-07-28 14:52:52.885673112 -0400 @@ -0,0 +1,1448 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -58613,10 +58613,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/kcomm.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/ep/kcomm_elan3.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/kcomm_elan3.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/kcomm_elan3.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/kcomm_elan3.c 2005-05-11 12:10:12.522919808 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/kcomm_elan3.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/kcomm_elan3.c 2005-07-28 14:52:52.886672960 -0400 @@ -0,0 +1,504 @@ + +/* @@ -59122,10 +59122,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/kcomm_elan3.c + /* no stats here yet */ + /* EP3_RAIL *ep3rail = (EP3_RAIL *)r; */ +} -Index: linux-2.6.5/drivers/net/qsnet/ep/kcomm_elan3.h +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/kcomm_elan3.h =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/kcomm_elan3.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/kcomm_elan3.h 2005-05-11 12:10:12.523919656 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/kcomm_elan3.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/kcomm_elan3.h 2005-07-28 14:52:52.887672808 -0400 @@ -0,0 +1,431 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -59558,10 +59558,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/kcomm_elan3.h +#endif /* !defined(__ELAN3__) */ + +#endif /* __EP_KCOMM_ELAN3_H */ -Index: linux-2.6.5/drivers/net/qsnet/ep/kcomm_elan4.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/kcomm_elan4.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/kcomm_elan4.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/kcomm_elan4.c 2005-05-11 12:10:12.524919504 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/kcomm_elan4.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/kcomm_elan4.c 2005-07-28 14:52:52.888672656 -0400 @@ -0,0 +1,526 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -60089,10 +60089,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/kcomm_elan4.c + /* no stats here yet */ + /* EP4_RAIL *ep4rail = (EP4_RAIL *)r; */ +} -Index: linux-2.6.5/drivers/net/qsnet/ep/kcomm_elan4.h +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/kcomm_elan4.h =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/kcomm_elan4.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/kcomm_elan4.h 2005-05-11 12:10:12.525919352 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/kcomm_elan4.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/kcomm_elan4.h 2005-07-28 14:52:52.889672504 -0400 @@ -0,0 +1,443 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -60537,10 +60537,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/kcomm_elan4.h +#endif /* ! defined(__elan4__) */ + +#endif /* __EP_KCOMM_ELAN4_H */ -Index: linux-2.6.5/drivers/net/qsnet/ep/kcomm_vp.h +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/kcomm_vp.h =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/kcomm_vp.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/kcomm_vp.h 2005-05-11 12:10:12.525919352 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/kcomm_vp.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/kcomm_vp.h 2005-07-28 14:52:52.889672504 -0400 @@ -0,0 +1,36 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -60578,10 +60578,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/kcomm_vp.h +#endif /* __EP_KCOMM_VP_H */ + + -Index: linux-2.6.5/drivers/net/qsnet/ep/kmap.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/kmap.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/kmap.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/kmap.c 2005-05-11 12:10:12.526919200 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/kmap.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/kmap.c 2005-07-28 14:52:52.890672352 -0400 @@ -0,0 +1,561 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -61144,10 +61144,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/kmap.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/ep/kmap_elan3.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/kmap_elan3.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/kmap_elan3.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/kmap_elan3.c 2005-05-11 12:10:12.527919048 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/kmap_elan3.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/kmap_elan3.c 2005-07-28 14:52:52.891672200 -0400 @@ -0,0 +1,209 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -61358,10 +61358,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/kmap_elan3.c + for (i = (npages * ELAN3_PTES_PER_PAGE) - 1; i >= 0; i--) + elan3_writepte (rail->Device, ptep[i], tpte); +} -Index: linux-2.6.5/drivers/net/qsnet/ep/kmap_elan4.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/kmap_elan4.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/kmap_elan4.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/kmap_elan4.c 2005-05-11 12:10:12.528918896 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/kmap_elan4.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/kmap_elan4.c 2005-07-28 14:52:52.892672048 -0400 @@ -0,0 +1,226 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -61589,10 +61589,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/kmap_elan4.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/ep/kmsg_elan3.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/kmsg_elan3.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/kmsg_elan3.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/kmsg_elan3.c 2005-05-11 12:10:12.529918744 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/kmsg_elan3.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/kmsg_elan3.c 2005-07-28 14:52:52.892672048 -0400 @@ -0,0 +1,345 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -61939,10 +61939,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/kmsg_elan3.c + + return TRUE; +} -Index: linux-2.6.5/drivers/net/qsnet/ep/kmsg_elan4.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/kmsg_elan4.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/kmsg_elan4.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/kmsg_elan4.c 2005-05-11 12:10:12.530918592 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/kmsg_elan4.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/kmsg_elan4.c 2005-07-28 14:52:52.893671896 -0400 @@ -0,0 +1,418 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -62362,10 +62362,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/kmsg_elan4.c + + return 1; +} -Index: linux-2.6.5/drivers/net/qsnet/ep/kthread.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/kthread.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/kthread.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/kthread.c 2005-05-11 12:10:12.530918592 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/kthread.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/kthread.c 2005-07-28 14:52:52.894671744 -0400 @@ -0,0 +1,186 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -62553,10 +62553,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/kthread.c + * c-file-style: "linux" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/ep/kthread.h +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/kthread.h =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/kthread.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/kthread.h 2005-05-11 12:10:12.530918592 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/kthread.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/kthread.h 2005-07-28 14:52:52.894671744 -0400 @@ -0,0 +1,53 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -62611,10 +62611,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/kthread.h + * c-file-style: "linux" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/ep/Makefile +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/Makefile =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/Makefile 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/Makefile 2005-05-11 12:10:12.531918440 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/Makefile 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/Makefile 2005-07-28 14:52:52.894671744 -0400 @@ -0,0 +1,17 @@ +# +# Makefile for Quadrics QsNet @@ -62633,10 +62633,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/Makefile +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 -Index: linux-2.6.5/drivers/net/qsnet/ep/Makefile.conf +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/Makefile.conf =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/Makefile.conf 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/Makefile.conf 2005-05-11 12:10:12.531918440 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/Makefile.conf 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/Makefile.conf 2005-07-28 14:52:52.895671592 -0400 @@ -0,0 +1,12 @@ +# Flags for generating QsNet Linux Kernel Makefiles +MODNAME = ep.o @@ -62650,10 +62650,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/Makefile.conf +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 -Index: linux-2.6.5/drivers/net/qsnet/ep/neterr.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/neterr.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/neterr.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/neterr.c 2005-05-11 12:10:12.531918440 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/neterr.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/neterr.c 2005-07-28 14:52:52.895671592 -0400 @@ -0,0 +1,82 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -62737,10 +62737,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/neterr.c + * End: + */ + -Index: linux-2.6.5/drivers/net/qsnet/ep/neterr_elan3.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/neterr_elan3.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/neterr_elan3.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/neterr_elan3.c 2005-05-11 12:10:12.532918288 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/neterr_elan3.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/neterr_elan3.c 2005-07-28 14:52:52.896671440 -0400 @@ -0,0 +1,326 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -63068,10 +63068,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/neterr_elan3.c + * End: + */ + -Index: linux-2.6.5/drivers/net/qsnet/ep/neterr_elan4.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/neterr_elan4.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/neterr_elan4.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/neterr_elan4.c 2005-05-11 12:10:12.533918136 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/neterr_elan4.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/neterr_elan4.c 2005-07-28 14:52:52.896671440 -0400 @@ -0,0 +1,251 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -63324,10 +63324,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/neterr_elan4.c + * End: + */ + -Index: linux-2.6.5/drivers/net/qsnet/ep/nmh.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/nmh.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/nmh.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/nmh.c 2005-05-11 12:10:12.533918136 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/nmh.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/nmh.c 2005-07-28 14:52:52.897671288 -0400 @@ -0,0 +1,181 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -63510,10 +63510,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/nmh.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/ep/probenetwork.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/probenetwork.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/probenetwork.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/probenetwork.c 2005-05-11 12:10:12.534917984 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/probenetwork.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/probenetwork.c 2005-07-28 14:52:52.898671136 -0400 @@ -0,0 +1,446 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -63961,10 +63961,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/probenetwork.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/ep/probenetwork_elan3.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/probenetwork_elan3.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/probenetwork_elan3.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/probenetwork_elan3.c 2005-05-11 12:10:12.535917832 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/probenetwork_elan3.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/probenetwork_elan3.c 2005-07-28 14:52:52.898671136 -0400 @@ -0,0 +1,298 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -64264,10 +64264,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/probenetwork_elan3.c + return updated; +} + -Index: linux-2.6.5/drivers/net/qsnet/ep/probenetwork_elan3_thread.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/probenetwork_elan3_thread.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/probenetwork_elan3_thread.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/probenetwork_elan3_thread.c 2005-05-11 12:10:12.535917832 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/probenetwork_elan3_thread.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/probenetwork_elan3_thread.c 2005-07-28 14:52:52.899670984 -0400 @@ -0,0 +1,98 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -64367,10 +64367,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/probenetwork_elan3_thread.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/ep/probenetwork_elan4.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/probenetwork_elan4.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/probenetwork_elan4.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/probenetwork_elan4.c 2005-05-11 12:10:12.536917680 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/probenetwork_elan4.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/probenetwork_elan4.c 2005-07-28 14:52:52.900670832 -0400 @@ -0,0 +1,396 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -64768,10 +64768,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/probenetwork_elan4.c + + return 0; +} -Index: linux-2.6.5/drivers/net/qsnet/ep/procfs_linux.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/procfs_linux.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/procfs_linux.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/procfs_linux.c 2005-05-11 12:10:12.537917528 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/procfs_linux.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/procfs_linux.c 2005-07-28 14:52:52.901670680 -0400 @@ -0,0 +1,693 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -65466,16 +65466,16 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/procfs_linux.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/ep/quadrics_version.h +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/quadrics_version.h =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/quadrics_version.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/quadrics_version.h 2005-05-11 12:10:12.538917376 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/quadrics_version.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/quadrics_version.h 2005-07-28 14:52:52.901670680 -0400 @@ -0,0 +1 @@ +#define QUADRICS_VERSION "4.31qsnet" -Index: linux-2.6.5/drivers/net/qsnet/ep/railhints.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/railhints.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/railhints.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/railhints.c 2005-05-11 12:10:12.538917376 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/railhints.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/railhints.c 2005-07-28 14:52:52.902670528 -0400 @@ -0,0 +1,103 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -65580,10 +65580,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/railhints.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/ep/rmap.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/rmap.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/rmap.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/rmap.c 2005-05-11 12:10:12.539917224 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/rmap.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/rmap.c 2005-07-28 14:52:52.902670528 -0400 @@ -0,0 +1,365 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -65950,10 +65950,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/rmap.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/ep/spinlock_elan3_thread.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/spinlock_elan3_thread.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/spinlock_elan3_thread.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/spinlock_elan3_thread.c 2005-05-11 12:10:12.539917224 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/spinlock_elan3_thread.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/spinlock_elan3_thread.c 2005-07-28 14:52:52.903670376 -0400 @@ -0,0 +1,44 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -65999,10 +65999,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/spinlock_elan3_thread.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/ep/statemap.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/statemap.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/statemap.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/statemap.c 2005-05-11 12:10:12.540917072 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/statemap.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/statemap.c 2005-07-28 14:52:52.903670376 -0400 @@ -0,0 +1,385 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -66389,10 +66389,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/statemap.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/ep/statusmon.h +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/statusmon.h =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/statusmon.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/statusmon.h 2005-05-11 12:10:12.540917072 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/statusmon.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/statusmon.h 2005-07-28 14:52:52.904670224 -0400 @@ -0,0 +1,44 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -66438,10 +66438,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/statusmon.h + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/ep/support.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/support.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/support.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/support.c 2005-05-11 12:10:12.540917072 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/support.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/support.c 2005-07-28 14:52:52.904670224 -0400 @@ -0,0 +1,109 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -66552,10 +66552,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/support.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/ep/support_elan3.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/support_elan3.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/support_elan3.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/support_elan3.c 2005-05-11 12:10:12.544916464 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/support_elan3.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/support_elan3.c 2005-07-28 14:52:52.908669616 -0400 @@ -0,0 +1,2111 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -68668,10 +68668,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/support_elan3.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/ep/support_elan4.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/support_elan4.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/support_elan4.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/support_elan4.c 2005-05-11 12:10:12.546916160 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/support_elan4.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/support_elan4.c 2005-07-28 14:52:52.910669312 -0400 @@ -0,0 +1,1184 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -69857,10 +69857,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/support_elan4.c + } + spin_unlock_irqrestore (&rail->r_dma_lock, flags); +} -Index: linux-2.6.5/drivers/net/qsnet/ep/threadcode.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/threadcode.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/threadcode.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/threadcode.c 2005-05-11 12:10:12.546916160 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/threadcode.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/threadcode.c 2005-07-28 14:52:52.911669160 -0400 @@ -0,0 +1,146 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -70008,10 +70008,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/threadcode.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/ep/threadcode_elan3.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/threadcode_elan3.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/threadcode_elan3.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/threadcode_elan3.c 2005-05-11 12:10:12.547916008 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/threadcode_elan3.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/threadcode_elan3.c 2005-07-28 14:52:52.911669160 -0400 @@ -0,0 +1,85 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -70098,10 +70098,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/threadcode_elan3.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/ep/threadcode_elan3_Linux.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/threadcode_elan3_Linux.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/threadcode_elan3_Linux.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/threadcode_elan3_Linux.c 2005-05-11 12:10:12.547916008 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/threadcode_elan3_Linux.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/threadcode_elan3_Linux.c 2005-07-28 14:52:52.912669008 -0400 @@ -0,0 +1,112 @@ +/* --------------------------------------------------------*/ +/* MACHINE GENERATED ELAN CODE */ @@ -70215,10 +70215,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/threadcode_elan3_Linux.c + threadcode_elan3_rodata_size, + threadcode_elan3_symbols, +}; -Index: linux-2.6.5/drivers/net/qsnet/ep/threadcode_elan4_Linux.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/ep/threadcode_elan4_Linux.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/ep/threadcode_elan4_Linux.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/ep/threadcode_elan4_Linux.c 2005-05-11 12:10:12.548915856 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/ep/threadcode_elan4_Linux.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/ep/threadcode_elan4_Linux.c 2005-07-28 14:52:52.912669008 -0400 @@ -0,0 +1,112 @@ +/* --------------------------------------------------------*/ +/* MACHINE GENERATED ELAN CODE */ @@ -70332,10 +70332,10 @@ Index: linux-2.6.5/drivers/net/qsnet/ep/threadcode_elan4_Linux.c + threadcode_elan4_rodata_size, + threadcode_elan4_symbols, +}; -Index: linux-2.6.5/drivers/net/qsnet/jtag/jtagdrv.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/jtag/jtagdrv.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/jtag/jtagdrv.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/jtag/jtagdrv.c 2005-05-11 12:10:12.549915704 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/jtag/jtagdrv.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/jtag/jtagdrv.c 2005-07-28 14:52:52.913668856 -0400 @@ -0,0 +1,451 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -70788,10 +70788,10 @@ Index: linux-2.6.5/drivers/net/qsnet/jtag/jtagdrv.c + LPT_WRITE_CTRL (dev, 0); DELAY(1); /* strobe low */ +} + -Index: linux-2.6.5/drivers/net/qsnet/jtag/jtagdrv.h +Index: linux-2.6.5-7.191/drivers/net/qsnet/jtag/jtagdrv.h =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/jtag/jtagdrv.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/jtag/jtagdrv.h 2005-05-11 12:10:12.549915704 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/jtag/jtagdrv.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/jtag/jtagdrv.h 2005-07-28 14:52:52.914668704 -0400 @@ -0,0 +1,57 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -70850,10 +70850,10 @@ Index: linux-2.6.5/drivers/net/qsnet/jtag/jtagdrv.h + + +#endif /* __JTAGDRV_COMMON_H */ -Index: linux-2.6.5/drivers/net/qsnet/jtag/jtagdrv_Linux.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/jtag/jtagdrv_Linux.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/jtag/jtagdrv_Linux.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/jtag/jtagdrv_Linux.c 2005-05-11 12:10:12.550915552 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/jtag/jtagdrv_Linux.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/jtag/jtagdrv_Linux.c 2005-07-28 14:52:52.914668704 -0400 @@ -0,0 +1,325 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -71180,10 +71180,10 @@ Index: linux-2.6.5/drivers/net/qsnet/jtag/jtagdrv_Linux.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/jtag/jtagdrv_Linux.h +Index: linux-2.6.5-7.191/drivers/net/qsnet/jtag/jtagdrv_Linux.h =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/jtag/jtagdrv_Linux.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/jtag/jtagdrv_Linux.h 2005-05-11 12:10:12.550915552 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/jtag/jtagdrv_Linux.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/jtag/jtagdrv_Linux.h 2005-07-28 14:52:52.915668552 -0400 @@ -0,0 +1,174 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -71359,10 +71359,10 @@ Index: linux-2.6.5/drivers/net/qsnet/jtag/jtagdrv_Linux.h + + +#endif /* __JTAGDRV_LINUX_H */ -Index: linux-2.6.5/drivers/net/qsnet/jtag/Makefile +Index: linux-2.6.5-7.191/drivers/net/qsnet/jtag/Makefile =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/jtag/Makefile 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/jtag/Makefile 2005-05-11 12:10:12.551915400 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/jtag/Makefile 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/jtag/Makefile 2005-07-28 14:52:52.915668552 -0400 @@ -0,0 +1,15 @@ +# +# Makefile for Quadrics QsNet @@ -71379,10 +71379,10 @@ Index: linux-2.6.5/drivers/net/qsnet/jtag/Makefile +jtag-objs := jtagdrv_Linux.o jtagdrv.o + +EXTRA_CFLAGS += -DDEBUG -DDEBUG_PRINTF -DDEBUG_ASSERT -Index: linux-2.6.5/drivers/net/qsnet/jtag/Makefile.conf +Index: linux-2.6.5-7.191/drivers/net/qsnet/jtag/Makefile.conf =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/jtag/Makefile.conf 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/jtag/Makefile.conf 2005-05-11 12:10:12.551915400 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/jtag/Makefile.conf 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/jtag/Makefile.conf 2005-07-28 14:52:52.915668552 -0400 @@ -0,0 +1,10 @@ +# Flags for generating QsNet Linux Kernel Makefiles +MODNAME = jtag.o @@ -71394,16 +71394,16 @@ Index: linux-2.6.5/drivers/net/qsnet/jtag/Makefile.conf +# EXTRALINES START + +# EXTRALINES END -Index: linux-2.6.5/drivers/net/qsnet/jtag/quadrics_version.h +Index: linux-2.6.5-7.191/drivers/net/qsnet/jtag/quadrics_version.h =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/jtag/quadrics_version.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/jtag/quadrics_version.h 2005-05-11 12:10:12.551915400 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/jtag/quadrics_version.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/jtag/quadrics_version.h 2005-07-28 14:52:52.915668552 -0400 @@ -0,0 +1 @@ +#define QUADRICS_VERSION "4.31qsnet" -Index: linux-2.6.5/drivers/net/qsnet/Kconfig +Index: linux-2.6.5-7.191/drivers/net/qsnet/Kconfig =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/Kconfig 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/Kconfig 2005-05-11 12:10:12.552915248 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/Kconfig 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/Kconfig 2005-07-28 14:52:52.916668400 -0400 @@ -0,0 +1,79 @@ +# +# Kconfig for Quadrics QsNet @@ -71484,10 +71484,10 @@ Index: linux-2.6.5/drivers/net/qsnet/Kconfig + For more information about JTag interface, please refer to the IEEE document on + http://www.ieee.org/ +endmenu -Index: linux-2.6.5/drivers/net/qsnet/Makefile +Index: linux-2.6.5-7.191/drivers/net/qsnet/Makefile =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/Makefile 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/Makefile 2005-05-11 12:10:12.552915248 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/Makefile 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/Makefile 2005-07-28 14:52:52.916668400 -0400 @@ -0,0 +1,15 @@ +# +# Makefile for Quadrics QsNet @@ -71504,10 +71504,10 @@ Index: linux-2.6.5/drivers/net/qsnet/Makefile +obj-$(CONFIG_EIP) += eip/ +obj-$(CONFIG_RMS) += rms/ +obj-$(CONFIG_JTAG) += jtag/ -Index: linux-2.6.5/drivers/net/qsnet/qsnet/debug.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/qsnet/debug.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/qsnet/debug.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/qsnet/debug.c 2005-05-11 12:10:12.553915096 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/qsnet/debug.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/qsnet/debug.c 2005-07-28 14:52:52.917668248 -0400 @@ -0,0 +1,583 @@ +/* + * Copyright (c) 2003 by Quadrics Ltd. @@ -72092,10 +72092,10 @@ Index: linux-2.6.5/drivers/net/qsnet/qsnet/debug.c + * c-file-style: "linux" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/qsnet/i686_mmx.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/qsnet/i686_mmx.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/qsnet/i686_mmx.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/qsnet/i686_mmx.c 2005-05-11 12:10:12.553915096 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/qsnet/i686_mmx.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/qsnet/i686_mmx.c 2005-07-28 14:52:52.917668248 -0400 @@ -0,0 +1,99 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -72196,10 +72196,10 @@ Index: linux-2.6.5/drivers/net/qsnet/qsnet/i686_mmx.c + } +} +#endif -Index: linux-2.6.5/drivers/net/qsnet/qsnet/kernel_linux.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/qsnet/kernel_linux.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/qsnet/kernel_linux.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/qsnet/kernel_linux.c 2005-05-11 12:10:12.554914944 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/qsnet/kernel_linux.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/qsnet/kernel_linux.c 2005-07-28 14:52:52.919667944 -0400 @@ -0,0 +1,856 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -73057,10 +73057,10 @@ Index: linux-2.6.5/drivers/net/qsnet/qsnet/kernel_linux.c + * c-file-style: "linux" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/qsnet/Makefile +Index: linux-2.6.5-7.191/drivers/net/qsnet/qsnet/Makefile =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/qsnet/Makefile 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/qsnet/Makefile 2005-05-11 12:10:12.555914792 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/qsnet/Makefile 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/qsnet/Makefile 2005-07-28 14:52:52.919667944 -0400 @@ -0,0 +1,15 @@ +# +# Makefile for Quadrics QsNet @@ -73077,10 +73077,10 @@ Index: linux-2.6.5/drivers/net/qsnet/qsnet/Makefile +qsnet-objs := debug.o kernel_linux.o i686_mmx.o + +EXTRA_CFLAGS += -DDEBUG -DDEBUG_PRINTF -DDEBUG_ASSERT -Index: linux-2.6.5/drivers/net/qsnet/qsnet/Makefile.conf +Index: linux-2.6.5-7.191/drivers/net/qsnet/qsnet/Makefile.conf =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/qsnet/Makefile.conf 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/qsnet/Makefile.conf 2005-05-11 12:10:12.555914792 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/qsnet/Makefile.conf 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/qsnet/Makefile.conf 2005-07-28 14:52:52.919667944 -0400 @@ -0,0 +1,10 @@ +# Flags for generating QsNet Linux Kernel Makefiles +MODNAME = qsnet.o @@ -73092,10 +73092,10 @@ Index: linux-2.6.5/drivers/net/qsnet/qsnet/Makefile.conf +# EXTRALINES START + +# EXTRALINES END -Index: linux-2.6.5/drivers/net/qsnet/qsnet/qsnetkmem_linux.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/qsnet/qsnetkmem_linux.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/qsnet/qsnetkmem_linux.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/qsnet/qsnetkmem_linux.c 2005-05-11 12:10:12.555914792 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/qsnet/qsnetkmem_linux.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/qsnet/qsnetkmem_linux.c 2005-07-28 14:52:52.920667792 -0400 @@ -0,0 +1,325 @@ +/* + * Copyright (c) 2003 by Quadrics Ltd. @@ -73422,16 +73422,16 @@ Index: linux-2.6.5/drivers/net/qsnet/qsnet/qsnetkmem_linux.c + * c-file-style: "linux" + * End: + */ -Index: linux-2.6.5/drivers/net/qsnet/qsnet/quadrics_version.h +Index: linux-2.6.5-7.191/drivers/net/qsnet/qsnet/quadrics_version.h =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/qsnet/quadrics_version.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/qsnet/quadrics_version.h 2005-05-11 12:10:12.556914640 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/qsnet/quadrics_version.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/qsnet/quadrics_version.h 2005-07-28 14:52:52.920667792 -0400 @@ -0,0 +1 @@ +#define QUADRICS_VERSION "4.31qsnet" -Index: linux-2.6.5/drivers/net/qsnet/rms/Makefile +Index: linux-2.6.5-7.191/drivers/net/qsnet/rms/Makefile =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/rms/Makefile 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/rms/Makefile 2005-05-11 12:10:12.556914640 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/rms/Makefile 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/rms/Makefile 2005-07-28 14:52:52.920667792 -0400 @@ -0,0 +1,15 @@ +# +# Makefile for Quadrics QsNet @@ -73448,10 +73448,10 @@ Index: linux-2.6.5/drivers/net/qsnet/rms/Makefile +rms-objs := rms_kern.o rms_kern_Linux.o + +EXTRA_CFLAGS += -DDEBUG -DDEBUG_PRINTF -DDEBUG_ASSERT -Index: linux-2.6.5/drivers/net/qsnet/rms/Makefile.conf +Index: linux-2.6.5-7.191/drivers/net/qsnet/rms/Makefile.conf =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/rms/Makefile.conf 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/rms/Makefile.conf 2005-05-11 12:10:12.556914640 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/rms/Makefile.conf 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/rms/Makefile.conf 2005-07-28 14:52:52.921667640 -0400 @@ -0,0 +1,10 @@ +# Flags for generating QsNet Linux Kernel Makefiles +MODNAME = rms.o @@ -73463,16 +73463,16 @@ Index: linux-2.6.5/drivers/net/qsnet/rms/Makefile.conf +# EXTRALINES START + +# EXTRALINES END -Index: linux-2.6.5/drivers/net/qsnet/rms/quadrics_version.h +Index: linux-2.6.5-7.191/drivers/net/qsnet/rms/quadrics_version.h =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/rms/quadrics_version.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/rms/quadrics_version.h 2005-05-11 12:10:12.557914488 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/rms/quadrics_version.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/rms/quadrics_version.h 2005-07-28 14:52:52.921667640 -0400 @@ -0,0 +1 @@ +#define QUADRICS_VERSION "4.31qsnet" -Index: linux-2.6.5/drivers/net/qsnet/rms/rms_kern.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/rms/rms_kern.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/rms/rms_kern.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/rms/rms_kern.c 2005-05-11 12:10:12.559914184 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/rms/rms_kern.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/rms/rms_kern.c 2005-07-28 14:52:52.923667336 -0400 @@ -0,0 +1,1757 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -75231,10 +75231,10 @@ Index: linux-2.6.5/drivers/net/qsnet/rms/rms_kern.c + + + -Index: linux-2.6.5/drivers/net/qsnet/rms/rms_kern_Linux.c +Index: linux-2.6.5-7.191/drivers/net/qsnet/rms/rms_kern_Linux.c =================================================================== ---- linux-2.6.5.orig/drivers/net/qsnet/rms/rms_kern_Linux.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/drivers/net/qsnet/rms/rms_kern_Linux.c 2005-05-11 12:10:12.560914032 -0400 +--- linux-2.6.5-7.191.orig/drivers/net/qsnet/rms/rms_kern_Linux.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/drivers/net/qsnet/rms/rms_kern_Linux.c 2005-07-28 14:52:52.924667184 -0400 @@ -0,0 +1,430 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -75666,11 +75666,11 @@ Index: linux-2.6.5/drivers/net/qsnet/rms/rms_kern_Linux.c + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/drivers/net/Kconfig +Index: linux-2.6.5-7.191/drivers/net/Kconfig =================================================================== ---- linux-2.6.5.orig/drivers/net/Kconfig 2005-02-01 16:56:02.000000000 -0500 -+++ linux-2.6.5/drivers/net/Kconfig 2005-05-11 12:10:12.562913728 -0400 -@@ -2541,6 +2541,8 @@ +--- linux-2.6.5-7.191.orig/drivers/net/Kconfig 2005-06-28 12:23:55.000000000 -0400 ++++ linux-2.6.5-7.191/drivers/net/Kconfig 2005-07-28 14:52:52.926666880 -0400 +@@ -2491,6 +2491,8 @@ source "drivers/net/tokenring/Kconfig" @@ -75679,20 +75679,20 @@ Index: linux-2.6.5/drivers/net/Kconfig config NET_FC bool "Fibre Channel driver support" depends on NETDEVICES && SCSI && PCI -Index: linux-2.6.5/drivers/net/Makefile +Index: linux-2.6.5-7.191/drivers/net/Makefile =================================================================== ---- linux-2.6.5.orig/drivers/net/Makefile 2005-02-01 16:56:02.000000000 -0500 -+++ linux-2.6.5/drivers/net/Makefile 2005-05-11 12:10:12.562913728 -0400 -@@ -200,3 +200,5 @@ +--- linux-2.6.5-7.191.orig/drivers/net/Makefile 2005-06-28 12:23:50.000000000 -0400 ++++ linux-2.6.5-7.191/drivers/net/Makefile 2005-07-28 14:52:52.927666728 -0400 +@@ -196,3 +196,5 @@ obj-$(CONFIG_NETCONSOLE) += netconsole.o obj-$(CONFIG_XPNET) += xpnet.o + +obj-$(CONFIG_QSNET) += qsnet/ -Index: linux-2.6.5/fs/exec.c +Index: linux-2.6.5-7.191/fs/exec.c =================================================================== ---- linux-2.6.5.orig/fs/exec.c 2005-02-01 16:56:09.000000000 -0500 -+++ linux-2.6.5/fs/exec.c 2005-05-11 12:10:12.563913576 -0400 +--- linux-2.6.5-7.191.orig/fs/exec.c 2005-06-28 12:24:23.000000000 -0400 ++++ linux-2.6.5-7.191/fs/exec.c 2005-07-28 14:52:52.928666576 -0400 @@ -65,6 +65,8 @@ #include #endif @@ -75701,8 +75701,8 @@ Index: linux-2.6.5/fs/exec.c + int core_uses_pid; char core_pattern[65] = "core"; - /* The maximal length of core_pattern is also specified in sysctl.c */ -@@ -1197,6 +1199,9 @@ + int suid_dumpable = 0; +@@ -1202,6 +1204,9 @@ if (retval < 0) goto out; @@ -75712,19 +75712,19 @@ Index: linux-2.6.5/fs/exec.c retval = search_binary_handler(&bprm,regs); if (retval >= 0) { TRIG_EVENT(exec_hook, file->f_dentry->d_name.len, -Index: linux-2.6.5/fs/select.c +Index: linux-2.6.5-7.191/fs/select.c =================================================================== ---- linux-2.6.5.orig/fs/select.c 2005-02-01 16:55:41.000000000 -0500 -+++ linux-2.6.5/fs/select.c 2005-05-11 12:10:12.564913424 -0400 +--- linux-2.6.5-7.191.orig/fs/select.c 2005-06-28 12:24:00.000000000 -0400 ++++ linux-2.6.5-7.191/fs/select.c 2005-07-28 14:52:52.928666576 -0400 @@ -649,3 +649,4 @@ } return -EIOCBRETRY; } +EXPORT_SYMBOL_GPL(sys_poll); -Index: linux-2.6.5/fs/read_write.c +Index: linux-2.6.5-7.191/fs/read_write.c =================================================================== ---- linux-2.6.5.orig/fs/read_write.c 2005-02-01 16:56:02.000000000 -0500 -+++ linux-2.6.5/fs/read_write.c 2005-05-11 14:08:49.220017400 -0400 +--- linux-2.6.5-7.191.orig/fs/read_write.c 2005-06-28 12:24:09.000000000 -0400 ++++ linux-2.6.5-7.191/fs/read_write.c 2005-07-28 14:52:52.929666424 -0400 @@ -339,6 +339,7 @@ return ret; @@ -75733,10 +75733,10 @@ Index: linux-2.6.5/fs/read_write.c asmlinkage ssize_t sys_pread64(unsigned int fd, char __user *buf, size_t count, loff_t pos) -Index: linux-2.6.5/include/elan/bitmap.h +Index: linux-2.6.5-7.191/include/elan/bitmap.h =================================================================== ---- linux-2.6.5.orig/include/elan/bitmap.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan/bitmap.h 2005-05-11 12:10:12.564913424 -0400 +--- linux-2.6.5-7.191.orig/include/elan/bitmap.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan/bitmap.h 2005-07-28 14:52:52.929666424 -0400 @@ -0,0 +1,74 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -75812,10 +75812,10 @@ Index: linux-2.6.5/include/elan/bitmap.h + * c-file-style: "linux" + * End: + */ -Index: linux-2.6.5/include/elan/capability.h +Index: linux-2.6.5-7.191/include/elan/capability.h =================================================================== ---- linux-2.6.5.orig/include/elan/capability.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan/capability.h 2005-05-11 12:10:12.565913272 -0400 +--- linux-2.6.5-7.191.orig/include/elan/capability.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan/capability.h 2005-07-28 14:52:52.930666272 -0400 @@ -0,0 +1,197 @@ +/* + * Copyright (c) 2003 by Quadrics Limited. @@ -76014,10 +76014,10 @@ Index: linux-2.6.5/include/elan/capability.h + * c-file-style: "linux" + * End: + */ -Index: linux-2.6.5/include/elan/cm.h +Index: linux-2.6.5-7.191/include/elan/cm.h =================================================================== ---- linux-2.6.5.orig/include/elan/cm.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan/cm.h 2005-05-11 12:10:12.566913120 -0400 +--- linux-2.6.5-7.191.orig/include/elan/cm.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan/cm.h 2005-07-28 14:52:52.931666120 -0400 @@ -0,0 +1,412 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -76431,10 +76431,10 @@ Index: linux-2.6.5/include/elan/cm.h + */ +#endif /* __ELAN_CM_H */ + -Index: linux-2.6.5/include/elan/compat.h +Index: linux-2.6.5-7.191/include/elan/compat.h =================================================================== ---- linux-2.6.5.orig/include/elan/compat.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan/compat.h 2005-05-11 12:10:12.566913120 -0400 +--- linux-2.6.5-7.191.orig/include/elan/compat.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan/compat.h 2005-07-28 14:52:52.931666120 -0400 @@ -0,0 +1,23 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -76459,10 +76459,10 @@ Index: linux-2.6.5/include/elan/compat.h + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/include/elan/device.h +Index: linux-2.6.5-7.191/include/elan/device.h =================================================================== ---- linux-2.6.5.orig/include/elan/device.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan/device.h 2005-05-11 12:10:12.566913120 -0400 +--- linux-2.6.5-7.191.orig/include/elan/device.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan/device.h 2005-07-28 14:52:52.932665968 -0400 @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2003 by Quadrics Limited. @@ -76526,10 +76526,10 @@ Index: linux-2.6.5/include/elan/device.h + * c-file-style: "linux" + * End: + */ -Index: linux-2.6.5/include/elan/devinfo.h +Index: linux-2.6.5-7.191/include/elan/devinfo.h =================================================================== ---- linux-2.6.5.orig/include/elan/devinfo.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan/devinfo.h 2005-05-11 12:10:12.567912968 -0400 +--- linux-2.6.5-7.191.orig/include/elan/devinfo.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan/devinfo.h 2005-07-28 14:52:52.932665968 -0400 @@ -0,0 +1,92 @@ +/* + * Copyright (c) 2003 by Quadrics Limited. @@ -76623,10 +76623,10 @@ Index: linux-2.6.5/include/elan/devinfo.h + * c-file-style: "linux" + * End: + */ -Index: linux-2.6.5/include/elan/elanmoddebug.h +Index: linux-2.6.5-7.191/include/elan/elanmoddebug.h =================================================================== ---- linux-2.6.5.orig/include/elan/elanmoddebug.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan/elanmoddebug.h 2005-05-11 12:10:12.567912968 -0400 +--- linux-2.6.5-7.191.orig/include/elan/elanmoddebug.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan/elanmoddebug.h 2005-07-28 14:52:52.932665968 -0400 @@ -0,0 +1,63 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -76691,10 +76691,10 @@ Index: linux-2.6.5/include/elan/elanmoddebug.h + * c-file-style: "linux" + * End: + */ -Index: linux-2.6.5/include/elan/elanmod.h +Index: linux-2.6.5-7.191/include/elan/elanmod.h =================================================================== ---- linux-2.6.5.orig/include/elan/elanmod.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan/elanmod.h 2005-05-11 12:10:12.567912968 -0400 +--- linux-2.6.5-7.191.orig/include/elan/elanmod.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan/elanmod.h 2005-07-28 14:52:52.932665968 -0400 @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2003 by Quadrics Limited. @@ -76755,10 +76755,10 @@ Index: linux-2.6.5/include/elan/elanmod.h + * c-file-style: "linux" + * End: + */ -Index: linux-2.6.5/include/elan/elanmod_linux.h +Index: linux-2.6.5-7.191/include/elan/elanmod_linux.h =================================================================== ---- linux-2.6.5.orig/include/elan/elanmod_linux.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan/elanmod_linux.h 2005-05-11 12:10:12.568912816 -0400 +--- linux-2.6.5-7.191.orig/include/elan/elanmod_linux.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan/elanmod_linux.h 2005-07-28 14:52:52.933665816 -0400 @@ -0,0 +1,140 @@ +/* + * Copyright (c) 2003 by Quadrics Ltd. @@ -76900,10 +76900,10 @@ Index: linux-2.6.5/include/elan/elanmod_linux.h + * c-file-style: "linux" + * End: + */ -Index: linux-2.6.5/include/elan/elanmod_subsystem.h +Index: linux-2.6.5-7.191/include/elan/elanmod_subsystem.h =================================================================== ---- linux-2.6.5.orig/include/elan/elanmod_subsystem.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan/elanmod_subsystem.h 2005-05-11 12:10:12.568912816 -0400 +--- linux-2.6.5-7.191.orig/include/elan/elanmod_subsystem.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan/elanmod_subsystem.h 2005-07-28 14:52:52.933665816 -0400 @@ -0,0 +1,138 @@ +/* + * Copyright (c) 2003 by Quadrics Limited. @@ -77043,10 +77043,10 @@ Index: linux-2.6.5/include/elan/elanmod_subsystem.h + * c-file-style: "linux" + * End: + */ -Index: linux-2.6.5/include/elan/epcomms.h +Index: linux-2.6.5-7.191/include/elan/epcomms.h =================================================================== ---- linux-2.6.5.orig/include/elan/epcomms.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan/epcomms.h 2005-05-11 12:10:12.569912664 -0400 +--- linux-2.6.5-7.191.orig/include/elan/epcomms.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan/epcomms.h 2005-07-28 14:52:52.935665512 -0400 @@ -0,0 +1,635 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -77683,10 +77683,10 @@ Index: linux-2.6.5/include/elan/epcomms.h + */ +#endif /* __ELAN_EPCOMMS_H */ + -Index: linux-2.6.5/include/elan/epsvc.h +Index: linux-2.6.5-7.191/include/elan/epsvc.h =================================================================== ---- linux-2.6.5.orig/include/elan/epsvc.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan/epsvc.h 2005-05-11 12:10:12.570912512 -0400 +--- linux-2.6.5-7.191.orig/include/elan/epsvc.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan/epsvc.h 2005-07-28 14:52:52.935665512 -0400 @@ -0,0 +1,36 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -77724,10 +77724,10 @@ Index: linux-2.6.5/include/elan/epsvc.h + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/include/elan/kalloc.h +Index: linux-2.6.5-7.191/include/elan/kalloc.h =================================================================== ---- linux-2.6.5.orig/include/elan/kalloc.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan/kalloc.h 2005-05-11 12:10:12.570912512 -0400 +--- linux-2.6.5-7.191.orig/include/elan/kalloc.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan/kalloc.h 2005-07-28 14:52:52.935665512 -0400 @@ -0,0 +1,108 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -77837,10 +77837,10 @@ Index: linux-2.6.5/include/elan/kalloc.h + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/include/elan/kcomm.h +Index: linux-2.6.5-7.191/include/elan/kcomm.h =================================================================== ---- linux-2.6.5.orig/include/elan/kcomm.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan/kcomm.h 2005-05-11 12:10:12.572912208 -0400 +--- linux-2.6.5-7.191.orig/include/elan/kcomm.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan/kcomm.h 2005-07-28 14:52:52.937665208 -0400 @@ -0,0 +1,839 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -78681,10 +78681,10 @@ Index: linux-2.6.5/include/elan/kcomm.h + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/include/elan/kcomm_stats.h +Index: linux-2.6.5-7.191/include/elan/kcomm_stats.h =================================================================== ---- linux-2.6.5.orig/include/elan/kcomm_stats.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan/kcomm_stats.h 2005-05-11 12:10:12.572912208 -0400 +--- linux-2.6.5-7.191.orig/include/elan/kcomm_stats.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan/kcomm_stats.h 2005-07-28 14:52:52.937665208 -0400 @@ -0,0 +1,153 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -78839,10 +78839,10 @@ Index: linux-2.6.5/include/elan/kcomm_stats.h + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/include/elan/kmap.h +Index: linux-2.6.5-7.191/include/elan/kmap.h =================================================================== ---- linux-2.6.5.orig/include/elan/kmap.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan/kmap.h 2005-05-11 12:10:12.572912208 -0400 +--- linux-2.6.5-7.191.orig/include/elan/kmap.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan/kmap.h 2005-07-28 14:52:52.938665056 -0400 @@ -0,0 +1,68 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -78912,10 +78912,10 @@ Index: linux-2.6.5/include/elan/kmap.h + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/include/elan/kmsg.h +Index: linux-2.6.5-7.191/include/elan/kmsg.h =================================================================== ---- linux-2.6.5.orig/include/elan/kmsg.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan/kmsg.h 2005-05-11 12:10:12.573912056 -0400 +--- linux-2.6.5-7.191.orig/include/elan/kmsg.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan/kmsg.h 2005-07-28 14:52:52.938665056 -0400 @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2003 by Quadrics Ltd. @@ -78931,10 +78931,10 @@ Index: linux-2.6.5/include/elan/kmsg.h +/* $Source: /cvs/master/quadrics/epmod/kmsg.h,v $ */ + +#endif /* __ELAN_KMSG_H */ -Index: linux-2.6.5/include/elan/kthread.h +Index: linux-2.6.5-7.191/include/elan/kthread.h =================================================================== ---- linux-2.6.5.orig/include/elan/kthread.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan/kthread.h 2005-05-11 12:10:12.573912056 -0400 +--- linux-2.6.5-7.191.orig/include/elan/kthread.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan/kthread.h 2005-07-28 14:52:52.938665056 -0400 @@ -0,0 +1,53 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -78989,10 +78989,10 @@ Index: linux-2.6.5/include/elan/kthread.h + * c-file-style: "linux" + * End: + */ -Index: linux-2.6.5/include/elan/nmh.h +Index: linux-2.6.5-7.191/include/elan/nmh.h =================================================================== ---- linux-2.6.5.orig/include/elan/nmh.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan/nmh.h 2005-05-11 12:10:12.573912056 -0400 +--- linux-2.6.5-7.191.orig/include/elan/nmh.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan/nmh.h 2005-07-28 14:52:52.939664904 -0400 @@ -0,0 +1,95 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -79089,10 +79089,10 @@ Index: linux-2.6.5/include/elan/nmh.h + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/include/elan/rmap.h +Index: linux-2.6.5-7.191/include/elan/rmap.h =================================================================== ---- linux-2.6.5.orig/include/elan/rmap.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan/rmap.h 2005-05-11 12:10:12.573912056 -0400 +--- linux-2.6.5-7.191.orig/include/elan/rmap.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan/rmap.h 2005-07-28 14:52:52.939664904 -0400 @@ -0,0 +1,49 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -79143,10 +79143,10 @@ Index: linux-2.6.5/include/elan/rmap.h + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/include/elan/statemap.h +Index: linux-2.6.5-7.191/include/elan/statemap.h =================================================================== ---- linux-2.6.5.orig/include/elan/statemap.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan/statemap.h 2005-05-11 12:10:12.574911904 -0400 +--- linux-2.6.5-7.191.orig/include/elan/statemap.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan/statemap.h 2005-07-28 14:52:52.939664904 -0400 @@ -0,0 +1,52 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -79200,10 +79200,10 @@ Index: linux-2.6.5/include/elan/statemap.h + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/include/elan/stats.h +Index: linux-2.6.5-7.191/include/elan/stats.h =================================================================== ---- linux-2.6.5.orig/include/elan/stats.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan/stats.h 2005-05-11 12:10:12.574911904 -0400 +--- linux-2.6.5-7.191.orig/include/elan/stats.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan/stats.h 2005-07-28 14:52:52.939664904 -0400 @@ -0,0 +1,85 @@ +/* + * Copyright (c) 2003 by Quadrics Limited. @@ -79290,10 +79290,10 @@ Index: linux-2.6.5/include/elan/stats.h + * c-file-style: "linux" + * End: + */ -Index: linux-2.6.5/include/elan3/compat.h +Index: linux-2.6.5-7.191/include/elan3/compat.h =================================================================== ---- linux-2.6.5.orig/include/elan3/compat.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan3/compat.h 2005-05-11 12:10:12.575911752 -0400 +--- linux-2.6.5-7.191.orig/include/elan3/compat.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan3/compat.h 2005-07-28 14:52:52.940664752 -0400 @@ -0,0 +1,177 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -79472,10 +79472,10 @@ Index: linux-2.6.5/include/elan3/compat.h + * End: + */ + -Index: linux-2.6.5/include/elan3/dma.h +Index: linux-2.6.5-7.191/include/elan3/dma.h =================================================================== ---- linux-2.6.5.orig/include/elan3/dma.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan3/dma.h 2005-05-11 12:10:12.575911752 -0400 +--- linux-2.6.5-7.191.orig/include/elan3/dma.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan3/dma.h 2005-07-28 14:52:52.941664600 -0400 @@ -0,0 +1,213 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -79690,10 +79690,10 @@ Index: linux-2.6.5/include/elan3/dma.h + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/include/elan3/e3types.h +Index: linux-2.6.5-7.191/include/elan3/e3types.h =================================================================== ---- linux-2.6.5.orig/include/elan3/e3types.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan3/e3types.h 2005-05-11 12:10:12.582910688 -0400 +--- linux-2.6.5-7.191.orig/include/elan3/e3types.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan3/e3types.h 2005-07-28 14:52:52.941664600 -0400 @@ -0,0 +1,82 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -79777,10 +79777,10 @@ Index: linux-2.6.5/include/elan3/e3types.h + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/include/elan3/elan3mmu.h +Index: linux-2.6.5-7.191/include/elan3/elan3mmu.h =================================================================== ---- linux-2.6.5.orig/include/elan3/elan3mmu.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan3/elan3mmu.h 2005-05-11 12:10:12.583910536 -0400 +--- linux-2.6.5-7.191.orig/include/elan3/elan3mmu.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan3/elan3mmu.h 2005-07-28 14:52:52.942664448 -0400 @@ -0,0 +1,346 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -80128,10 +80128,10 @@ Index: linux-2.6.5/include/elan3/elan3mmu.h + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/include/elan3/elan3mmu_linux.h +Index: linux-2.6.5-7.191/include/elan3/elan3mmu_linux.h =================================================================== ---- linux-2.6.5.orig/include/elan3/elan3mmu_linux.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan3/elan3mmu_linux.h 2005-05-11 12:10:12.584910384 -0400 +--- linux-2.6.5-7.191.orig/include/elan3/elan3mmu_linux.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan3/elan3mmu_linux.h 2005-07-28 14:52:52.942664448 -0400 @@ -0,0 +1,39 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -80172,10 +80172,10 @@ Index: linux-2.6.5/include/elan3/elan3mmu_linux.h + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/include/elan3/elan3ops.h +Index: linux-2.6.5-7.191/include/elan3/elan3ops.h =================================================================== ---- linux-2.6.5.orig/include/elan3/elan3ops.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan3/elan3ops.h 2005-05-11 12:10:12.584910384 -0400 +--- linux-2.6.5-7.191.orig/include/elan3/elan3ops.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan3/elan3ops.h 2005-07-28 14:52:52.942664448 -0400 @@ -0,0 +1,42 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -80219,10 +80219,10 @@ Index: linux-2.6.5/include/elan3/elan3ops.h + * c-file-style: "linux" + * End: + */ -Index: linux-2.6.5/include/elan3/elanctxt.h +Index: linux-2.6.5-7.191/include/elan3/elanctxt.h =================================================================== ---- linux-2.6.5.orig/include/elan3/elanctxt.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan3/elanctxt.h 2005-05-11 12:10:12.586910080 -0400 +--- linux-2.6.5-7.191.orig/include/elan3/elanctxt.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan3/elanctxt.h 2005-07-28 14:52:52.944664144 -0400 @@ -0,0 +1,856 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -81080,10 +81080,10 @@ Index: linux-2.6.5/include/elan3/elanctxt.h + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/include/elan3/elandebug.h +Index: linux-2.6.5-7.191/include/elan3/elandebug.h =================================================================== ---- linux-2.6.5.orig/include/elan3/elandebug.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan3/elandebug.h 2005-05-11 12:10:12.586910080 -0400 +--- linux-2.6.5-7.191.orig/include/elan3/elandebug.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan3/elandebug.h 2005-07-28 14:52:52.945663992 -0400 @@ -0,0 +1,106 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -81191,10 +81191,10 @@ Index: linux-2.6.5/include/elan3/elandebug.h + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/include/elan3/elandev.h +Index: linux-2.6.5-7.191/include/elan3/elandev.h =================================================================== ---- linux-2.6.5.orig/include/elan3/elandev.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan3/elandev.h 2005-05-11 12:10:12.587909928 -0400 +--- linux-2.6.5-7.191.orig/include/elan3/elandev.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan3/elandev.h 2005-07-28 14:52:52.946663840 -0400 @@ -0,0 +1,581 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -81777,10 +81777,10 @@ Index: linux-2.6.5/include/elan3/elandev.h + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/include/elan3/elandev_linux.h +Index: linux-2.6.5-7.191/include/elan3/elandev_linux.h =================================================================== ---- linux-2.6.5.orig/include/elan3/elandev_linux.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan3/elandev_linux.h 2005-05-11 12:10:12.588909776 -0400 +--- linux-2.6.5-7.191.orig/include/elan3/elandev_linux.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan3/elandev_linux.h 2005-07-28 14:52:52.946663840 -0400 @@ -0,0 +1,74 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -81856,10 +81856,10 @@ Index: linux-2.6.5/include/elan3/elandev_linux.h + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/include/elan3/elanio.h +Index: linux-2.6.5-7.191/include/elan3/elanio.h =================================================================== ---- linux-2.6.5.orig/include/elan3/elanio.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan3/elanio.h 2005-05-11 12:10:12.588909776 -0400 +--- linux-2.6.5-7.191.orig/include/elan3/elanio.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan3/elanio.h 2005-07-28 14:52:52.947663688 -0400 @@ -0,0 +1,226 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -82087,10 +82087,10 @@ Index: linux-2.6.5/include/elan3/elanio.h + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/include/elan3/elanregs.h +Index: linux-2.6.5-7.191/include/elan3/elanregs.h =================================================================== ---- linux-2.6.5.orig/include/elan3/elanregs.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan3/elanregs.h 2005-05-11 12:10:12.590909472 -0400 +--- linux-2.6.5-7.191.orig/include/elan3/elanregs.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan3/elanregs.h 2005-07-28 14:52:52.949663384 -0400 @@ -0,0 +1,1063 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -83155,10 +83155,10 @@ Index: linux-2.6.5/include/elan3/elanregs.h + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/include/elan3/elansyscall.h +Index: linux-2.6.5-7.191/include/elan3/elansyscall.h =================================================================== ---- linux-2.6.5.orig/include/elan3/elansyscall.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan3/elansyscall.h 2005-05-11 12:10:12.591909320 -0400 +--- linux-2.6.5-7.191.orig/include/elan3/elansyscall.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan3/elansyscall.h 2005-07-28 14:52:52.949663384 -0400 @@ -0,0 +1,124 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -83284,10 +83284,10 @@ Index: linux-2.6.5/include/elan3/elansyscall.h + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/include/elan3/elanuregs.h +Index: linux-2.6.5-7.191/include/elan3/elanuregs.h =================================================================== ---- linux-2.6.5.orig/include/elan3/elanuregs.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan3/elanuregs.h 2005-05-11 12:10:12.591909320 -0400 +--- linux-2.6.5-7.191.orig/include/elan3/elanuregs.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan3/elanuregs.h 2005-07-28 14:52:52.950663232 -0400 @@ -0,0 +1,295 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -83584,10 +83584,10 @@ Index: linux-2.6.5/include/elan3/elanuregs.h + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/include/elan3/elanvp.h +Index: linux-2.6.5-7.191/include/elan3/elanvp.h =================================================================== ---- linux-2.6.5.orig/include/elan3/elanvp.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan3/elanvp.h 2005-05-11 12:10:12.592909168 -0400 +--- linux-2.6.5-7.191.orig/include/elan3/elanvp.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan3/elanvp.h 2005-07-28 14:52:52.950663232 -0400 @@ -0,0 +1,165 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -83754,10 +83754,10 @@ Index: linux-2.6.5/include/elan3/elanvp.h + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/include/elan3/events.h +Index: linux-2.6.5-7.191/include/elan3/events.h =================================================================== ---- linux-2.6.5.orig/include/elan3/events.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan3/events.h 2005-05-11 12:10:12.592909168 -0400 +--- linux-2.6.5-7.191.orig/include/elan3/events.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan3/events.h 2005-07-28 14:52:52.951663080 -0400 @@ -0,0 +1,183 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -83942,10 +83942,10 @@ Index: linux-2.6.5/include/elan3/events.h + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/include/elan3/intrinsics.h +Index: linux-2.6.5-7.191/include/elan3/intrinsics.h =================================================================== ---- linux-2.6.5.orig/include/elan3/intrinsics.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan3/intrinsics.h 2005-05-11 12:10:12.593909016 -0400 +--- linux-2.6.5-7.191.orig/include/elan3/intrinsics.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan3/intrinsics.h 2005-07-28 14:52:52.952662928 -0400 @@ -0,0 +1,320 @@ +/* + * Copyright (c) 2003 by Quadrics Limited. @@ -84267,10 +84267,10 @@ Index: linux-2.6.5/include/elan3/intrinsics.h + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/include/elan3/minames.h +Index: linux-2.6.5-7.191/include/elan3/minames.h =================================================================== ---- linux-2.6.5.orig/include/elan3/minames.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan3/minames.h 2005-05-11 12:10:12.594908864 -0400 +--- linux-2.6.5-7.191.orig/include/elan3/minames.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan3/minames.h 2005-07-28 14:52:52.952662928 -0400 @@ -0,0 +1,256 @@ +{MI_WaitForRemoteDescRead, "MI_WaitForRemoteDescRead"}, +{MI_WaitForRemoteDescRead2, "MI_WaitForRemoteDescRead2"}, @@ -84528,10 +84528,10 @@ Index: linux-2.6.5/include/elan3/minames.h +{MI_CheckForRunIfZero, "MI_CheckForRunIfZero"}, +{MI_TestForBreakOrSuspend, "MI_TestForBreakOrSuspend"}, +{MI_SwapForRunable, "MI_SwapForRunable"}, -Index: linux-2.6.5/include/elan3/neterr_rpc.h +Index: linux-2.6.5-7.191/include/elan3/neterr_rpc.h =================================================================== ---- linux-2.6.5.orig/include/elan3/neterr_rpc.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan3/neterr_rpc.h 2005-05-11 12:10:12.594908864 -0400 +--- linux-2.6.5-7.191.orig/include/elan3/neterr_rpc.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan3/neterr_rpc.h 2005-07-28 14:52:52.953662776 -0400 @@ -0,0 +1,68 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -84601,10 +84601,10 @@ Index: linux-2.6.5/include/elan3/neterr_rpc.h + * End: + */ +#endif /* __ELAN3_NETERR_RPC_H */ -Index: linux-2.6.5/include/elan3/perm.h +Index: linux-2.6.5-7.191/include/elan3/perm.h =================================================================== ---- linux-2.6.5.orig/include/elan3/perm.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan3/perm.h 2005-05-11 12:10:12.594908864 -0400 +--- linux-2.6.5-7.191.orig/include/elan3/perm.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan3/perm.h 2005-07-28 14:52:52.953662776 -0400 @@ -0,0 +1,29 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -84635,10 +84635,10 @@ Index: linux-2.6.5/include/elan3/perm.h + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/include/elan3/pte.h +Index: linux-2.6.5-7.191/include/elan3/pte.h =================================================================== ---- linux-2.6.5.orig/include/elan3/pte.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan3/pte.h 2005-05-11 12:10:12.595908712 -0400 +--- linux-2.6.5-7.191.orig/include/elan3/pte.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan3/pte.h 2005-07-28 14:52:52.953662776 -0400 @@ -0,0 +1,139 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -84779,10 +84779,10 @@ Index: linux-2.6.5/include/elan3/pte.h + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/include/elan3/spinlock.h +Index: linux-2.6.5-7.191/include/elan3/spinlock.h =================================================================== ---- linux-2.6.5.orig/include/elan3/spinlock.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan3/spinlock.h 2005-05-11 12:10:12.595908712 -0400 +--- linux-2.6.5-7.191.orig/include/elan3/spinlock.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan3/spinlock.h 2005-07-28 14:52:52.954662624 -0400 @@ -0,0 +1,195 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -84979,10 +84979,10 @@ Index: linux-2.6.5/include/elan3/spinlock.h + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/include/elan3/thread.h +Index: linux-2.6.5-7.191/include/elan3/thread.h =================================================================== ---- linux-2.6.5.orig/include/elan3/thread.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan3/thread.h 2005-05-11 12:10:12.596908560 -0400 +--- linux-2.6.5-7.191.orig/include/elan3/thread.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan3/thread.h 2005-07-28 14:52:52.954662624 -0400 @@ -0,0 +1,137 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -85121,10 +85121,10 @@ Index: linux-2.6.5/include/elan3/thread.h + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/include/elan3/threadlinkage.h +Index: linux-2.6.5-7.191/include/elan3/threadlinkage.h =================================================================== ---- linux-2.6.5.orig/include/elan3/threadlinkage.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan3/threadlinkage.h 2005-05-11 12:10:12.596908560 -0400 +--- linux-2.6.5-7.191.orig/include/elan3/threadlinkage.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan3/threadlinkage.h 2005-07-28 14:52:52.955662472 -0400 @@ -0,0 +1,103 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -85229,10 +85229,10 @@ Index: linux-2.6.5/include/elan3/threadlinkage.h + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/include/elan3/threadsyscall.h +Index: linux-2.6.5-7.191/include/elan3/threadsyscall.h =================================================================== ---- linux-2.6.5.orig/include/elan3/threadsyscall.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan3/threadsyscall.h 2005-05-11 12:10:12.596908560 -0400 +--- linux-2.6.5-7.191.orig/include/elan3/threadsyscall.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan3/threadsyscall.h 2005-07-28 14:52:52.955662472 -0400 @@ -0,0 +1,64 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -85298,10 +85298,10 @@ Index: linux-2.6.5/include/elan3/threadsyscall.h + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/include/elan3/trtype.h +Index: linux-2.6.5-7.191/include/elan3/trtype.h =================================================================== ---- linux-2.6.5.orig/include/elan3/trtype.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan3/trtype.h 2005-05-11 12:10:12.597908408 -0400 +--- linux-2.6.5-7.191.orig/include/elan3/trtype.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan3/trtype.h 2005-07-28 14:52:52.955662472 -0400 @@ -0,0 +1,116 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -85419,10 +85419,10 @@ Index: linux-2.6.5/include/elan3/trtype.h + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/include/elan3/urom_addrs.h +Index: linux-2.6.5-7.191/include/elan3/urom_addrs.h =================================================================== ---- linux-2.6.5.orig/include/elan3/urom_addrs.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan3/urom_addrs.h 2005-05-11 12:10:12.597908408 -0400 +--- linux-2.6.5-7.191.orig/include/elan3/urom_addrs.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan3/urom_addrs.h 2005-07-28 14:52:52.956662320 -0400 @@ -0,0 +1,262 @@ +#define MI_WaitForRemoteDescRead 0x0 +#define MI_WaitForRemoteDescRead2 0x1 @@ -85686,10 +85686,10 @@ Index: linux-2.6.5/include/elan3/urom_addrs.h + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/include/elan3/vmseg.h +Index: linux-2.6.5-7.191/include/elan3/vmseg.h =================================================================== ---- linux-2.6.5.orig/include/elan3/vmseg.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan3/vmseg.h 2005-05-11 12:10:12.598908256 -0400 +--- linux-2.6.5-7.191.orig/include/elan3/vmseg.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan3/vmseg.h 2005-07-28 14:52:52.956662320 -0400 @@ -0,0 +1,75 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -85766,10 +85766,10 @@ Index: linux-2.6.5/include/elan3/vmseg.h + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/include/elan3/vpd.h +Index: linux-2.6.5-7.191/include/elan3/vpd.h =================================================================== ---- linux-2.6.5.orig/include/elan3/vpd.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan3/vpd.h 2005-05-11 12:10:12.598908256 -0400 +--- linux-2.6.5-7.191.orig/include/elan3/vpd.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan3/vpd.h 2005-07-28 14:52:52.957662168 -0400 @@ -0,0 +1,47 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -85818,10 +85818,10 @@ Index: linux-2.6.5/include/elan3/vpd.h + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/include/elan4/commands.h +Index: linux-2.6.5-7.191/include/elan4/commands.h =================================================================== ---- linux-2.6.5.orig/include/elan4/commands.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan4/commands.h 2005-05-11 12:10:12.599908104 -0400 +--- linux-2.6.5-7.191.orig/include/elan4/commands.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan4/commands.h 2005-07-28 14:52:52.957662168 -0400 @@ -0,0 +1,247 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -86070,10 +86070,10 @@ Index: linux-2.6.5/include/elan4/commands.h + +#endif /* __ELAN4_COMMANDS_H */ + -Index: linux-2.6.5/include/elan4/debug.h +Index: linux-2.6.5-7.191/include/elan4/debug.h =================================================================== ---- linux-2.6.5.orig/include/elan4/debug.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan4/debug.h 2005-05-11 12:10:12.599908104 -0400 +--- linux-2.6.5-7.191.orig/include/elan4/debug.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan4/debug.h 2005-07-28 14:52:52.958662016 -0400 @@ -0,0 +1,113 @@ +/* + * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd. @@ -86188,10 +86188,10 @@ Index: linux-2.6.5/include/elan4/debug.h + * End: + */ +#endif /* _ELAN4_ELANDEBUG_H */ -Index: linux-2.6.5/include/elan4/device.h +Index: linux-2.6.5-7.191/include/elan4/device.h =================================================================== ---- linux-2.6.5.orig/include/elan4/device.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan4/device.h 2005-05-11 12:10:12.601907800 -0400 +--- linux-2.6.5-7.191.orig/include/elan4/device.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan4/device.h 2005-07-28 14:52:52.960661712 -0400 @@ -0,0 +1,811 @@ +/* + * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd. @@ -87004,10 +87004,10 @@ Index: linux-2.6.5/include/elan4/device.h + * End: + */ +#endif /* __ELAN4_ELANDEV_H */ -Index: linux-2.6.5/include/elan4/device_Linux.h +Index: linux-2.6.5-7.191/include/elan4/device_Linux.h =================================================================== ---- linux-2.6.5.orig/include/elan4/device_Linux.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan4/device_Linux.h 2005-05-11 12:10:12.601907800 -0400 +--- linux-2.6.5-7.191.orig/include/elan4/device_Linux.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan4/device_Linux.h 2005-07-28 14:52:52.960661712 -0400 @@ -0,0 +1,117 @@ +/* + * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd. @@ -87126,10 +87126,10 @@ Index: linux-2.6.5/include/elan4/device_Linux.h + * End: + */ +#endif /* __ELAN4_ELANDEV_LINUX_H */ -Index: linux-2.6.5/include/elan4/dma.h +Index: linux-2.6.5-7.191/include/elan4/dma.h =================================================================== ---- linux-2.6.5.orig/include/elan4/dma.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan4/dma.h 2005-05-11 12:10:12.602907648 -0400 +--- linux-2.6.5-7.191.orig/include/elan4/dma.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan4/dma.h 2005-07-28 14:52:52.960661712 -0400 @@ -0,0 +1,82 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -87213,10 +87213,10 @@ Index: linux-2.6.5/include/elan4/dma.h +} E4_DMA64; + +#endif /* __ELAN4_DMA_H */ -Index: linux-2.6.5/include/elan4/events.h +Index: linux-2.6.5-7.191/include/elan4/events.h =================================================================== ---- linux-2.6.5.orig/include/elan4/events.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan4/events.h 2005-05-11 12:10:12.602907648 -0400 +--- linux-2.6.5-7.191.orig/include/elan4/events.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan4/events.h 2005-07-28 14:52:52.961661560 -0400 @@ -0,0 +1,179 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -87397,10 +87397,10 @@ Index: linux-2.6.5/include/elan4/events.h +#endif /* _ASM */ + +#endif /* __ELAN4_EVENTS_H */ -Index: linux-2.6.5/include/elan4/i2c.h +Index: linux-2.6.5-7.191/include/elan4/i2c.h =================================================================== ---- linux-2.6.5.orig/include/elan4/i2c.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan4/i2c.h 2005-05-11 12:10:12.602907648 -0400 +--- linux-2.6.5-7.191.orig/include/elan4/i2c.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan4/i2c.h 2005-07-28 14:52:52.961661560 -0400 @@ -0,0 +1,47 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -87449,10 +87449,10 @@ Index: linux-2.6.5/include/elan4/i2c.h + * End: + */ +#endif /* _ELAN4_I2C_H */ -Index: linux-2.6.5/include/elan4/intcookie.h +Index: linux-2.6.5-7.191/include/elan4/intcookie.h =================================================================== ---- linux-2.6.5.orig/include/elan4/intcookie.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan4/intcookie.h 2005-05-11 12:10:12.603907496 -0400 +--- linux-2.6.5-7.191.orig/include/elan4/intcookie.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan4/intcookie.h 2005-07-28 14:52:52.961661560 -0400 @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd. @@ -87516,10 +87516,10 @@ Index: linux-2.6.5/include/elan4/intcookie.h + * End: + */ +#endif /* __ELAN4_INTCOOKIE_H */ -Index: linux-2.6.5/include/elan4/ioctl.h +Index: linux-2.6.5-7.191/include/elan4/ioctl.h =================================================================== ---- linux-2.6.5.orig/include/elan4/ioctl.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan4/ioctl.h 2005-05-11 12:10:12.603907496 -0400 +--- linux-2.6.5-7.191.orig/include/elan4/ioctl.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan4/ioctl.h 2005-07-28 14:52:52.962661408 -0400 @@ -0,0 +1,320 @@ +/* + * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd. @@ -87841,10 +87841,10 @@ Index: linux-2.6.5/include/elan4/ioctl.h + * End: + */ +#endif /* __ELAN4_IOCTL_H */ -Index: linux-2.6.5/include/elan4/mmu.h +Index: linux-2.6.5-7.191/include/elan4/mmu.h =================================================================== ---- linux-2.6.5.orig/include/elan4/mmu.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan4/mmu.h 2005-05-11 12:10:12.604907344 -0400 +--- linux-2.6.5-7.191.orig/include/elan4/mmu.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan4/mmu.h 2005-07-28 14:52:52.963661256 -0400 @@ -0,0 +1,94 @@ +/* + * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd. @@ -87940,10 +87940,10 @@ Index: linux-2.6.5/include/elan4/mmu.h + * End: + */ +#endif /* __ELAN4_MMU_H */ -Index: linux-2.6.5/include/elan4/neterr.h +Index: linux-2.6.5-7.191/include/elan4/neterr.h =================================================================== ---- linux-2.6.5.orig/include/elan4/neterr.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan4/neterr.h 2005-05-11 12:10:12.604907344 -0400 +--- linux-2.6.5-7.191.orig/include/elan4/neterr.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan4/neterr.h 2005-07-28 14:52:52.963661256 -0400 @@ -0,0 +1,40 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -87985,10 +87985,10 @@ Index: linux-2.6.5/include/elan4/neterr.h + * End: + */ +#endif /* __ELAN4_NETERR_H */ -Index: linux-2.6.5/include/elan4/pci.h +Index: linux-2.6.5-7.191/include/elan4/pci.h =================================================================== ---- linux-2.6.5.orig/include/elan4/pci.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan4/pci.h 2005-05-11 12:10:12.605907192 -0400 +--- linux-2.6.5-7.191.orig/include/elan4/pci.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan4/pci.h 2005-07-28 14:52:52.964661104 -0400 @@ -0,0 +1,227 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -88217,10 +88217,10 @@ Index: linux-2.6.5/include/elan4/pci.h +#define ECTRL_SYS_CLOCK_RATIO_MASK (7 << ECTRL_SYS_CLOCK_RATIO_SHIFT) + +#endif /* __ELAN4_PCI_H */ -Index: linux-2.6.5/include/elan4/registers.h +Index: linux-2.6.5-7.191/include/elan4/registers.h =================================================================== ---- linux-2.6.5.orig/include/elan4/registers.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan4/registers.h 2005-05-11 12:10:12.608906736 -0400 +--- linux-2.6.5-7.191.orig/include/elan4/registers.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan4/registers.h 2005-07-28 14:52:52.967660648 -0400 @@ -0,0 +1,1587 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -89809,10 +89809,10 @@ Index: linux-2.6.5/include/elan4/registers.h +#define ELAN4_REVB_NUM_COMMAND_QUEUES (ELAN4_REVB_I2C_OFFSET >> 13) + +#endif /* notdef _ELAN4_REGISTERS_H */ -Index: linux-2.6.5/include/elan4/sdram.h +Index: linux-2.6.5-7.191/include/elan4/sdram.h =================================================================== ---- linux-2.6.5.orig/include/elan4/sdram.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan4/sdram.h 2005-05-11 12:10:12.608906736 -0400 +--- linux-2.6.5-7.191.orig/include/elan4/sdram.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan4/sdram.h 2005-07-28 14:52:52.967660648 -0400 @@ -0,0 +1,41 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -89855,10 +89855,10 @@ Index: linux-2.6.5/include/elan4/sdram.h +#define SDRAM_MIN_PAGE_SIZE (8192) + +#endif /* __ELAN4_SDRAM_H */ -Index: linux-2.6.5/include/elan4/stats.h +Index: linux-2.6.5-7.191/include/elan4/stats.h =================================================================== ---- linux-2.6.5.orig/include/elan4/stats.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan4/stats.h 2005-05-11 12:10:12.609906584 -0400 +--- linux-2.6.5-7.191.orig/include/elan4/stats.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan4/stats.h 2005-07-28 14:52:52.967660648 -0400 @@ -0,0 +1,83 @@ +/* + * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd. @@ -89943,10 +89943,10 @@ Index: linux-2.6.5/include/elan4/stats.h + * End: + */ +#endif /*__ELAN4_STATS_H */ -Index: linux-2.6.5/include/elan4/tprintf.h +Index: linux-2.6.5-7.191/include/elan4/tprintf.h =================================================================== ---- linux-2.6.5.orig/include/elan4/tprintf.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan4/tprintf.h 2005-05-11 12:10:12.609906584 -0400 +--- linux-2.6.5-7.191.orig/include/elan4/tprintf.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan4/tprintf.h 2005-07-28 14:52:52.968660496 -0400 @@ -0,0 +1,24 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -89972,10 +89972,10 @@ Index: linux-2.6.5/include/elan4/tprintf.h +#endif /* _ASM */ + +#endif /* __ELAN4_TPRINTF_H */ -Index: linux-2.6.5/include/elan4/trap.h +Index: linux-2.6.5-7.191/include/elan4/trap.h =================================================================== ---- linux-2.6.5.orig/include/elan4/trap.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan4/trap.h 2005-05-11 12:10:12.614905824 -0400 +--- linux-2.6.5-7.191.orig/include/elan4/trap.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan4/trap.h 2005-07-28 14:52:52.968660496 -0400 @@ -0,0 +1,95 @@ +/* + * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd. @@ -90072,10 +90072,10 @@ Index: linux-2.6.5/include/elan4/trap.h + * End: + */ +#endif /* __ELAN4_TRAP_H */ -Index: linux-2.6.5/include/elan4/trtype.h +Index: linux-2.6.5-7.191/include/elan4/trtype.h =================================================================== ---- linux-2.6.5.orig/include/elan4/trtype.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan4/trtype.h 2005-05-11 12:10:12.615905672 -0400 +--- linux-2.6.5-7.191.orig/include/elan4/trtype.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan4/trtype.h 2005-07-28 14:52:52.968660496 -0400 @@ -0,0 +1,112 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -90189,10 +90189,10 @@ Index: linux-2.6.5/include/elan4/trtype.h +#define TR_TRACEROUTE1_BCAST_BOTTOM(val) (((val) >> 12) & 7) /* 12:14 Broadcast Bottom */ + +#endif /* _ELAN4_TRANSACTIONTYPE_H */ -Index: linux-2.6.5/include/elan4/types.h +Index: linux-2.6.5-7.191/include/elan4/types.h =================================================================== ---- linux-2.6.5.orig/include/elan4/types.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan4/types.h 2005-05-11 12:10:12.615905672 -0400 +--- linux-2.6.5-7.191.orig/include/elan4/types.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan4/types.h 2005-07-28 14:52:52.969660344 -0400 @@ -0,0 +1,69 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -90263,10 +90263,10 @@ Index: linux-2.6.5/include/elan4/types.h + +#endif /* __ELAN4_TYPES_H */ + -Index: linux-2.6.5/include/elan4/user.h +Index: linux-2.6.5-7.191/include/elan4/user.h =================================================================== ---- linux-2.6.5.orig/include/elan4/user.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan4/user.h 2005-05-11 12:10:12.616905520 -0400 +--- linux-2.6.5-7.191.orig/include/elan4/user.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan4/user.h 2005-07-28 14:52:52.970660192 -0400 @@ -0,0 +1,344 @@ +/* + * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd. @@ -90612,10 +90612,10 @@ Index: linux-2.6.5/include/elan4/user.h + * End: + */ +#endif /* __ELAN4_USER_H */ -Index: linux-2.6.5/include/elan4/userregs.h +Index: linux-2.6.5-7.191/include/elan4/userregs.h =================================================================== ---- linux-2.6.5.orig/include/elan4/userregs.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan4/userregs.h 2005-05-11 12:10:12.617905368 -0400 +--- linux-2.6.5-7.191.orig/include/elan4/userregs.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan4/userregs.h 2005-07-28 14:52:52.971660040 -0400 @@ -0,0 +1,383 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -91000,10 +91000,10 @@ Index: linux-2.6.5/include/elan4/userregs.h +#endif + +#endif /* __ELAN4_USERREGS_H */ -Index: linux-2.6.5/include/elan4/usertrap.h +Index: linux-2.6.5-7.191/include/elan4/usertrap.h =================================================================== ---- linux-2.6.5.orig/include/elan4/usertrap.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan4/usertrap.h 2005-05-11 12:10:12.617905368 -0400 +--- linux-2.6.5-7.191.orig/include/elan4/usertrap.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan4/usertrap.h 2005-07-28 14:52:52.971660040 -0400 @@ -0,0 +1,114 @@ +/* + * Copyright (c) 2001-2002 by Quadrics Supercomputers World Ltd. @@ -91119,10 +91119,10 @@ Index: linux-2.6.5/include/elan4/usertrap.h + * End: + */ +#endif /* __ELAN4_USERTRAP_H */ -Index: linux-2.6.5/include/elan4/xsdram.h +Index: linux-2.6.5-7.191/include/elan4/xsdram.h =================================================================== ---- linux-2.6.5.orig/include/elan4/xsdram.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/elan4/xsdram.h 2005-05-11 12:10:12.617905368 -0400 +--- linux-2.6.5-7.191.orig/include/elan4/xsdram.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/elan4/xsdram.h 2005-07-28 14:52:52.971660040 -0400 @@ -0,0 +1,59 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -91183,10 +91183,10 @@ Index: linux-2.6.5/include/elan4/xsdram.h +#endif + +#endif /* __ELAN4_XSDRAM_H */ -Index: linux-2.6.5/include/jtag/jtagio.h +Index: linux-2.6.5-7.191/include/jtag/jtagio.h =================================================================== ---- linux-2.6.5.orig/include/jtag/jtagio.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/jtag/jtagio.h 2005-05-11 12:10:12.618905216 -0400 +--- linux-2.6.5-7.191.orig/include/jtag/jtagio.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/jtag/jtagio.h 2005-07-28 14:52:52.972659888 -0400 @@ -0,0 +1,106 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -91294,10 +91294,10 @@ Index: linux-2.6.5/include/jtag/jtagio.h +#endif + +#endif /* __SYS_JTAGMOD_H */ -Index: linux-2.6.5/include/linux/init_task.h +Index: linux-2.6.5-7.191/include/linux/init_task.h =================================================================== ---- linux-2.6.5.orig/include/linux/init_task.h 2005-02-01 16:56:02.000000000 -0500 -+++ linux-2.6.5/include/linux/init_task.h 2005-05-11 12:10:12.618905216 -0400 +--- linux-2.6.5-7.191.orig/include/linux/init_task.h 2005-06-28 12:24:09.000000000 -0400 ++++ linux-2.6.5-7.191/include/linux/init_task.h 2005-07-28 14:52:52.972659888 -0400 @@ -3,6 +3,7 @@ #include @@ -91314,10 +91314,10 @@ Index: linux-2.6.5/include/linux/init_task.h } -Index: linux-2.6.5/include/linux/ioproc.h +Index: linux-2.6.5-7.191/include/linux/ioproc.h =================================================================== ---- linux-2.6.5.orig/include/linux/ioproc.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/linux/ioproc.h 2005-05-11 12:10:12.619905064 -0400 +--- linux-2.6.5-7.191.orig/include/linux/ioproc.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/linux/ioproc.h 2005-07-28 14:52:52.973659736 -0400 @@ -0,0 +1,271 @@ +/* -*- linux-c -*- + * @@ -91590,10 +91590,10 @@ Index: linux-2.6.5/include/linux/ioproc.h +#endif /* CONFIG_IOPROC */ + +#endif /* __LINUX_IOPROC_H__ */ -Index: linux-2.6.5/include/linux/ptrack.h +Index: linux-2.6.5-7.191/include/linux/ptrack.h =================================================================== ---- linux-2.6.5.orig/include/linux/ptrack.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/linux/ptrack.h 2005-05-11 12:10:12.619905064 -0400 +--- linux-2.6.5-7.191.orig/include/linux/ptrack.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/linux/ptrack.h 2005-07-28 14:52:52.973659736 -0400 @@ -0,0 +1,65 @@ +/* + * Copyright (C) 2000 Regents of the University of California @@ -91660,10 +91660,10 @@ Index: linux-2.6.5/include/linux/ptrack.h +#endif + +#endif /* __LINUX_PTRACK_H */ -Index: linux-2.6.5/include/linux/sched.h +Index: linux-2.6.5-7.191/include/linux/sched.h =================================================================== ---- linux-2.6.5.orig/include/linux/sched.h 2005-02-01 16:56:07.000000000 -0500 -+++ linux-2.6.5/include/linux/sched.h 2005-05-11 12:10:12.620904912 -0400 +--- linux-2.6.5-7.191.orig/include/linux/sched.h 2005-06-28 12:24:22.000000000 -0400 ++++ linux-2.6.5-7.191/include/linux/sched.h 2005-07-28 14:52:52.974659584 -0400 @@ -188,6 +188,9 @@ extern int max_timeslice, min_timeslice; @@ -91701,10 +91701,10 @@ Index: linux-2.6.5/include/linux/sched.h }; static inline pid_t process_group(struct task_struct *tsk) -Index: linux-2.6.5/include/qsnet/autoconf.h +Index: linux-2.6.5-7.191/include/qsnet/autoconf.h =================================================================== ---- linux-2.6.5.orig/include/qsnet/autoconf.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/qsnet/autoconf.h 2005-05-11 12:17:53.578828656 -0400 +--- linux-2.6.5-7.191.orig/include/qsnet/autoconf.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/qsnet/autoconf.h 2005-07-28 14:52:52.975659432 -0400 @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2004 by Quadrics Ltd. @@ -91744,10 +91744,10 @@ Index: linux-2.6.5/include/qsnet/autoconf.h +#define CONFIG_JTAG +#define CONFIG_QSNET +#define CONFIG_RMS -Index: linux-2.6.5/include/qsnet/condvar.h +Index: linux-2.6.5-7.191/include/qsnet/condvar.h =================================================================== ---- linux-2.6.5.orig/include/qsnet/condvar.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/qsnet/condvar.h 2005-05-11 12:10:12.621904760 -0400 +--- linux-2.6.5-7.191.orig/include/qsnet/condvar.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/qsnet/condvar.h 2005-07-28 14:52:52.975659432 -0400 @@ -0,0 +1,140 @@ +/* + * Copyright (C) 2000 Regents of the University of California @@ -91889,10 +91889,10 @@ Index: linux-2.6.5/include/qsnet/condvar.h + +#endif /* __KERNEL__ */ +#endif /* _LINUX_CONDVAR_H */ -Index: linux-2.6.5/include/qsnet/config.h +Index: linux-2.6.5-7.191/include/qsnet/config.h =================================================================== ---- linux-2.6.5.orig/include/qsnet/config.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/qsnet/config.h 2005-05-11 12:10:12.622904608 -0400 +--- linux-2.6.5-7.191.orig/include/qsnet/config.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/qsnet/config.h 2005-07-28 14:52:52.976659280 -0400 @@ -0,0 +1,195 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -92089,10 +92089,10 @@ Index: linux-2.6.5/include/qsnet/config.h +#include + +#endif /* _QSNET_CONFIG_H */ -Index: linux-2.6.5/include/qsnet/crwlock.h +Index: linux-2.6.5-7.191/include/qsnet/crwlock.h =================================================================== ---- linux-2.6.5.orig/include/qsnet/crwlock.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/qsnet/crwlock.h 2005-05-11 12:10:12.622904608 -0400 +--- linux-2.6.5-7.191.orig/include/qsnet/crwlock.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/qsnet/crwlock.h 2005-07-28 14:52:52.976659280 -0400 @@ -0,0 +1,207 @@ +/* + * Copyright (C) 2000 Regents of the University of California @@ -92301,10 +92301,10 @@ Index: linux-2.6.5/include/qsnet/crwlock.h + +#endif /* __KERNEL__ */ +#endif /* _LINUX_RWLOCK_H */ -Index: linux-2.6.5/include/qsnet/ctrl_linux.h +Index: linux-2.6.5-7.191/include/qsnet/ctrl_linux.h =================================================================== ---- linux-2.6.5.orig/include/qsnet/ctrl_linux.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/qsnet/ctrl_linux.h 2005-05-11 12:10:12.622904608 -0400 +--- linux-2.6.5-7.191.orig/include/qsnet/ctrl_linux.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/qsnet/ctrl_linux.h 2005-07-28 14:52:52.977659128 -0400 @@ -0,0 +1,37 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -92343,10 +92343,10 @@ Index: linux-2.6.5/include/qsnet/ctrl_linux.h + * c-file-style: "linux" + * End: + */ -Index: linux-2.6.5/include/qsnet/debug.h +Index: linux-2.6.5-7.191/include/qsnet/debug.h =================================================================== ---- linux-2.6.5.orig/include/qsnet/debug.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/qsnet/debug.h 2005-05-11 12:10:12.623904456 -0400 +--- linux-2.6.5-7.191.orig/include/qsnet/debug.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/qsnet/debug.h 2005-07-28 14:52:52.977659128 -0400 @@ -0,0 +1,68 @@ +/* + * Copyright (C) 2000 Regents of the University of California @@ -92416,10 +92416,10 @@ Index: linux-2.6.5/include/qsnet/debug.h + * c-file-style: "linux" + * End: + */ -Index: linux-2.6.5/include/qsnet/fence.h +Index: linux-2.6.5-7.191/include/qsnet/fence.h =================================================================== ---- linux-2.6.5.orig/include/qsnet/fence.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/qsnet/fence.h 2005-05-11 12:10:12.623904456 -0400 +--- linux-2.6.5-7.191.orig/include/qsnet/fence.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/qsnet/fence.h 2005-07-28 14:52:52.977659128 -0400 @@ -0,0 +1,178 @@ +/* + * Copyright (c) 2003 by Quadrics Supercomputers World Ltd. @@ -92599,10 +92599,10 @@ Index: linux-2.6.5/include/qsnet/fence.h + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/include/qsnet/kernel.h +Index: linux-2.6.5-7.191/include/qsnet/kernel.h =================================================================== ---- linux-2.6.5.orig/include/qsnet/kernel.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/qsnet/kernel.h 2005-05-11 12:10:12.623904456 -0400 +--- linux-2.6.5-7.191.orig/include/qsnet/kernel.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/qsnet/kernel.h 2005-07-28 14:52:52.978658976 -0400 @@ -0,0 +1,38 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -92642,10 +92642,10 @@ Index: linux-2.6.5/include/qsnet/kernel.h + + + -Index: linux-2.6.5/include/qsnet/kernel_linux.h +Index: linux-2.6.5-7.191/include/qsnet/kernel_linux.h =================================================================== ---- linux-2.6.5.orig/include/qsnet/kernel_linux.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/qsnet/kernel_linux.h 2005-05-11 12:10:12.624904304 -0400 +--- linux-2.6.5-7.191.orig/include/qsnet/kernel_linux.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/qsnet/kernel_linux.h 2005-07-28 14:52:52.978658976 -0400 @@ -0,0 +1,352 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -92999,10 +92999,10 @@ Index: linux-2.6.5/include/qsnet/kernel_linux.h + * c-file-style: "linux" + * End: + */ -Index: linux-2.6.5/include/qsnet/kpte.h +Index: linux-2.6.5-7.191/include/qsnet/kpte.h =================================================================== ---- linux-2.6.5.orig/include/qsnet/kpte.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/qsnet/kpte.h 2005-05-11 12:10:12.624904304 -0400 +--- linux-2.6.5-7.191.orig/include/qsnet/kpte.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/qsnet/kpte.h 2005-07-28 14:52:52.979658824 -0400 @@ -0,0 +1,109 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -93113,10 +93113,10 @@ Index: linux-2.6.5/include/qsnet/kpte.h + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/include/qsnet/kthread.h +Index: linux-2.6.5-7.191/include/qsnet/kthread.h =================================================================== ---- linux-2.6.5.orig/include/qsnet/kthread.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/qsnet/kthread.h 2005-05-11 12:10:12.630903392 -0400 +--- linux-2.6.5-7.191.orig/include/qsnet/kthread.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/qsnet/kthread.h 2005-07-28 14:52:52.979658824 -0400 @@ -0,0 +1,71 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -93189,10 +93189,10 @@ Index: linux-2.6.5/include/qsnet/kthread.h + * c-file-style: "linux" + * End: + */ -Index: linux-2.6.5/include/qsnet/list.h +Index: linux-2.6.5-7.191/include/qsnet/list.h =================================================================== ---- linux-2.6.5.orig/include/qsnet/list.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/qsnet/list.h 2005-05-11 12:10:12.631903240 -0400 +--- linux-2.6.5-7.191.orig/include/qsnet/list.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/qsnet/list.h 2005-07-28 14:52:52.979658824 -0400 @@ -0,0 +1,80 @@ +/* + * Copyright (c) 2003 by Quadrics Limited. @@ -93274,10 +93274,10 @@ Index: linux-2.6.5/include/qsnet/list.h + pos = n, n = (pos)->next) + +#endif /* __QSNET_LIST_H */ -Index: linux-2.6.5/include/qsnet/mutex.h +Index: linux-2.6.5-7.191/include/qsnet/mutex.h =================================================================== ---- linux-2.6.5.orig/include/qsnet/mutex.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/qsnet/mutex.h 2005-05-11 12:10:12.631903240 -0400 +--- linux-2.6.5-7.191.orig/include/qsnet/mutex.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/qsnet/mutex.h 2005-07-28 14:52:52.980658672 -0400 @@ -0,0 +1,91 @@ +/* + * Copyright (C) 2000 Regents of the University of California @@ -93370,10 +93370,10 @@ Index: linux-2.6.5/include/qsnet/mutex.h + +#endif /* __KERNEL__ */ +#endif /* _LINUX_MUTEX_H */ -Index: linux-2.6.5/include/qsnet/procfs_linux.h +Index: linux-2.6.5-7.191/include/qsnet/procfs_linux.h =================================================================== ---- linux-2.6.5.orig/include/qsnet/procfs_linux.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/qsnet/procfs_linux.h 2005-05-11 12:10:12.632903088 -0400 +--- linux-2.6.5-7.191.orig/include/qsnet/procfs_linux.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/qsnet/procfs_linux.h 2005-07-28 14:52:52.980658672 -0400 @@ -0,0 +1,234 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -93609,10 +93609,10 @@ Index: linux-2.6.5/include/qsnet/procfs_linux.h + * c-file-style: "linux" + * End: + */ -Index: linux-2.6.5/include/qsnet/pthread.h +Index: linux-2.6.5-7.191/include/qsnet/pthread.h =================================================================== ---- linux-2.6.5.orig/include/qsnet/pthread.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/qsnet/pthread.h 2005-05-11 12:10:12.632903088 -0400 +--- linux-2.6.5-7.191.orig/include/qsnet/pthread.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/qsnet/pthread.h 2005-07-28 14:52:52.980658672 -0400 @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2003 by Quadrics Supercomputers World Ltd. @@ -93673,10 +93673,10 @@ Index: linux-2.6.5/include/qsnet/pthread.h + * c-file-style: "stroustrup" + * End: + */ -Index: linux-2.6.5/include/qsnet/statsformat.h +Index: linux-2.6.5-7.191/include/qsnet/statsformat.h =================================================================== ---- linux-2.6.5.orig/include/qsnet/statsformat.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/qsnet/statsformat.h 2005-05-11 12:10:12.632903088 -0400 +--- linux-2.6.5-7.191.orig/include/qsnet/statsformat.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/qsnet/statsformat.h 2005-07-28 14:52:52.981658520 -0400 @@ -0,0 +1,25 @@ +#ifndef _QSNET_STATSFORMAT_H +#define _QSNET_STATSFORMAT_H @@ -93703,10 +93703,10 @@ Index: linux-2.6.5/include/qsnet/statsformat.h +#endif + +#endif -Index: linux-2.6.5/include/qsnet/types.h +Index: linux-2.6.5-7.191/include/qsnet/types.h =================================================================== ---- linux-2.6.5.orig/include/qsnet/types.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/qsnet/types.h 2005-05-11 12:10:12.632903088 -0400 +--- linux-2.6.5-7.191.orig/include/qsnet/types.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/qsnet/types.h 2005-07-28 14:52:52.981658520 -0400 @@ -0,0 +1,90 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -93798,10 +93798,10 @@ Index: linux-2.6.5/include/qsnet/types.h + + +#endif /* __QSNET_TYPES_H */ -Index: linux-2.6.5/include/qsnet/workarounds.h +Index: linux-2.6.5-7.191/include/qsnet/workarounds.h =================================================================== ---- linux-2.6.5.orig/include/qsnet/workarounds.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/qsnet/workarounds.h 2005-05-11 12:10:12.633902936 -0400 +--- linux-2.6.5-7.191.orig/include/qsnet/workarounds.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/qsnet/workarounds.h 2005-07-28 14:52:52.981658520 -0400 @@ -0,0 +1,24 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -93827,10 +93827,10 @@ Index: linux-2.6.5/include/qsnet/workarounds.h +#define ELAN_REVB_BUG_3 + +#endif /* _QSNET_WORKAROUNDS_H */ -Index: linux-2.6.5/include/rms/rmscall.h +Index: linux-2.6.5-7.191/include/rms/rmscall.h =================================================================== ---- linux-2.6.5.orig/include/rms/rmscall.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/rms/rmscall.h 2005-05-11 12:10:12.633902936 -0400 +--- linux-2.6.5-7.191.orig/include/rms/rmscall.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/rms/rmscall.h 2005-07-28 14:52:52.982658368 -0400 @@ -0,0 +1,144 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -93976,10 +93976,10 @@ Index: linux-2.6.5/include/rms/rmscall.h + + + -Index: linux-2.6.5/include/rms/rmsio.h +Index: linux-2.6.5-7.191/include/rms/rmsio.h =================================================================== ---- linux-2.6.5.orig/include/rms/rmsio.h 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/include/rms/rmsio.h 2005-05-11 12:10:12.634902784 -0400 +--- linux-2.6.5-7.191.orig/include/rms/rmsio.h 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/include/rms/rmsio.h 2005-07-28 14:52:52.982658368 -0400 @@ -0,0 +1,185 @@ +/* + * Copyright (c) 1996-2002 by Quadrics Supercomputers World Ltd. @@ -94166,10 +94166,10 @@ Index: linux-2.6.5/include/rms/rmsio.h + + + -Index: linux-2.6.5/ipc/shm.c +Index: linux-2.6.5-7.191/ipc/shm.c =================================================================== ---- linux-2.6.5.orig/ipc/shm.c 2005-02-01 16:55:41.000000000 -0500 -+++ linux-2.6.5/ipc/shm.c 2005-05-11 12:10:12.634902784 -0400 +--- linux-2.6.5-7.191.orig/ipc/shm.c 2005-06-28 12:24:24.000000000 -0400 ++++ linux-2.6.5-7.191/ipc/shm.c 2005-07-28 14:52:52.983658216 -0400 @@ -27,6 +27,7 @@ #include #include @@ -94178,7 +94178,7 @@ Index: linux-2.6.5/ipc/shm.c #include #include -@@ -871,6 +872,44 @@ +@@ -877,6 +878,44 @@ return audit_result(retval); } @@ -94223,10 +94223,10 @@ Index: linux-2.6.5/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) { -Index: linux-2.6.5/kernel/exit.c +Index: linux-2.6.5-7.191/kernel/exit.c =================================================================== ---- linux-2.6.5.orig/kernel/exit.c 2005-02-01 16:56:07.000000000 -0500 -+++ linux-2.6.5/kernel/exit.c 2005-05-11 12:10:12.684895184 -0400 +--- linux-2.6.5-7.191.orig/kernel/exit.c 2005-06-28 12:24:24.000000000 -0400 ++++ linux-2.6.5-7.191/kernel/exit.c 2005-07-28 14:52:52.984658064 -0400 @@ -40,6 +40,8 @@ /* tng related changes */ int (*tng_exitfunc)(int) = NULL; @@ -94236,7 +94236,7 @@ Index: linux-2.6.5/kernel/exit.c extern void sem_exit (void); extern struct task_struct *child_reaper; void (*do_eop_acct) (int, struct task_struct *); -@@ -840,6 +842,8 @@ +@@ -838,6 +840,8 @@ audit_exit(tsk, code); audit_free(tsk->audit); #endif @@ -94245,10 +94245,10 @@ Index: linux-2.6.5/kernel/exit.c __exit_mm(tsk); if (unlikely(tng_exitfunc)) -Index: linux-2.6.5/kernel/fork.c +Index: linux-2.6.5-7.191/kernel/fork.c =================================================================== ---- linux-2.6.5.orig/kernel/fork.c 2005-02-01 16:56:06.000000000 -0500 -+++ linux-2.6.5/kernel/fork.c 2005-05-11 12:10:12.685895032 -0400 +--- linux-2.6.5-7.191.orig/kernel/fork.c 2005-06-28 12:24:10.000000000 -0400 ++++ linux-2.6.5-7.191/kernel/fork.c 2005-07-28 14:52:52.985657912 -0400 @@ -14,6 +14,7 @@ #include #include @@ -94279,10 +94279,10 @@ Index: linux-2.6.5/kernel/fork.c /* Trace the event */ TRIG_EVENT(fork_hook, clone_flags, p, pid); if (!(clone_flags & CLONE_STOPPED)) { -Index: linux-2.6.5/kernel/Kconfig +Index: linux-2.6.5-7.191/kernel/Kconfig =================================================================== ---- linux-2.6.5.orig/kernel/Kconfig 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/kernel/Kconfig 2005-05-11 12:10:12.685895032 -0400 +--- linux-2.6.5-7.191.orig/kernel/Kconfig 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/kernel/Kconfig 2005-07-28 14:52:52.985657912 -0400 @@ -0,0 +1,14 @@ +# +# Kernel subsystem specific config @@ -94298,11 +94298,11 @@ Index: linux-2.6.5/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. -Index: linux-2.6.5/kernel/Makefile +Index: linux-2.6.5-7.191/kernel/Makefile =================================================================== ---- linux-2.6.5.orig/kernel/Makefile 2005-05-11 12:10:11.148128808 -0400 -+++ linux-2.6.5/kernel/Makefile 2005-05-11 12:10:12.685895032 -0400 -@@ -26,6 +26,7 @@ +--- linux-2.6.5-7.191.orig/kernel/Makefile 2005-06-28 12:24:10.000000000 -0400 ++++ linux-2.6.5-7.191/kernel/Makefile 2005-07-28 14:52:52.985657912 -0400 +@@ -25,6 +25,7 @@ obj-$(CONFIG_EVLOG) += evlbuf.o evlapi.o evlposix.o obj-$(CONFIG_HOOK) += hook.o obj-$(CONFIG_TRIGEVENT_HOOKS) += trigevent_hooks.o @@ -94310,10 +94310,10 @@ Index: linux-2.6.5/kernel/Makefile obj-$(CONFIG_LTT) += ltt/ obj-$(CONFIG_KPROBES) += kprobes.o obj-$(CONFIG_CPUSETS) += cpuset.o -Index: linux-2.6.5/kernel/ptrack.c +Index: linux-2.6.5-7.191/kernel/ptrack.c =================================================================== ---- linux-2.6.5.orig/kernel/ptrack.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/kernel/ptrack.c 2005-05-11 12:10:12.686894880 -0400 +--- linux-2.6.5-7.191.orig/kernel/ptrack.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/kernel/ptrack.c 2005-07-28 14:52:52.986657760 -0400 @@ -0,0 +1,145 @@ +/* + * Copyright (C) 2000 Regents of the University of California @@ -94460,11 +94460,11 @@ Index: linux-2.6.5/kernel/ptrack.c +EXPORT_SYMBOL(ptrack_register); +EXPORT_SYMBOL(ptrack_deregister); +EXPORT_SYMBOL(ptrack_registered); -Index: linux-2.6.5/kernel/signal.c +Index: linux-2.6.5-7.191/kernel/signal.c =================================================================== ---- linux-2.6.5.orig/kernel/signal.c 2005-02-01 16:56:05.000000000 -0500 -+++ linux-2.6.5/kernel/signal.c 2005-05-11 12:10:12.688894576 -0400 -@@ -2271,6 +2271,7 @@ +--- linux-2.6.5-7.191.orig/kernel/signal.c 2005-06-28 12:24:23.000000000 -0400 ++++ linux-2.6.5-7.191/kernel/signal.c 2005-07-28 14:52:52.987657608 -0400 +@@ -2282,6 +2282,7 @@ read_unlock(&tasklist_lock); return audit_lresult(error); } @@ -94472,10 +94472,10 @@ Index: linux-2.6.5/kernel/signal.c asmlinkage long sys_rt_sigqueueinfo(int pid, int sig, siginfo_t __user *uinfo) -Index: linux-2.6.5/mm/fremap.c +Index: linux-2.6.5-7.191/mm/fremap.c =================================================================== ---- linux-2.6.5.orig/mm/fremap.c 2005-02-01 16:55:36.000000000 -0500 -+++ linux-2.6.5/mm/fremap.c 2005-05-11 12:10:12.688894576 -0400 +--- linux-2.6.5-7.191.orig/mm/fremap.c 2005-06-28 12:23:58.000000000 -0400 ++++ linux-2.6.5-7.191/mm/fremap.c 2005-07-28 14:52:52.988657456 -0400 @@ -14,6 +14,7 @@ #include #include @@ -94508,10 +94508,10 @@ Index: linux-2.6.5/mm/fremap.c spin_unlock(&mm->page_table_lock); return 0; -Index: linux-2.6.5/mm/ioproc.c +Index: linux-2.6.5-7.191/mm/ioproc.c =================================================================== ---- linux-2.6.5.orig/mm/ioproc.c 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/mm/ioproc.c 2005-05-11 12:10:12.688894576 -0400 +--- linux-2.6.5-7.191.orig/mm/ioproc.c 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/mm/ioproc.c 2005-07-28 14:52:52.988657456 -0400 @@ -0,0 +1,58 @@ +/* -*- linux-c -*- + * @@ -94571,10 +94571,10 @@ Index: linux-2.6.5/mm/ioproc.c +} + +EXPORT_SYMBOL_GPL(ioproc_unregister_ops); -Index: linux-2.6.5/mm/Kconfig +Index: linux-2.6.5-7.191/mm/Kconfig =================================================================== ---- linux-2.6.5.orig/mm/Kconfig 2004-02-23 16:02:56.000000000 -0500 -+++ linux-2.6.5/mm/Kconfig 2005-05-11 12:10:12.689894424 -0400 +--- linux-2.6.5-7.191.orig/mm/Kconfig 2004-02-23 16:02:56.000000000 -0500 ++++ linux-2.6.5-7.191/mm/Kconfig 2005-07-28 14:52:52.989657304 -0400 @@ -0,0 +1,15 @@ +# +# VM subsystem specific config @@ -94591,20 +94591,20 @@ Index: linux-2.6.5/mm/Kconfig + incorporate advanced RDMA capabilities can be kept in sync with CPU + page table changes. + See Documentation/vm/ioproc.txt for more details. -Index: linux-2.6.5/mm/Makefile +Index: linux-2.6.5-7.191/mm/Makefile =================================================================== ---- linux-2.6.5.orig/mm/Makefile 2005-02-01 16:55:36.000000000 -0500 -+++ linux-2.6.5/mm/Makefile 2005-05-11 12:10:12.689894424 -0400 +--- linux-2.6.5-7.191.orig/mm/Makefile 2005-06-28 12:23:58.000000000 -0400 ++++ linux-2.6.5-7.191/mm/Makefile 2005-07-28 14:52:52.989657304 -0400 @@ -15,4 +15,5 @@ obj-$(CONFIG_SWAP) += page_io.o swap_state.o swapfile.o obj-$(CONFIG_PROC_MM) += proc_mm.o obj-$(CONFIG_NUMA) += policy.o +obj-$(CONFIG_IOPROC) += ioproc.o -Index: linux-2.6.5/mm/memory.c +Index: linux-2.6.5-7.191/mm/memory.c =================================================================== ---- linux-2.6.5.orig/mm/memory.c 2005-02-01 16:56:06.000000000 -0500 -+++ linux-2.6.5/mm/memory.c 2005-05-11 12:10:12.691894120 -0400 +--- linux-2.6.5-7.191.orig/mm/memory.c 2005-06-28 12:24:14.000000000 -0400 ++++ linux-2.6.5-7.191/mm/memory.c 2005-07-28 14:55:16.271875096 -0400 @@ -43,6 +43,7 @@ #include #include @@ -94653,15 +94653,15 @@ Index: linux-2.6.5/mm/memory.c flush_tlb_range(vma, beg, end); spin_unlock(&mm->page_table_lock); return error; -@@ -1120,6 +1126,7 @@ - ptep_establish(vma, address, page_table, entry); +@@ -1122,6 +1128,7 @@ 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; } -@@ -1155,6 +1162,7 @@ +@@ -1157,6 +1164,7 @@ } page_remove_rmap(old_page); @@ -94669,7 +94669,7 @@ Index: linux-2.6.5/mm/memory.c break_cow(vma, new_page, address, page_table); page_add_rmap(new_page, vma, address, 1); lru_cache_add_active(new_page); -@@ -1163,6 +1171,7 @@ +@@ -1165,6 +1173,7 @@ new_page = old_page; } pte_unmap(page_table); @@ -94677,31 +94677,31 @@ Index: linux-2.6.5/mm/memory.c page_cache_release(new_page); page_cache_release(old_page); spin_unlock(&mm->page_table_lock); -@@ -1469,6 +1478,7 @@ - /* No need to invalidate - it was non-present before */ +@@ -1472,6 +1481,7 @@ update_mmu_cache(vma, address, pte); + lazy_mmu_prot_update(pte); pte_unmap(page_table); + ioproc_update_page(vma, address); spin_unlock(&mm->page_table_lock); out: return ret; -@@ -1530,6 +1540,7 @@ - +@@ -1534,6 +1544,7 @@ /* No need to invalidate - it was non-present before */ update_mmu_cache(vma, addr, entry); + lazy_mmu_prot_update(entry); + ioproc_update_page(vma, addr); spin_unlock(&mm->page_table_lock); ret = VM_FAULT_MINOR; -@@ -1669,6 +1680,7 @@ - +@@ -1674,6 +1685,7 @@ /* no need to invalidate: a not-present page shouldn't be cached */ update_mmu_cache(vma, address, entry); + lazy_mmu_prot_update(entry); + ioproc_update_page(vma, address); spin_unlock(&mm->page_table_lock); out: return ret; -@@ -1768,6 +1780,7 @@ +@@ -1774,6 +1786,7 @@ spin_unlock(&mm->page_table_lock); return VM_FAULT_MINOR; } @@ -94709,10 +94709,10 @@ Index: linux-2.6.5/mm/memory.c /* Can be overwritten by the architecture */ -Index: linux-2.6.5/mm/mmap.c +Index: linux-2.6.5-7.191/mm/mmap.c =================================================================== ---- linux-2.6.5.orig/mm/mmap.c 2005-02-01 16:56:10.000000000 -0500 -+++ linux-2.6.5/mm/mmap.c 2005-05-11 12:10:12.692893968 -0400 +--- linux-2.6.5-7.191.orig/mm/mmap.c 2005-06-28 12:24:15.000000000 -0400 ++++ linux-2.6.5-7.191/mm/mmap.c 2005-07-28 14:52:52.992656848 -0400 @@ -25,6 +25,7 @@ #include #include @@ -94737,10 +94737,10 @@ Index: linux-2.6.5/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 */ -Index: linux-2.6.5/mm/mprotect.c +Index: linux-2.6.5-7.191/mm/mprotect.c =================================================================== ---- linux-2.6.5.orig/mm/mprotect.c 2005-02-01 16:55:59.000000000 -0500 -+++ linux-2.6.5/mm/mprotect.c 2005-05-11 12:10:12.692893968 -0400 +--- linux-2.6.5-7.191.orig/mm/mprotect.c 2005-06-28 12:24:14.000000000 -0400 ++++ linux-2.6.5-7.191/mm/mprotect.c 2005-07-28 14:52:52.992656848 -0400 @@ -10,6 +10,7 @@ #include @@ -94749,7 +94749,7 @@ Index: linux-2.6.5/mm/mprotect.c #include #include #include -@@ -99,6 +100,7 @@ +@@ -101,6 +102,7 @@ if (start >= end) BUG(); spin_lock(¤t->mm->page_table_lock); @@ -94757,10 +94757,10 @@ Index: linux-2.6.5/mm/mprotect.c do { change_pmd_range(dir, start, end - start, newprot); start = (start + PGDIR_SIZE) & PGDIR_MASK; -Index: linux-2.6.5/mm/mremap.c +Index: linux-2.6.5-7.191/mm/mremap.c =================================================================== ---- linux-2.6.5.orig/mm/mremap.c 2005-02-01 16:56:02.000000000 -0500 -+++ linux-2.6.5/mm/mremap.c 2005-05-11 12:10:12.693893816 -0400 +--- linux-2.6.5-7.191.orig/mm/mremap.c 2005-06-28 12:24:09.000000000 -0400 ++++ linux-2.6.5-7.191/mm/mremap.c 2005-07-28 14:52:52.993656696 -0400 @@ -9,6 +9,7 @@ #include @@ -94778,10 +94778,10 @@ Index: linux-2.6.5/mm/mremap.c flush_cache_range(vma, old_addr, old_addr + len); /* -Index: linux-2.6.5/mm/msync.c +Index: linux-2.6.5-7.191/mm/msync.c =================================================================== ---- linux-2.6.5.orig/mm/msync.c 2005-02-01 16:55:36.000000000 -0500 -+++ linux-2.6.5/mm/msync.c 2005-05-11 12:10:12.693893816 -0400 +--- linux-2.6.5-7.191.orig/mm/msync.c 2005-06-28 12:23:58.000000000 -0400 ++++ linux-2.6.5-7.191/mm/msync.c 2005-07-28 14:52:52.993656696 -0400 @@ -12,6 +12,7 @@ #include #include @@ -94798,10 +94798,10 @@ Index: linux-2.6.5/mm/msync.c do { error |= filemap_sync_pmd_range(dir, address, end, vma, flags); address = (address + PGDIR_SIZE) & PGDIR_MASK; -Index: linux-2.6.5/mm/objrmap.c +Index: linux-2.6.5-7.191/mm/objrmap.c =================================================================== ---- linux-2.6.5.orig/mm/objrmap.c 2005-02-01 16:56:06.000000000 -0500 -+++ linux-2.6.5/mm/objrmap.c 2005-05-11 12:10:12.694893664 -0400 +--- linux-2.6.5-7.191.orig/mm/objrmap.c 2005-06-28 12:24:10.000000000 -0400 ++++ linux-2.6.5-7.191/mm/objrmap.c 2005-07-28 14:52:52.994656544 -0400 @@ -29,6 +29,7 @@ #include #include diff --git a/lustre/kernel_patches/series/2.6-suse-newer.series b/lustre/kernel_patches/series/2.6-suse-newer.series index 86a2b59..7b038b0 100644 --- a/lustre/kernel_patches/series/2.6-suse-newer.series +++ b/lustre/kernel_patches/series/2.6-suse-newer.series @@ -1,14 +1,6 @@ dev_read_only-2.6-lnxi.patch sd_iostats-2.6-suse.patch blkdev_tunables-2.6-suse.patch -bluesmoke-2.6-suse-lnxi.patch -mtd-2.6-suse-lnxi.patch -perfctr-2.6-suse-lnxi.patch -kexec-2.6-suse-lnxi.patch -export-filemap_populate.patch -grab_cache_page_nowait_gfp-2.6-suse.patch -remove-suid-2.6-suse.patch -link_notlast-susefix.patch uml-exprt-clearuser.patch qsnet-suse-2.6.patch fsprivate-2.6.patch diff --git a/lustre/kernel_patches/targets/2.6-suse.target.in b/lustre/kernel_patches/targets/2.6-suse.target.in index a67deac..3647196 100644 --- a/lustre/kernel_patches/targets/2.6-suse.target.in +++ b/lustre/kernel_patches/targets/2.6-suse.target.in @@ -1,9 +1,9 @@ lnxmaj="2.6.5" -lnxrel="7.141" +lnxrel="7.191" KERNEL=linux-$lnxmaj-$lnxrel.tar.bz2 # they include our patches -SERIES=2.6-suse-lnxi.series +SERIES=2.6-suse-newer.series VERSION=$lnxmaj EXTRA_VERSION="${lnxrel}_lustre.@VERSION@" LUSTRE_VERSION=@VERSION@ -- 1.8.3.1