From: yangsheng Date: Sun, 8 May 2011 14:43:59 +0000 (+0800) Subject: LU-228 kernel update [RHEL5 U6 2.6.18-238.9.1.el5] X-Git-Tag: 2.0.61.0~2 X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=1d95408cfbacf7462314325996d3cdf087764266;p=fs%2Flustre-release.git LU-228 kernel update [RHEL5 U6 2.6.18-238.9.1.el5] Change-Id: I7f9dc92f97f675a6dac1ff222c055bf13ca3b2a0 Signed-off-by: Yang Sheng Reviewed-on: http://review.whamcloud.com/514 Tested-by: Hudson Reviewed-by: Johann Lombardi Reviewed-by: Oleg Drokin --- diff --git a/build/lbuild b/build/lbuild index 92ed337..987aa79 100755 --- a/build/lbuild +++ b/build/lbuild @@ -75,6 +75,8 @@ DISTRO= KERNELTREE= # default to not adding -lustre- into the kernel RPM package names KERNEL_LUSTRE_NAMING=false +# default not use kabi check. +USE_KABI=false # patchless build KERNELRPMSBASE= diff --git a/build/lbuild-rhel b/build/lbuild-rhel index 5b80742..082476b 100644 --- a/build/lbuild-rhel +++ b/build/lbuild-rhel @@ -94,7 +94,9 @@ prepare_and_build_srpm() { fi # XXX - need to figure this kabichk crap out -- it fails the build - rpmbuildopt="$rpmbuildopt --without kabichk" + if ! $USE_KABI; then + rpmbuildopt="$rpmbuildopt --without kabichk" + fi # get any release specific build options rpmbuildopt="$rpmbuildopt $(get_rpmbuildopts)" diff --git a/build/lbuild-rhel5 b/build/lbuild-rhel5 index 7bd8909..6190fcd 100644 --- a/build/lbuild-rhel5 +++ b/build/lbuild-rhel5 @@ -91,8 +91,10 @@ unpack_linux_devel_rpm-rhel5() { unpack_linux_devel_rpm-rhel "$callers_rpm" - if [ ! -f usr/src/kernels/${lnxmaj}${lnxmin}-${lnxrel}-$TARGET_ARCH/symsets-${lnxmaj}${lnxmin}-${lnxrel}.tar.gz ]; then - fatal 1 "cannot build modules: the Kernel's symsets is missing." + if $USE_KABI; then + if [ ! -f usr/src/kernels/${lnxmaj}${lnxmin}-${lnxrel}-$TARGET_ARCH/symsets-${lnxmaj}${lnxmin}-${lnxrel}.tar.gz ]; then + fatal 1 "cannot build modules: the Kernel's symsets is missing." + fi fi return 0 diff --git a/ldiskfs/kernel_patches/patches/ext3-corrupted-orphans-2.6.patch b/ldiskfs/kernel_patches/patches/ext3-corrupted-orphans-2.6.patch index 607cf1e..cff6371 100644 --- a/ldiskfs/kernel_patches/patches/ext3-corrupted-orphans-2.6.patch +++ b/ldiskfs/kernel_patches/patches/ext3-corrupted-orphans-2.6.patch @@ -36,12 +36,12 @@ - if (!(S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode) || - S_ISLNK(inode->i_mode))) -- return; +- goto out_notrans; - if (ext3_inode_is_fast_symlink(inode)) -- return; +- goto out_notrans; - if (IS_APPEND(inode) || IS_IMMUTABLE(inode)) + if (!ext3_can_truncate(inode)) - return; + goto out_notrans; /* --- linux-2.6.18-128.7.1.orig/fs/ext3/ialloc.c 2009-09-15 10:24:17.000000000 -0400 diff --git a/ldiskfs/kernel_patches/patches/ext4-big-endian-check-2.6-rhel5.patch b/ldiskfs/kernel_patches/patches/ext4-big-endian-check-2.6-rhel5.patch index 0503d35..6775a31 100644 --- a/ldiskfs/kernel_patches/patches/ext4-big-endian-check-2.6-rhel5.patch +++ b/ldiskfs/kernel_patches/patches/ext4-big-endian-check-2.6-rhel5.patch @@ -51,6 +51,6 @@ Index: linux-2.6.18-128.1.6/fs/ext4/super.c + } +#endif + - bgl_lock_init(&sbi->s_blockgroup_lock); + bgl_lock_init(sbi->s_blockgroup_lock); sbi->s_last_alloc_group = -1; diff --git a/ldiskfs/kernel_patches/patches/ext4-extents-mount-option-rhel5.patch b/ldiskfs/kernel_patches/patches/ext4-extents-mount-option-rhel5.patch index 91aee70..be276ae 100644 --- a/ldiskfs/kernel_patches/patches/ext4-extents-mount-option-rhel5.patch +++ b/ldiskfs/kernel_patches/patches/ext4-extents-mount-option-rhel5.patch @@ -122,7 +122,7 @@ diff -up linux-2.6.18-164/fs/ext4/super.c linux-2.6.18-164/fs/ext4/super.c + case Opt_extents: + if (!EXT4_HAS_INCOMPAT_FEATURE(sb, + EXT4_FEATURE_INCOMPAT_EXTENTS)) { -+ ext4_warning(sb, __func__, ++ ext4_warning(sb, + "extents feature not enabled " + "on this filesystem, use tune2fs"); + return 0; @@ -160,7 +160,7 @@ diff -up linux-2.6.18-164/fs/ext4/super.c linux-2.6.18-164/fs/ext4/super.c + if (EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_EXTENTS)) + set_opt(sbi->s_mount_opt, EXTENTS); + else -+ ext4_warning(sb, __func__, ++ ext4_warning(sb, + "extents feature not enabled on this filesystem, " + "use tune2fs."); + diff --git a/ldiskfs/kernel_patches/patches/ext4-failed-mount-b23368.patch b/ldiskfs/kernel_patches/patches/ext4-failed-mount-b23368.patch index 0adb6b0..e38f7c7 100644 --- a/ldiskfs/kernel_patches/patches/ext4-failed-mount-b23368.patch +++ b/ldiskfs/kernel_patches/patches/ext4-failed-mount-b23368.patch @@ -6,7 +6,7 @@ Index: linux-stage/fs/ext4/super.c brelse(bh); out_fail: sb->s_fs_info = NULL; -- kfree(&sbi->s_blockgroup_lock); +- kfree(sbi->s_blockgroup_lock); kfree(sbi); lock_kernel(); return ret; diff --git a/ldiskfs/kernel_patches/patches/ext4-inode-version-rhel5.patch b/ldiskfs/kernel_patches/patches/ext4-inode-version-rhel5.patch index 42b5ce7..bc583d2 100644 --- a/ldiskfs/kernel_patches/patches/ext4-inode-version-rhel5.patch +++ b/ldiskfs/kernel_patches/patches/ext4-inode-version-rhel5.patch @@ -51,9 +51,9 @@ Index: linux-2.6.18-128.1.6/fs/ext4/ext4.h typedef int ext4_grpblk_t; @@ -164,6 +166,8 @@ struct ext4_inode_info { - struct list_head i_aio_dio_complete_list; - /* current io_end structure for async DIO write*/ - ext4_io_end_t *cur_aio_dio; + */ + tid_t i_sync_tid; + tid_t i_datasync_tid; + + __u64 i_fs_version; }; diff --git a/ldiskfs/kernel_patches/patches/ext4-kill-dx_root.patch b/ldiskfs/kernel_patches/patches/ext4-kill-dx_root.patch index ea83828..c8f2d1a 100644 --- a/ldiskfs/kernel_patches/patches/ext4-kill-dx_root.patch +++ b/ldiskfs/kernel_patches/patches/ext4-kill-dx_root.patch @@ -74,10 +74,10 @@ Index: b/fs/ext4/namei.c + if (info->hash_version != DX_HASH_TEA && + info->hash_version != DX_HASH_HALF_MD4 && + info->hash_version != DX_HASH_LEGACY) { - ext4_warning(dir->i_sb, __func__, - "Unrecognised inode hash code %d for directory " -- "#%lu", root->info.hash_version, dir->i_ino); -+ "#%lu", info->hash_version, dir->i_ino); + ext4_warning(dir->i_sb, "Unrecognised inode hash code %d" + "for directory #%lu", +- root->info.hash_version, dir->i_ino); ++ info->hash_version, dir->i_ino); brelse(bh); *err = ERR_BAD_DX_DIR; goto fail; @@ -87,14 +87,13 @@ Index: b/fs/ext4/namei.c if (hinfo->hash_version <= DX_HASH_TEA) hinfo->hash_version += EXT4_SB(dir->i_sb)->s_hash_unsigned; hinfo->seed = EXT4_SB(dir->i_sb)->s_hash_seed; -@@ -398,29 +399,28 @@ dx_probe(struct dentry *dentry, struct i +@@ -398,27 +399,26 @@ dx_probe(struct dentry *dentry, struct i ext4fs_dirhash(dentry->d_name.name, dentry->d_name.len, hinfo); hash = hinfo->hash; - if (root->info.unused_flags & 1) { + if (info->unused_flags & 1) { - ext4_warning(dir->i_sb, __func__, - "Unimplemented inode hash flags: %#06x", + ext4_warning(dir->i_sb, "Unimplemented inode hash flags: %#06x", - root->info.unused_flags); + info->unused_flags); brelse(bh); @@ -104,8 +103,7 @@ Index: b/fs/ext4/namei.c - if ((indirect = root->info.indirect_levels) > 1) { + if ((indirect = info->indirect_levels) > 1) { - ext4_warning(dir->i_sb, __func__, - "Unimplemented inode hash depth: %#06x", + ext4_warning(dir->i_sb, "Unimplemented inode hash depth: %#06x", - root->info.indirect_levels); + info->indirect_levels); brelse(bh); @@ -120,9 +118,9 @@ Index: b/fs/ext4/namei.c if (dx_get_limit(entries) != dx_root_limit(dir, - root->info.info_length)) { + info->info_length)) { - ext4_warning(dir->i_sb, __func__, - "dx entry: limit != root limit"); + ext4_warning(dir->i_sb, "dx entry: limit != root limit"); brelse(bh); + @@ -509,10 +510,12 @@ fail: static void dx_release (struct dx_frame *frames) @@ -180,7 +178,7 @@ Index: b/fs/ext4/namei.c + ext4_rec_len_from_disk(dotdot_de->rec_len, blocksize)); - if ((char *) de >= (((char *) root) + blocksize)) { + if ((char *) de >= (((char *) dot_de) + blocksize)) { - ext4_error(dir->i_sb, __func__, + ext4_error(dir->i_sb, "invalid rec_len for '..' in inode %lu", dir->i_ino); brelse(bh); diff --git a/ldiskfs/kernel_patches/patches/ext4-mballoc-extra-checks-rhel5.patch b/ldiskfs/kernel_patches/patches/ext4-mballoc-extra-checks-rhel5.patch index a11198a..9a9466f 100644 --- a/ldiskfs/kernel_patches/patches/ext4-mballoc-extra-checks-rhel5.patch +++ b/ldiskfs/kernel_patches/patches/ext4-mballoc-extra-checks-rhel5.patch @@ -35,7 +35,7 @@ diff -rupN linux-2.6.18-128.1.6_1//fs/ext4/mballoc.c linux-2.6.18-128.1.6_2//fs/ - grp->bb_free = free; + struct ext4_group_desc *gdp; + gdp = ext4_get_group_desc (sb, group, NULL); -+ ext4_error(sb, __FUNCTION__, ++ ext4_error(sb, + "group %lu: %u blocks in bitmap, %u in bb, " + "%u in gd, %lu pa's\n", (long unsigned int)group, + free, grp->bb_free, ext4_free_blks_count(sb, gdp), @@ -183,7 +183,7 @@ diff -rupN linux-2.6.18-128.1.6_1//fs/ext4/mballoc.c linux-2.6.18-128.1.6_2//fs/ + } + + if (free != ext4_free_blks_count(sb, gdp)) { -+ ext4_error(sb, __FUNCTION__, "on-disk bitmap for group %d" ++ ext4_error(sb, "on-disk bitmap for group %d" + "corrupted: %u blocks free in bitmap, %u - in gd\n", + group, free, ext4_free_blks_count(sb, gdp)); + return -EIO; @@ -240,7 +240,7 @@ diff -rupN linux-2.6.18-128.1.6_1//fs/ext4/mballoc.c linux-2.6.18-128.1.6_2//fs/ count++; } + if (count + skip != grp->bb_prealloc_nr) { -+ ext4_error(sb, __FUNCTION__, "lost preallocations: " ++ ext4_error(sb, "lost preallocations: " + "count %d, bb_prealloc_nr %lu, skip %d\n", + count, grp->bb_prealloc_nr, skip); + return -EIO; @@ -293,8 +293,8 @@ diff -rupN linux-2.6.18-128.1.6_1//fs/ext4/mballoc.c linux-2.6.18-128.1.6_2//fs/ } @@ -4107,7 +4183,7 @@ repeat: if (err) { - ext4_error(sb, __func__, "Error in loading buddy " - "information for %u", group); + ext4_error(sb, "Error loading buddy information for %u", + group); - continue; + return; } diff --git a/ldiskfs/kernel_patches/patches/ext4-mballoc-pa_free-mismatch.patch b/ldiskfs/kernel_patches/patches/ext4-mballoc-pa_free-mismatch.patch index 0ca58dd..9a93611 100644 --- a/ldiskfs/kernel_patches/patches/ext4-mballoc-pa_free-mismatch.patch +++ b/ldiskfs/kernel_patches/patches/ext4-mballoc-pa_free-mismatch.patch @@ -41,7 +41,7 @@ Index: linux-stage/fs/ext4/mballoc.c + /* "free < pa->pa_free" means we maybe double alloc the same blocks, + * otherwise maybe leave some free blocks unavailable, no need to BUG.*/ + if ((free > pa->pa_free && !pa->pa_error) || (free < pa->pa_free)) { -+ ext4_error(sb, __FUNCTION__, "pa free mismatch: [pa %p] " ++ ext4_error(sb,"pa free mismatch: [pa %p] " + "[phy %lu] [logic %lu] [len %u] [free %u] " + "[error %u] [inode %lu] [freed %u]", pa, + (unsigned long)pa->pa_pstart, @@ -61,9 +61,9 @@ Index: linux-stage/fs/ext4/mballoc.c return err; @@ -4800,6 +4813,24 @@ - *errp = -EDQUOT; - goto out3; - } + } + } + + + if (dev_check_rdonly(sb->s_bdev)) { + struct block_device *bdev = sb->s_bdev; @@ -82,9 +82,9 @@ Index: linux-stage/fs/ext4/mballoc.c + ar->len, ar->flags); + } + - inquota = ar->len; - - if (EXT4_I(ar->inode)->i_delalloc_reserved_flag) + ac = kmem_cache_alloc(ext4_ac_cachep, GFP_NOFS); + if (!ac) { + ar->len = 0; @@ -4850,6 +4881,25 @@ ac->ac_b_ex.fe_len = 0; ar->len = 0; @@ -96,7 +96,7 @@ Index: linux-stage/fs/ext4/mballoc.c + * been updated or not when fail case. So can + * not revert pa_free back, just mark pa_error*/ + pa->pa_error++; -+ ext4_error(sb, __FUNCTION__, ++ ext4_error(sb, + "Updating bitmap error: [err %d] " + "[pa %p] [phy %lu] [logic %lu] " + "[len %u] [free %u] [error %u] " diff --git a/ldiskfs/kernel_patches/patches/ext4-mmp-rhel5.patch b/ldiskfs/kernel_patches/patches/ext4-mmp-rhel5.patch index 88f9efe..5997d62 100644 --- a/ldiskfs/kernel_patches/patches/ext4-mmp-rhel5.patch +++ b/ldiskfs/kernel_patches/patches/ext4-mmp-rhel5.patch @@ -74,8 +74,8 @@ Index: linux-stage/fs/ext4/super.c + } +#endif + if (!*bh) { -+ ext4_warning(sb, __func__, -+ "Error while reading MMP block %lu", mmp_block); ++ __ext4_warning(sb, __func__, ++ "Error while reading MMP block %lu", mmp_block); + return -EIO; + } + @@ -92,11 +92,11 @@ Index: linux-stage/fs/ext4/super.c +static void dump_mmp_msg(struct super_block *sb, struct mmp_struct *mmp, + const char *function, const char *msg) +{ -+ ext4_warning(sb, function, "%s", msg); -+ ext4_warning(sb, function, "MMP failure info: last update time: %llu, " -+ "last update node: %s, last update device: %s\n", -+ (long long unsigned int)le64_to_cpu(mmp->mmp_time), -+ mmp->mmp_nodename, mmp->mmp_bdevname); ++ __ext4_warning(sb, function, "%s", msg); ++ __ext4_warning(sb, function, "MMP failure info: last update time: %llu, " ++ "last update node: %s, last update device: %s\n", ++ (long long unsigned int)le64_to_cpu(mmp->mmp_time), ++ mmp->mmp_nodename, mmp->mmp_bdevname); +} + +/* @@ -148,23 +148,23 @@ Index: linux-stage/fs/ext4/super.c + * (s_mmp_update_interval * 60) seconds. + */ + if (retval && (failed_writes % 60) == 0) { -+ ext4_error(sb, __func__, -+ "Error writing to MMP block"); ++ __ext4_error(sb, __func__, ++ "Error writing to MMP block"); + failed_writes++; + } + + if (!(le32_to_cpu(es->s_feature_incompat) & + EXT4_FEATURE_INCOMPAT_MMP)) { -+ ext4_warning(sb, __func__, "kmmpd being stopped " -+ "since MMP feature has been disabled."); ++ __ext4_warning(sb, __func__, "kmmpd being stopped " ++ "since MMP feature has been disabled."); + EXT4_SB(sb)->s_mmp_tsk = NULL; + goto failed; + } + + if (sb->s_flags & MS_RDONLY) { -+ ext4_warning(sb, __func__, "kmmpd being stopped " -+ "since filesystem has been remounted as " -+ "readonly."); ++ __ext4_warning(sb, __func__, "kmmpd being stopped " ++ "since filesystem has been remounted as " ++ "readonly."); + EXT4_SB(sb)->s_mmp_tsk = NULL; + goto failed; + } @@ -186,8 +186,8 @@ Index: linux-stage/fs/ext4/super.c + + retval = read_mmp_block(sb, &bh_check, mmp_block); + if (retval) { -+ ext4_error(sb, __func__, "error reading MMP" -+ "data: %d", retval); ++ __ext4_error(sb, __func__, "error reading MMP" ++ "data: %d", retval); + EXT4_SB(sb)->s_mmp_tsk = NULL; + goto failed; + } @@ -200,7 +200,7 @@ Index: linux-stage/fs/ext4/super.c + "Error while updating MMP info. " + "The filesystem seems to have " + "been multiply mounted."); -+ ext4_error(sb, __func__, "abort"); ++ __ext4_error(sb, __func__, "abort"); + goto failed; + } + put_bh(bh_check); @@ -261,8 +261,8 @@ Index: linux-stage/fs/ext4/super.c + + if (mmp_block < le32_to_cpu(es->s_first_data_block) || + mmp_block >= ext4_blocks_count(es)) { -+ ext4_warning(sb, __func__, -+ "Invalid MMP block in superblock"); ++ __ext4_warning(sb, __func__, ++ "Invalid MMP block in superblock"); + goto failed; + } + @@ -297,12 +297,12 @@ Index: linux-stage/fs/ext4/super.c + + /* Print MMP interval if more than 20 secs. */ + if (wait_time > EXT4_MMP_MIN_CHECK_INTERVAL * 4) -+ ext4_warning(sb, __func__, "MMP interval %u higher than " -+ "expected, please wait.\n", wait_time * 2); ++ __ext4_warning(sb, __func__, "MMP interval %u higher than " ++ "expected, please wait.\n", wait_time * 2); + + if (schedule_timeout_interruptible(HZ * wait_time) != 0) { -+ ext4_warning(sb, __func__, "MMP startup interrupted, failing " -+ "mount\n"); ++ __ext4_warning(sb, __func__, "MMP startup interrupted, failing " ++ "mount\n"); + goto failed; + } + @@ -330,8 +330,8 @@ Index: linux-stage/fs/ext4/super.c + * wait for MMP interval and check mmp_seq. + */ + if (schedule_timeout_interruptible(HZ * wait_time) != 0) { -+ ext4_warning(sb, __func__, "MMP startup interrupted, failing " -+ "mount\n"); ++ __ext4_warning(sb, __func__, "MMP startup interrupted, failing " ++ "mount\n"); + goto failed; + } + @@ -347,7 +347,7 @@ Index: linux-stage/fs/ext4/super.c + + mmpd_data = kmalloc(sizeof(struct mmpd_data), GFP_KERNEL); + if (!mmpd_data) { -+ ext4_warning(sb, KERN_ERR, "not enough memory for mmpd_data"); ++ __ext4_warning(sb, KERN_ERR, "not enough memory for mmpd_data"); + goto failed; + } + mmpd_data->sb = sb; @@ -361,8 +361,8 @@ Index: linux-stage/fs/ext4/super.c + mmp->mmp_bdevname)); + if (IS_ERR(EXT4_SB(sb)->s_mmp_tsk)) { + EXT4_SB(sb)->s_mmp_tsk = NULL; -+ ext4_warning(sb, __func__, "Unable to create kmmpd thread " -+ "for %s.", sb->s_id); ++ __ext4_warning(sb, __func__, "Unable to create kmmpd thread " ++ "for %s.", sb->s_id); + goto failed; + } + diff --git a/ldiskfs/kernel_patches/patches/ext4-osd-iop-common.patch b/ldiskfs/kernel_patches/patches/ext4-osd-iop-common.patch index e5b9b1c..3a194cd 100644 --- a/ldiskfs/kernel_patches/patches/ext4-osd-iop-common.patch +++ b/ldiskfs/kernel_patches/patches/ext4-osd-iop-common.patch @@ -18,9 +18,9 @@ diff -rupN linux-2.6.27.21-0.1_1//fs/ext4/ext4.h linux-2.6.27.21-0.1_2//fs/ext4/ +#define ll_ext4_find_entry(inode, dentry, res_dir) ext4_find_entry(dir, &(dentry)->d_name, res_dir) +extern int ext4_add_dot_dotdot(handle_t *handle, struct inode *dir, + struct inode *inode); - extern unsigned int ext4_rec_len_from_disk(__le16 dlen, unsigned blocksize); - extern __le16 ext4_rec_len_to_disk(unsigned len, unsigned blocksize); extern int ext4_orphan_add(handle_t *, struct inode *); + extern int ext4_orphan_del(handle_t *, struct inode *); + extern int ext4_htree_fill_tree(struct file *dir_file, __u32 start_hash, diff -rupN linux-2.6.27.21-0.1_1//fs/ext4/namei.c linux-2.6.27.21-0.1_2//fs/ext4/namei.c --- linux-2.6.27.21-0.1_1//fs/ext4/namei.c 2009-08-24 15:32:00.000000000 +0530 +++ linux-2.6.27.21-0.1_2//fs/ext4/namei.c 2009-08-24 15:43:56.000000000 +0530 @@ -149,7 +149,7 @@ diff -rupN linux-2.6.27.21-0.1_1//fs/ext4/namei.c linux-2.6.27.21-0.1_2//fs/ext4 -retry: - handle = ext4_journal_start(dir, EXT4_DATA_TRANS_BLOCKS(dir->i_sb) + - EXT4_INDEX_EXTRA_TRANS_BLOCKS + 3 + -- 2*EXT4_QUOTA_INIT_BLOCKS(dir->i_sb)); +- EXT4_MAXQUOTAS_INIT_BLOCKS(dir->i_sb)); if (IS_ERR(handle)) return PTR_ERR(handle); diff --git a/ldiskfs/kernel_patches/patches/ext4-pdir-fix.patch b/ldiskfs/kernel_patches/patches/ext4-pdir-fix.patch index 99bb9ff..32218cf 100644 --- a/ldiskfs/kernel_patches/patches/ext4-pdir-fix.patch +++ b/ldiskfs/kernel_patches/patches/ext4-pdir-fix.patch @@ -6,9 +6,9 @@ diff -rupN linux-2.6.27.21-0.1_1//fs/ext4/ext4_i.h linux-2.6.27.21-0.1_2//fs/ext #include #include +#include + #include #include #include - #include @@ -56,7 +57,9 @@ struct ext4_inode_info { __u32 i_flags; ext4_fsblk_t i_file_acl; diff --git a/ldiskfs/kernel_patches/patches/ext4-prealloc-rhel5.patch b/ldiskfs/kernel_patches/patches/ext4-prealloc-rhel5.patch index dda25ed..d7485f5 100644 --- a/ldiskfs/kernel_patches/patches/ext4-prealloc-rhel5.patch +++ b/ldiskfs/kernel_patches/patches/ext4-prealloc-rhel5.patch @@ -338,7 +338,7 @@ Index: linux-2.6.18-128.1.6/fs/ext4/mballoc.c /* don't use group allocation for large files */ size = max(size, isize); -- if (size >= sbi->s_mb_stream_request) { +- if (size > sbi->s_mb_stream_request) { + if ((ac->ac_o_ex.fe_len >= sbi->s_mb_small_req) || + (size >= sbi->s_mb_large_req)) { ac->ac_flags |= EXT4_MB_STREAM_ALLOC; diff --git a/ldiskfs/kernel_patches/patches/ext4-print-inum-in-htree-warning-rhel5.patch b/ldiskfs/kernel_patches/patches/ext4-print-inum-in-htree-warning-rhel5.patch index 1cc10a8..66ffd44 100644 --- a/ldiskfs/kernel_patches/patches/ext4-print-inum-in-htree-warning-rhel5.patch +++ b/ldiskfs/kernel_patches/patches/ext4-print-inum-in-htree-warning-rhel5.patch @@ -2,14 +2,15 @@ Index: linux-2.6.18.i386/fs/ext4/namei.c =================================================================== --- linux-2.6.18.i386.orig/fs/ext4/namei.c +++ linux-2.6.18.i386/fs/ext4/namei.c -@@ -374,8 +374,8 @@ dx_probe(struct dentry *dentry, struct i +@@ -374,8 +374,9 @@ dx_probe(struct dentry *dentry, struct i + if (root->info.hash_version != DX_HASH_TEA && root->info.hash_version != DX_HASH_HALF_MD4 && root->info.hash_version != DX_HASH_LEGACY) { - ext4_warning(dir->i_sb, __func__, -- "Unrecognised inode hash code %d", +- ext4_warning(dir->i_sb, "Unrecognised inode hash code %d", - root->info.hash_version); -+ "Unrecognised inode hash code %d for directory " -+ "#%lu", root->info.hash_version, dir->i_ino); ++ ext4_warning(dir->i_sb, "Unrecognised inode hash code %d" ++ "for directory #%lu", ++ root->info.hash_version, dir->i_ino); brelse(bh); *err = ERR_BAD_DX_DIR; goto fail; diff --git a/ldiskfs/kernel_patches/patches/ext4-remove-extents-warning-rhel5.patch b/ldiskfs/kernel_patches/patches/ext4-remove-extents-warning-rhel5.patch index 0cd6255..ff72e25 100644 --- a/ldiskfs/kernel_patches/patches/ext4-remove-extents-warning-rhel5.patch +++ b/ldiskfs/kernel_patches/patches/ext4-remove-extents-warning-rhel5.patch @@ -7,7 +7,7 @@ Index: linux-stage/fs/ext4/super.c if (EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_EXTENTS)) set_opt(sbi->s_mount_opt, EXTENTS); - else -- ext4_warning(sb, __func__, +- ext4_warning(sb, - "extents feature not enabled on this filesystem, " - "use tune2fs."); diff --git a/ldiskfs/kernel_patches/patches/ext4_data_in_dirent.patch b/ldiskfs/kernel_patches/patches/ext4_data_in_dirent.patch index 18eaa2c..1741c7b 100644 --- a/ldiskfs/kernel_patches/patches/ext4_data_in_dirent.patch +++ b/ldiskfs/kernel_patches/patches/ext4_data_in_dirent.patch @@ -169,9 +169,9 @@ Index: b/fs/ext4/ext4.h extern int ext4_add_dot_dotdot(handle_t *handle, struct inode *dir, - struct inode *inode); + struct inode *inode, const void *, const void *); - extern unsigned int ext4_rec_len_from_disk(__le16 dlen, unsigned blocksize); - extern __le16 ext4_rec_len_to_disk(unsigned len, unsigned blocksize); extern int ext4_orphan_add(handle_t *, struct inode *); + extern int ext4_orphan_del(handle_t *, struct inode *); + extern int ext4_htree_fill_tree(struct file *dir_file, __u32 start_hash, @@ -1343,6 +1386,28 @@ static inline int ext4_is_group_locked(s return spin_is_locked(ext4_group_lock_ptr(sb, group)); @@ -286,7 +286,7 @@ Index: b/fs/ext4/namei.c - at = entries = ((struct dx_node *) bh->b_data)->entries; + entries = ((struct dx_node *) bh->b_data)->entries; if (dx_get_limit(entries) != dx_node_limit (dir)) { - ext4_warning(dir->i_sb, __func__, + ext4_warning(dir->i_sb, - "dx entry: limit != node limit"); + "block %u(%lu): limit %u != node limit %u", + dx_get_block(at), (long)bh->b_blocknr, @@ -355,9 +355,9 @@ Index: b/fs/ext4/namei.c de = (struct ext4_dir_entry_2 *)bh->b_data; top = bh->b_data + dir->i_sb->s_blocksize - reclen; @@ -1364,7 +1380,7 @@ static int add_dirent_to_buf(handle_t *h - brelse (bh); - return -EEXIST; - } + return -EIO; + if (ext4_match(namelen, name, de)) + return -EEXIST; - nlen = EXT4_DIR_REC_LEN(de->name_len); + nlen = EXT4_DIR_REC_LEN(de); rlen = ext4_rec_len_from_disk(de->rec_len, blocksize); diff --git a/lustre/ChangeLog b/lustre/ChangeLog index 1d000d7..c168ddc 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -1,20 +1,23 @@ TBD Oracle, Inc. * version 2.1.0 * Server support for kernels: - 2.6.18-194.17.1.el5 (RHEL 5) - 2.6.18-194.17.1.0.1.el5 (OEL 5) + 2.6.18-238.9.1.el5 (RHEL5) + 2.6.32-71.18.2.el6 (RHEL6) * Client support for unpatched kernels: - (see http://wiki.lustre.org/index.php?title=Patchless_Client) - 2.6.18-194.17.1.el5 (RHEL 5), - 2.6.18-194.17.1.0.1.el5 (OEL 5) - 2.6.16.60-0.69.1 (SLES 10), - 2.6.27.19-5 (SLES11) - 2.6.29.4-167.fc11 (FC11) + (see http://wiki.lustre.org/index.php?title=Patchless_Client) + 2.6.18-238.9.1.el5 (RHEL5) + 2.6.32-71.18.2.el6 (RHEL6) + 2.6.29.4-167.fc11 (FC11) + 2.6.16.60-0.69.1 (SLES10) + 2.6.27.19-5 (SLES11) * Recommended e2fsprogs version: 1.41.10-sun2 - * NFS export disabled when stack size < 8192. Since the NFSv4 export of + * NFS export disabled when stack size < 8192. Since the NFSv4 export of Lustre filesystem with 4K stack may cause a stack overflow. For more information, please refer to bugzilla 17630. +Severity : enhancement +Description: Update RHEL5.6 kernel to 2.6.18-238.9.1.el5 + Severity : normal Frequency : only with SLES10 Bugzilla : 20744 diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-i686.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-i686.config index 0186d90..05154c0 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-i686.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-i686.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.18-prep -# Tue Jun 22 23:34:01 2010 +# Sat Apr 23 03:57:21 2011 # CONFIG_X86_32=y CONFIG_GENERIC_TIME=y @@ -46,6 +46,7 @@ CONFIG_INITRAMFS_SOURCE="" CONFIG_CC_OPTIMIZE_FOR_SIZE=y # CONFIG_EMBEDDED is not set CONFIG_UID16=y +CONFIG_TASK_XACCT=y CONFIG_SYSCTL=y CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_ALL is not set @@ -1188,6 +1189,7 @@ CONFIG_SCSI_BNX2_ISCSI=m CONFIG_BE2ISCSI=m CONFIG_BLK_DEV_3W_XXXX_RAID=m CONFIG_SCSI_3W_9XXX=m +CONFIG_SCSI_3W_SAS=m CONFIG_SCSI_ACARD=m CONFIG_SCSI_AACRAID=m CONFIG_SCSI_MVSAS=m @@ -1360,7 +1362,7 @@ CONFIG_FUSION=y CONFIG_FUSION_SPI=m CONFIG_FUSION_FC=m CONFIG_FUSION_SAS=m -CONFIG_FUSION_MAX_SGE=128 +CONFIG_FUSION_MAX_SGE=256 CONFIG_FUSION_CTL=m CONFIG_FUSION_LAN=m CONFIG_FUSION_LOGGING=y @@ -1535,6 +1537,7 @@ CONFIG_NETXEN_NIC=m CONFIG_NIU=m CONFIG_BNX2X=m CONFIG_MLX4_EN=m +CONFIG_QLCNIC=m CONFIG_QLGE=m CONFIG_MLX4_CORE=m CONFIG_MLX4_DEBUG=y @@ -1629,7 +1632,7 @@ CONFIG_ATH5K=m CONFIG_ATH9K=m # CONFIG_ATH9K_DEBUG is not set CONFIG_IWLWIFI=m -# CONFIG_IWLWIFI_LEDS is not set +CONFIG_IWLWIFI_LEDS=y # CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT is not set # CONFIG_IWLWIFI_DEBUG is not set CONFIG_IWLAGN=m @@ -1999,6 +2002,7 @@ CONFIG_PRINTER=m CONFIG_LP_CONSOLE=y CONFIG_PPDEV=m # CONFIG_TIPAR is not set +CONFIG_VIRTIO_CONSOLE=m # # IPMI @@ -2196,6 +2200,7 @@ CONFIG_SENSORS_ADM9240=m CONFIG_SENSORS_ADT7470=m CONFIG_SENSORS_ADT7473=m CONFIG_SENSORS_K8TEMP=m +CONFIG_SENSORS_K10TEMP=m CONFIG_SENSORS_ASB100=m CONFIG_SENSORS_ATXP1=m CONFIG_SENSORS_DS1621=m @@ -2519,7 +2524,7 @@ CONFIG_SND_FM801_TEA575X=m CONFIG_SND_HDA_POWER_SAVE=y CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 CONFIG_SND_HDA_HWDEP=y -# CONFIG_SND_HDA_RECONFIG is not set +CONFIG_SND_HDA_RECONFIG=y CONFIG_SND_HDA_INPUT_BEEP=y CONFIG_SND_HDA_GENERIC=y CONFIG_SND_HDA_INTEL=m @@ -2672,6 +2677,7 @@ CONFIG_USB_RTL8150=m CONFIG_USB_USBNET=m CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_CDCETHER=m +CONFIG_USB_NET_CDC_EEM=m CONFIG_USB_NET_DM9601=m CONFIG_USB_NET_GL620A=m CONFIG_USB_NET_NET1080=m @@ -2730,6 +2736,7 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y CONFIG_USB_SERIAL_KLSI=m CONFIG_USB_SERIAL_KOBIL_SCT=m CONFIG_USB_SERIAL_MCT_U232=m +CONFIG_USB_SERIAL_MOS7840=m CONFIG_USB_SERIAL_NAVMAN=m CONFIG_USB_SERIAL_PL2303=m CONFIG_USB_SERIAL_QUALCOMM=m @@ -2853,6 +2860,7 @@ CONFIG_EDAC_I82860=m CONFIG_EDAC_K8=m CONFIG_EDAC_R82600=m CONFIG_EDAC_POLL=y +CONFIG_EDAC_I7300=m # # Real Time Clock @@ -3053,7 +3061,8 @@ CONFIG_RPCSEC_GSS_KRB5=m CONFIG_RPCSEC_GSS_SPKM3=m # CONFIG_SMB_FS is not set CONFIG_CIFS=m -# CONFIG_CIFS_STATS is not set +CONFIG_CIFS_STATS=y +# CONFIG_CIFS_STATS2 is not set CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y @@ -3152,7 +3161,7 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y CONFIG_MAGIC_SYSRQ=y # CONFIG_UNUSED_SYMBOLS is not set CONFIG_DEBUG_KERNEL=y -CONFIG_LOG_BUF_SHIFT=17 +CONFIG_LOG_BUF_SHIFT=19 CONFIG_DETECT_SOFTLOCKUP=y CONFIG_DETECT_HUNG_TASK=y # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set @@ -3201,6 +3210,7 @@ CONFIG_DOUBLEFAULT=y # CONFIG_KEYS=y CONFIG_KEYS_DEBUG_PROC_KEYS=y +# CONFIG_SECURITY_DMESG_RESTRICT is not set CONFIG_SECURITY=y CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_NETWORK_XFRM=y diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-ia64.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-ia64.config index 41a52ad..20f6e45 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-ia64.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-ia64.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.18-prep -# Tue Jun 22 23:38:27 2010 +# Sat Apr 23 04:07:45 2011 # CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" @@ -33,6 +33,7 @@ CONFIG_RELAY=y CONFIG_INITRAMFS_SOURCE="" CONFIG_CC_OPTIMIZE_FOR_SIZE=y # CONFIG_EMBEDDED is not set +CONFIG_TASK_XACCT=y CONFIG_SYSCTL=y CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_ALL is not set @@ -960,6 +961,7 @@ CONFIG_SCSI_BNX2_ISCSI=m CONFIG_BE2ISCSI=m CONFIG_BLK_DEV_3W_XXXX_RAID=m CONFIG_SCSI_3W_9XXX=m +CONFIG_SCSI_3W_SAS=m CONFIG_SCSI_ACARD=m CONFIG_SCSI_AACRAID=m CONFIG_SCSI_MVSAS=m @@ -1121,7 +1123,7 @@ CONFIG_FUSION=y CONFIG_FUSION_SPI=m CONFIG_FUSION_FC=m CONFIG_FUSION_SAS=m -CONFIG_FUSION_MAX_SGE=128 +CONFIG_FUSION_MAX_SGE=256 CONFIG_FUSION_CTL=m CONFIG_FUSION_LAN=m CONFIG_FUSION_LOGGING=y @@ -1286,6 +1288,7 @@ CONFIG_NETXEN_NIC=m CONFIG_NIU=m CONFIG_BNX2X=m CONFIG_MLX4_EN=m +CONFIG_QLCNIC=m CONFIG_QLGE=m CONFIG_MLX4_CORE=m CONFIG_MLX4_DEBUG=y @@ -1364,7 +1367,7 @@ CONFIG_ATH5K=m CONFIG_ATH9K=m # CONFIG_ATH9K_DEBUG is not set CONFIG_IWLWIFI=m -# CONFIG_IWLWIFI_LEDS is not set +CONFIG_IWLWIFI_LEDS=y # CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT is not set # CONFIG_IWLWIFI_DEBUG is not set CONFIG_IWLAGN=m @@ -2172,7 +2175,7 @@ CONFIG_SND_FM801_TEA575X=m CONFIG_SND_HDA_POWER_SAVE=y CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 CONFIG_SND_HDA_HWDEP=y -# CONFIG_SND_HDA_RECONFIG is not set +CONFIG_SND_HDA_RECONFIG=y CONFIG_SND_HDA_INPUT_BEEP=y CONFIG_SND_HDA_GENERIC=y CONFIG_SND_HDA_INTEL=m @@ -2324,6 +2327,7 @@ CONFIG_USB_RTL8150=m CONFIG_USB_USBNET=m CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_CDCETHER=m +CONFIG_USB_NET_CDC_EEM=m CONFIG_USB_NET_DM9601=m CONFIG_USB_NET_GL620A=m CONFIG_USB_NET_NET1080=m @@ -2382,6 +2386,7 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y CONFIG_USB_SERIAL_KLSI=m CONFIG_USB_SERIAL_KOBIL_SCT=m CONFIG_USB_SERIAL_MCT_U232=m +CONFIG_USB_SERIAL_MOS7840=m CONFIG_USB_SERIAL_NAVMAN=m CONFIG_USB_SERIAL_PL2303=m CONFIG_USB_SERIAL_QUALCOMM=m @@ -2676,7 +2681,8 @@ CONFIG_RPCSEC_GSS_KRB5=m CONFIG_RPCSEC_GSS_SPKM3=m # CONFIG_SMB_FS is not set CONFIG_CIFS=m -# CONFIG_CIFS_STATS is not set +CONFIG_CIFS_STATS=y +# CONFIG_CIFS_STATS2 is not set CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y @@ -2805,7 +2811,7 @@ CONFIG_KPROBES=y CONFIG_MAGIC_SYSRQ=y # CONFIG_UNUSED_SYMBOLS is not set CONFIG_DEBUG_KERNEL=y -CONFIG_LOG_BUF_SHIFT=18 +CONFIG_LOG_BUF_SHIFT=19 CONFIG_DETECT_SOFTLOCKUP=y CONFIG_DETECT_HUNG_TASK=y # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set @@ -2842,6 +2848,7 @@ CONFIG_IA64_GRANULE_16MB=y # CONFIG_KEYS=y CONFIG_KEYS_DEBUG_PROC_KEYS=y +# CONFIG_SECURITY_DMESG_RESTRICT is not set CONFIG_SECURITY=y CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_NETWORK_XFRM=y diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-ppc64.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-ppc64.config index fc9c5f6..1c0021e 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-ppc64.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-ppc64.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.18-prep -# Sat Jul 12 00:22:15 2008 +# Sat Apr 23 04:01:22 2011 # CONFIG_PPC64=y CONFIG_64BIT=y @@ -61,6 +61,7 @@ CONFIG_BSD_PROCESS_ACCT=y # CONFIG_BSD_PROCESS_ACCT_V3 is not set CONFIG_TASKSTATS=y CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_IO_ACCOUNTING=y CONFIG_AUDIT=y CONFIG_AUDITSYSCALL=y # CONFIG_IKCONFIG is not set @@ -69,6 +70,7 @@ CONFIG_RELAY=y CONFIG_INITRAMFS_SOURCE="" CONFIG_CC_OPTIMIZE_FOR_SIZE=y # CONFIG_EMBEDDED is not set +CONFIG_TASK_XACCT=y CONFIG_SYSCTL=y CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_ALL is not set @@ -79,10 +81,14 @@ CONFIG_BUG=y CONFIG_ELF_CORE=y CONFIG_BASE_FULL=y CONFIG_FUTEX=y +CONFIG_ANON_INODES=y CONFIG_EPOLL=y +CONFIG_EVENTFD=y CONFIG_SHMEM=y CONFIG_SLAB=y CONFIG_VM_EVENT_COUNTERS=y +CONFIG_TRACEPOINTS=y +CONFIG_MARKERS=y CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 @@ -177,11 +183,14 @@ CONFIG_SPU_FS=m CONFIG_SPU_BASE=y CONFIG_SPUFS_MMAP=y CONFIG_CBE_RAS=y +CONFIG_PPC_IBM_CELL_POWERBUTTON=m CONFIG_CBE_THERM=m CONFIG_CBE_CPUFREQ=m CONFIG_CBE_CPUFREQ_PMI=m CONFIG_CBE_AXON_UTL=y CONFIG_CBE_AXON_PCI=y +CONFIG_CBE_CPUFREQ_SPU_GOVERNOR=m +CONFIG_HAVE_DMA_ATTRS=y # # Kernel options @@ -190,13 +199,15 @@ CONFIG_CBE_AXON_PCI=y # CONFIG_HZ_250 is not set CONFIG_HZ_1000=y CONFIG_HZ=1000 -CONFIG_PREEMPT_NONE=y -# CONFIG_PREEMPT_VOLUNTARY is not set +# CONFIG_PREEMPT_NONE is not set +CONFIG_PREEMPT_VOLUNTARY=y # CONFIG_PREEMPT is not set CONFIG_PREEMPT_BKL=y +CONFIG_PREEMPT_NOTIFIERS=y CONFIG_BINFMT_ELF=y CONFIG_BINFMT_MISC=y CONFIG_FORCE_MAX_ZONEORDER=9 +CONFIG_PPC_SUBPAGE_PROT=y CONFIG_IOMMU_VMERGE=y CONFIG_HOTPLUG_CPU=y CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y @@ -226,6 +237,8 @@ CONFIG_MEMORY_HOTPLUG_SPARSE=y CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_MIGRATION=y CONFIG_RESOURCES_64BIT=y +CONFIG_MMU_NOTIFIER=y +CONFIG_MMU_NOTIFIER_TABSZ=512 CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y CONFIG_ARCH_MEMORY_PROBE=y CONFIG_NODES_SPAN_OTHER_NODES=y @@ -236,6 +249,7 @@ CONFIG_PROC_DEVICETREE=y CONFIG_PM=y CONFIG_PM_LEGACY=y # CONFIG_PM_DEBUG is not set +CONFIG_SUSPEND_SMP=y # CONFIG_SECCOMP is not set CONFIG_ISA_DMA_API=y @@ -250,8 +264,13 @@ CONFIG_PCI=y CONFIG_PCI_DOMAINS=y CONFIG_PCIEPORTBUS=y # CONFIG_HOTPLUG_PCI_PCIE is not set +CONFIG_PCIEAER=y +CONFIG_PCIE_ECRC=y +CONFIG_PCIEAER_INJECT=m CONFIG_PCI_MSI=y # CONFIG_PCI_DEBUG is not set +CONFIG_PCI_STUB=y +CONFIG_PCI_IOV=y # # PCCARD (PCMCIA/CardBus) support @@ -273,7 +292,7 @@ CONFIG_YENTA_TI=y CONFIG_YENTA_ENE_TUNE=y CONFIG_YENTA_TOSHIBA=y CONFIG_PD6729=m -CONFIG_I82092=m +# CONFIG_I82092 is not set CONFIG_PCCARD_NONSTATIC=y # @@ -348,6 +367,7 @@ CONFIG_TCP_CONG_VEGAS=m CONFIG_TCP_CONG_SCALABLE=m CONFIG_TCP_CONG_LP=m CONFIG_TCP_CONG_VENO=m +CONFIG_INET_LRO=y # # IP: Virtual Server Configuration @@ -417,8 +437,10 @@ CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m CONFIG_NETFILTER_XT_TARGET_NOTRACK=m CONFIG_NETFILTER_XT_TARGET_SECMARK=m CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m +CONFIG_NETFILTER_XT_TARGET_DSCP=m CONFIG_NETFILTER_XT_MATCH_COMMENT=m CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m CONFIG_NETFILTER_XT_MATCH_CONNMARK=m CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m CONFIG_NETFILTER_XT_MATCH_DCCP=m @@ -521,11 +543,6 @@ CONFIG_IP6_NF_TARGET_HL=m CONFIG_IP6_NF_RAW=m # -# DECnet: Netfilter Configuration -# -# CONFIG_DECNET_NF_GRABULATOR is not set - -# # Bridge: Netfilter Configuration # CONFIG_BRIDGE_NF_EBTABLES=m @@ -577,6 +594,8 @@ CONFIG_IP_SCTP=m # CONFIG_SCTP_HMAC_NONE is not set # CONFIG_SCTP_HMAC_SHA1 is not set CONFIG_SCTP_HMAC_MD5=y +CONFIG_RDS=m +# CONFIG_RDS_DEBUG is not set # # TIPC Configuration (EXPERIMENTAL) @@ -593,22 +612,15 @@ CONFIG_ATM_BR2684=m # CONFIG_ATM_BR2684_IPFILTER is not set CONFIG_BRIDGE=m CONFIG_VLAN_8021Q=m -CONFIG_DECNET=m -CONFIG_DECNET_ROUTER=y -CONFIG_DECNET_ROUTE_FWMARK=y +# CONFIG_DECNET is not set CONFIG_LLC=y # CONFIG_LLC2 is not set -CONFIG_IPX=m -# CONFIG_IPX_INTERN is not set -CONFIG_ATALK=m -CONFIG_DEV_APPLETALK=m -CONFIG_IPDDP=m -CONFIG_IPDDP_ENCAP=y -CONFIG_IPDDP_DECAP=y +# CONFIG_IPX is not set +# CONFIG_ATALK is not set # CONFIG_X25 is not set # CONFIG_LAPB is not set # CONFIG_ECONET is not set -CONFIG_WAN_ROUTER=m +# CONFIG_WAN_ROUTER is not set # # QoS and/or fair queueing @@ -672,68 +684,9 @@ CONFIG_NET_ESTIMATOR=y # CONFIG_NET_PKTGEN=m # CONFIG_NET_TCPPROBE is not set +CONFIG_NET_DROP_MONITOR=y # CONFIG_HAMRADIO is not set -CONFIG_IRDA=m - -# -# IrDA protocols -# -CONFIG_IRLAN=m -CONFIG_IRNET=m -CONFIG_IRCOMM=m -# CONFIG_IRDA_ULTRA is not set - -# -# IrDA options -# -CONFIG_IRDA_CACHE_LAST_LSAP=y -CONFIG_IRDA_FAST_RR=y -# CONFIG_IRDA_DEBUG is not set - -# -# Infrared-port device drivers -# - -# -# SIR device drivers -# -CONFIG_IRTTY_SIR=m - -# -# Dongle support -# -CONFIG_DONGLE=y -CONFIG_ESI_DONGLE=m -CONFIG_ACTISYS_DONGLE=m -CONFIG_TEKRAM_DONGLE=m -CONFIG_TOIM3232_DONGLE=m -CONFIG_LITELINK_DONGLE=m -CONFIG_MA600_DONGLE=m -CONFIG_GIRBIL_DONGLE=m -CONFIG_MCP2120_DONGLE=m -CONFIG_OLD_BELKIN_DONGLE=m -CONFIG_ACT200L_DONGLE=m - -# -# Old SIR device drivers -# - -# -# Old Serial dongle support -# - -# -# FIR device drivers -# -CONFIG_USB_IRDA=m -CONFIG_SIGMATEL_FIR=m -CONFIG_NSC_FIR=m -CONFIG_WINBOND_FIR=m -CONFIG_SMC_IRCC_FIR=m -CONFIG_ALI_FIR=m -CONFIG_VLSI_FIR=m -CONFIG_VIA_FIR=m -CONFIG_MCS_FIR=m +# CONFIG_IRDA is not set CONFIG_BT=m CONFIG_BT_L2CAP=m CONFIG_BT_SCO=m @@ -776,14 +729,21 @@ CONFIG_FIB_RULES=y # Wireless # CONFIG_CFG80211=m -CONFIG_NL80211=y +# CONFIG_CFG80211_REG_DEBUG is not set +# CONFIG_CFG80211_DEBUGFS is not set +# CONFIG_WIRELESS_OLD_REGULATORY is not set +CONFIG_CFG80211_INTERNAL_REGDB=y CONFIG_WIRELESS_EXT=y -CONFIG_NET_WIRELESS_RTNETLINK=y +CONFIG_WIRELESS_COMPAT=m CONFIG_MAC80211=m -CONFIG_MAC80211_RCSIMPLE=y +CONFIG_MAC80211_RC_MINSTREL=y +# CONFIG_MAC80211_RC_DEFAULT_PID is not set +CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y +CONFIG_MAC80211_RC_DEFAULT="minstrel" +# CONFIG_MAC80211_MESH is not set CONFIG_MAC80211_LEDS=y # CONFIG_MAC80211_DEBUGFS is not set -# CONFIG_MAC80211_DEBUG is not set +# CONFIG_MAC80211_DEBUG_MENU is not set CONFIG_IEEE80211=m CONFIG_IEEE80211_DEBUG=y CONFIG_IEEE80211_CRYPT_WEP=m @@ -791,6 +751,8 @@ CONFIG_IEEE80211_CRYPT_CCMP=m CONFIG_IEEE80211_CRYPT_TKIP=m CONFIG_IEEE80211_SOFTMAC=m CONFIG_IEEE80211_SOFTMAC_DEBUG=y +CONFIG_RFKILL=m +CONFIG_RFKILL_LEDS=y # # Device Drivers @@ -834,7 +796,7 @@ CONFIG_MTD_BLOCK_RO=m CONFIG_FTL=m CONFIG_NFTL=m CONFIG_NFTL_RW=y -CONFIG_INFTL=m +# CONFIG_INFTL is not set CONFIG_RFD_FTL=m # @@ -866,17 +828,14 @@ CONFIG_MTD_ABSENT=m # # Mapping drivers for chip access # -CONFIG_MTD_COMPLEX_MAPPINGS=y +# CONFIG_MTD_COMPLEX_MAPPINGS is not set # CONFIG_MTD_PHYSMAP is not set -CONFIG_MTD_PCI=m # CONFIG_MTD_PLATRAM is not set # # Self-contained MTD device drivers # -CONFIG_MTD_PMC551=m -# CONFIG_MTD_PMC551_BUGFIX is not set -# CONFIG_MTD_PMC551_DEBUG is not set +# CONFIG_MTD_PMC551 is not set # CONFIG_MTD_SLRAM is not set # CONFIG_MTD_PHRAM is not set CONFIG_MTD_MTDRAM=m @@ -962,7 +921,7 @@ CONFIG_PARIDE_ON26=m CONFIG_BLK_CPQ_CISS_DA=m CONFIG_CISS_SCSI_TAPE=y CONFIG_BLK_DEV_DAC960=m -CONFIG_BLK_DEV_UMEM=m +# CONFIG_BLK_DEV_UMEM is not set # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=m CONFIG_BLK_DEV_CRYPTOLOOP=m @@ -972,7 +931,6 @@ CONFIG_BLK_DEV_SX8=m CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=16384 -CONFIG_BLK_DEV_RAM_BLOCKSIZE=4096 CONFIG_BLK_DEV_INITRD=y CONFIG_CDROM_PKTCDVD=m CONFIG_CDROM_PKTCDVD_BUFFERS=8 @@ -1050,6 +1008,7 @@ CONFIG_IDEDMA_AUTO=y # CONFIG_RAID_ATTRS=m CONFIG_SCSI=m +CONFIG_SCSI_DMA=y CONFIG_SCSI_NETLINK=y CONFIG_SCSI_PROC_FS=y @@ -1077,7 +1036,9 @@ CONFIG_SCSI_LOGGING=y # CONFIG_SCSI_SPI_ATTRS=m CONFIG_SCSI_FC_ATTRS=m -# CONFIG_SCSI_ISCSI_ATTRS is not set +CONFIG_SCSI_ISCSI_ATTRS=m +CONFIG_SCSI_ISCSI1_ATTRS=m +CONFIG_SCSI_ISCSI2_ATTRS=m CONFIG_SCSI_SAS_ATTRS=m CONFIG_SCSI_SAS_LIBSAS=m CONFIG_SCSI_SAS_ATA=y @@ -1086,11 +1047,20 @@ CONFIG_SCSI_SAS_ATA=y # # SCSI low-level drivers # -# CONFIG_ISCSI_TCP is not set +CONFIG_LIBFC=m +CONFIG_LIBFCOE=m +CONFIG_FCOE=m +CONFIG_LIBISCSI1=m +CONFIG_ISCSI_TCP=m +CONFIG_SCSI_CXGB3_ISCSI=m +CONFIG_SCSI_BNX2_ISCSI=m +CONFIG_BE2ISCSI=m CONFIG_BLK_DEV_3W_XXXX_RAID=m CONFIG_SCSI_3W_9XXX=m +CONFIG_SCSI_3W_SAS=m CONFIG_SCSI_ACARD=m CONFIG_SCSI_AACRAID=m +CONFIG_SCSI_MVSAS=m CONFIG_SCSI_AIC7XXX=m CONFIG_AIC7XXX_CMDS_PER_DEVICE=4 CONFIG_AIC7XXX_RESET_DELAY_MS=15000 @@ -1113,6 +1083,9 @@ CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_MAILBOX=m CONFIG_MEGARAID_LEGACY=m CONFIG_MEGARAID_SAS=m +CONFIG_SCSI_MPT2SAS=m +CONFIG_SCSI_MPT2SAS_MAX_SGE=128 +CONFIG_SCSI_MPT2SAS_LOGGING=y CONFIG_SCSI_HPTIOP=m # CONFIG_SCSI_BUSLOGIC is not set # CONFIG_SCSI_DMX3191D is not set @@ -1121,8 +1094,10 @@ CONFIG_SCSI_HPTIOP=m CONFIG_SCSI_GDTH=m CONFIG_SCSI_IPS=m CONFIG_SCSI_IBMVSCSI=m +CONFIG_SCSI_IBMVFC=m +CONFIG_SCSI_IBMVFC_TRACE=y CONFIG_SCSI_INITIO=m -CONFIG_SCSI_INIA100=m +# CONFIG_SCSI_INIA100 is not set CONFIG_SCSI_PPA=m CONFIG_SCSI_IMM=m # CONFIG_SCSI_IZIP_EPP16 is not set @@ -1138,21 +1113,30 @@ CONFIG_SCSI_IPR_TRACE=y CONFIG_SCSI_IPR_DUMP=y CONFIG_SCSI_QLOGIC_1280=m CONFIG_SCSI_QLA_FC=m -# CONFIG_SCSI_QLA_ISCSI is not set +CONFIG_SCSI_QLA_ISCSI=m CONFIG_SCSI_LPFC=m CONFIG_SCSI_DC395x=m # CONFIG_SCSI_DC390T is not set # CONFIG_SCSI_DEBUG is not set +CONFIG_SCSI_BFA_FC=m +CONFIG_SCSI_PMCRAID=m # # PCMCIA SCSI adapter support # # CONFIG_PCMCIA_FDOMAIN is not set -CONFIG_PCMCIA_QLOGIC=m -CONFIG_PCMCIA_SYM53C500=m +# CONFIG_PCMCIA_QLOGIC is not set +# CONFIG_PCMCIA_SYM53C500 is not set +CONFIG_SCSI_DH=m +CONFIG_SCSI_DH_EMC=m +CONFIG_SCSI_DH_RDAC=m +CONFIG_SCSI_DH_ALUA=m CONFIG_ATA=m # CONFIG_ATA_NONSTANDARD is not set +CONFIG_SATA_PMP=y CONFIG_SATA_AHCI=m +CONFIG_SATA_SIL24=m +CONFIG_ATA_SFF=y CONFIG_SATA_SVW=m CONFIG_ATA_PIIX=m CONFIG_SATA_MV=m @@ -1162,7 +1146,6 @@ CONFIG_SATA_QSTOR=m CONFIG_SATA_PROMISE=m CONFIG_SATA_SX4=m CONFIG_SATA_SIL=m -CONFIG_SATA_SIL24=m CONFIG_SATA_SIS=m CONFIG_SATA_ULI=m CONFIG_SATA_VIA=m @@ -1191,6 +1174,7 @@ CONFIG_PATA_MARVELL=m # CONFIG_PATA_MPIIX is not set # CONFIG_PATA_OLDPIIX is not set # CONFIG_PATA_NETCELL is not set +# CONFIG_PATA_NINJA32 is not set # CONFIG_PATA_NS87410 is not set # CONFIG_PATA_NS87415 is not set # CONFIG_PATA_OPTI is not set @@ -1202,10 +1186,12 @@ CONFIG_PATA_MARVELL=m # CONFIG_PATA_SC1200 is not set # CONFIG_PATA_SERVERWORKS is not set CONFIG_PATA_PDC2027X=m -# CONFIG_PATA_SIL680 is not set +CONFIG_PATA_SIL680=m CONFIG_PATA_SIS=m # CONFIG_PATA_VIA is not set # CONFIG_PATA_WINBOND is not set +# CONFIG_PATA_PLATFORM is not set +# CONFIG_PATA_SCH is not set CONFIG_ATA_INTEL_COMBINED=y # @@ -1230,6 +1216,7 @@ CONFIG_DM_MULTIPATH=m CONFIG_DM_MULTIPATH_EMC=m CONFIG_DM_MULTIPATH_RDAC=m CONFIG_DM_MULTIPATH_HP=m +CONFIG_DM_RAID45=m CONFIG_DM_UEVENT=y # @@ -1239,12 +1226,17 @@ CONFIG_FUSION=y CONFIG_FUSION_SPI=m CONFIG_FUSION_FC=m CONFIG_FUSION_SAS=m -CONFIG_FUSION_MAX_SGE=128 +CONFIG_FUSION_MAX_SGE=256 CONFIG_FUSION_CTL=m CONFIG_FUSION_LAN=m CONFIG_FUSION_LOGGING=y + +# +# Enable only one of the two stacks, unless you know what you are doing +# CONFIG_FIREWIRE=m CONFIG_FIREWIRE_OHCI=m +CONFIG_FIREWIRE_OHCI_DEBUG=y CONFIG_FIREWIRE_SBP2=m # @@ -1264,11 +1256,11 @@ CONFIG_ADB_PMU=y CONFIG_ADB_PMU_LED=y CONFIG_ADB_PMU_LED_IDE=y CONFIG_PMAC_SMU=y -CONFIG_THERM_PM72=y +CONFIG_THERM_PM72=m CONFIG_WINDFARM=y -CONFIG_WINDFARM_PM81=y -CONFIG_WINDFARM_PM91=y -CONFIG_WINDFARM_PM112=y +CONFIG_WINDFARM_PM81=m +CONFIG_WINDFARM_PM91=m +CONFIG_WINDFARM_PM112=m # # Network device support @@ -1277,7 +1269,7 @@ CONFIG_NETDEVICES=y CONFIG_IFB=m CONFIG_DUMMY=m CONFIG_BONDING=m -CONFIG_EQUALIZER=m +# CONFIG_EQUALIZER is not set CONFIG_TUN=m # @@ -1360,8 +1352,8 @@ CONFIG_VIA_RHINE=m CONFIG_VIA_RHINE_MMIO=y CONFIG_VIA_RHINE_NAPI=y CONFIG_NET_POCKET=y -CONFIG_DE600=m -CONFIG_DE620=m +# CONFIG_DE600 is not set +# CONFIG_DE620 is not set # # Ethernet (1000 Mbit) @@ -1374,11 +1366,12 @@ CONFIG_E1000_NAPI=y # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set CONFIG_E1000E=m CONFIG_IGB=m +CONFIG_IGBVF=m +CONFIG_IGB_DCA=y CONFIG_NS83820=m -CONFIG_HAMACHI=m -CONFIG_YELLOWFIN=m +# CONFIG_HAMACHI is not set +# CONFIG_YELLOWFIN is not set CONFIG_R8169=m -CONFIG_R8169_NAPI=y CONFIG_R8169_VLAN=y CONFIG_SIS190=m CONFIG_SKGE=m @@ -1387,6 +1380,7 @@ CONFIG_SKY2=m CONFIG_VIA_VELOCITY=m CONFIG_TIGON3=m CONFIG_BNX2=m +CONFIG_CNIC=m CONFIG_SPIDER_NET=m # CONFIG_MV643XX_ETH is not set CONFIG_QLA3XXX=m @@ -1394,18 +1388,32 @@ CONFIG_QLA3XXX=m # # Ethernet (10000 Mbit) # +CONFIG_MDIO=m CONFIG_CHELSIO_T1=m CONFIG_CHELSIO_T3=m CONFIG_EHEA=m CONFIG_IXGBE=m +CONFIG_IXGBE_DCA=y +CONFIG_IXGBEVF=m CONFIG_IXGB=m CONFIG_IXGB_NAPI=y CONFIG_S2IO=m CONFIG_S2IO_NAPI=y +CONFIG_VXGE=m +# CONFIG_VXGE_DEBUG_TRACE_ALL is not set CONFIG_MYRI10GE=m +CONFIG_ENIC=m CONFIG_NETXEN_NIC=m +CONFIG_NIU=m CONFIG_BNX2X=m -# CONFIG_MLX4_CORE is not set +CONFIG_MLX4_EN=m +CONFIG_QLCNIC=m +CONFIG_QLGE=m +CONFIG_MLX4_CORE=m +CONFIG_MLX4_DEBUG=y +CONFIG_BE2NET=m +CONFIG_SFC=m +CONFIG_SFC_MTD=y # # Token Ring devices @@ -1419,6 +1427,7 @@ CONFIG_3C359=m # Wireless LAN (non-hamradio) # CONFIG_NET_RADIO=y +CONFIG_NET_WIRELESS_RTNETLINK=y # # Obsolete Wireless cards support (pre-802.11) @@ -1461,6 +1470,9 @@ CONFIG_PCMCIA_WL3501=m # CONFIG_PRISM54=m CONFIG_USB_ZD1201=m +CONFIG_RTL8180=m +CONFIG_RTL8187=m +CONFIG_RTL8187_LEDS=y CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y CONFIG_HOSTAP_FIRMWARE_NVRAM=y @@ -1477,12 +1489,34 @@ CONFIG_BCM43XX_DMA_AND_PIO_MODE=y CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set CONFIG_NET_WIRELESS=y -CONFIG_IWL4965=m -CONFIG_IWL4965_QOS=y -CONFIG_IWL4965_SPECTRUM_MEASUREMENT=y -CONFIG_IWL4965_SENSITIVITY=y -# CONFIG_IWL4965_DEBUG is not set -# CONFIG_IWL3945 is not set +CONFIG_ATH_COMMON=m +CONFIG_ATH5K=m +# CONFIG_ATH5K_DEBUG is not set +CONFIG_ATH9K=m +# CONFIG_ATH9K_DEBUG is not set +CONFIG_IWLWIFI=m +CONFIG_IWLWIFI_LEDS=y +# CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT is not set +# CONFIG_IWLWIFI_DEBUG is not set +CONFIG_IWLAGN=m +CONFIG_IWL4965=y +CONFIG_IWL5000=y +CONFIG_IWL3945=m +CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y +CONFIG_RT2X00=m +CONFIG_RT2400PCI=m +CONFIG_RT2500PCI=m +CONFIG_RT61PCI=m +CONFIG_RT2500USB=m +CONFIG_RT73USB=m +# CONFIG_RT2800USB is not set +CONFIG_RT2X00_LIB_PCI=m +CONFIG_RT2X00_LIB_USB=m +CONFIG_RT2X00_LIB=m +CONFIG_RT2X00_LIB_FIRMWARE=y +CONFIG_RT2X00_LIB_CRYPTO=y +CONFIG_RT2X00_LIB_LEDS=y +# CONFIG_RT2X00_DEBUG is not set # # PCMCIA network device support @@ -1525,9 +1559,9 @@ CONFIG_ATM_HE=m # CONFIG_ATM_HE_USE_SUNI is not set CONFIG_FDDI=y # CONFIG_DEFXX is not set -CONFIG_SKFP=m +# CONFIG_SKFP is not set # CONFIG_HIPPI is not set -CONFIG_PLIP=m +# CONFIG_PLIP is not set CONFIG_PPP=m CONFIG_PPP_MULTILINK=y CONFIG_PPP_FILTER=y @@ -1686,6 +1720,7 @@ CONFIG_ISDN_DIVAS_MAINT=m # Input device support # CONFIG_INPUT=y +CONFIG_INPUT_POLLDEV=m # # Userland interfaces @@ -1713,29 +1748,27 @@ CONFIG_MOUSE_PS2=y CONFIG_MOUSE_SERIAL=m CONFIG_MOUSE_VSXXXAA=m CONFIG_INPUT_JOYSTICK=y -CONFIG_JOYSTICK_ANALOG=m -CONFIG_JOYSTICK_A3D=m -CONFIG_JOYSTICK_ADI=m -CONFIG_JOYSTICK_COBRA=m -CONFIG_JOYSTICK_GF2K=m -CONFIG_JOYSTICK_GRIP=m -CONFIG_JOYSTICK_GRIP_MP=m -CONFIG_JOYSTICK_GUILLEMOT=m -CONFIG_JOYSTICK_INTERACT=m -CONFIG_JOYSTICK_SIDEWINDER=m -CONFIG_JOYSTICK_TMDC=m -CONFIG_JOYSTICK_IFORCE=m -CONFIG_JOYSTICK_IFORCE_USB=y -CONFIG_JOYSTICK_IFORCE_232=y -CONFIG_JOYSTICK_WARRIOR=m -CONFIG_JOYSTICK_MAGELLAN=m -CONFIG_JOYSTICK_SPACEORB=m -CONFIG_JOYSTICK_SPACEBALL=m -CONFIG_JOYSTICK_STINGER=m +# CONFIG_JOYSTICK_ANALOG is not set +# CONFIG_JOYSTICK_A3D is not set +# CONFIG_JOYSTICK_ADI is not set +# CONFIG_JOYSTICK_COBRA is not set +# CONFIG_JOYSTICK_GF2K is not set +# CONFIG_JOYSTICK_GRIP is not set +# CONFIG_JOYSTICK_GRIP_MP is not set +# CONFIG_JOYSTICK_GUILLEMOT is not set +# CONFIG_JOYSTICK_INTERACT is not set +# CONFIG_JOYSTICK_SIDEWINDER is not set +# CONFIG_JOYSTICK_TMDC is not set +# CONFIG_JOYSTICK_IFORCE is not set +# CONFIG_JOYSTICK_WARRIOR is not set +# CONFIG_JOYSTICK_MAGELLAN is not set +# CONFIG_JOYSTICK_SPACEORB is not set +# CONFIG_JOYSTICK_SPACEBALL is not set +# CONFIG_JOYSTICK_STINGER is not set CONFIG_JOYSTICK_TWIDJOY=m -CONFIG_JOYSTICK_DB9=m -CONFIG_JOYSTICK_GAMECON=m -CONFIG_JOYSTICK_TURBOGRAFX=m +# CONFIG_JOYSTICK_DB9 is not set +# CONFIG_JOYSTICK_GAMECON is not set +# CONFIG_JOYSTICK_TURBOGRAFX is not set CONFIG_JOYSTICK_JOYDUMP=m CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_GUNZE=m @@ -1817,7 +1850,7 @@ CONFIG_UNIX98_PTYS=y CONFIG_PRINTER=m CONFIG_LP_CONSOLE=y CONFIG_PPDEV=m -CONFIG_TIPAR=m +# CONFIG_TIPAR is not set CONFIG_HVC_DRIVER=y CONFIG_HVC_CONSOLE=y CONFIG_HVC_RTAS=y @@ -1861,7 +1894,7 @@ CONFIG_HW_RANDOM=y CONFIG_GEN_RTC=y # CONFIG_GEN_RTC_X is not set # CONFIG_DTLK is not set -CONFIG_R3964=m +# CONFIG_R3964 is not set # CONFIG_APPLICOM is not set # @@ -1872,11 +1905,11 @@ CONFIG_AGP_SIS=y CONFIG_AGP_VIA=y CONFIG_AGP_UNINORTH=y CONFIG_DRM=m -CONFIG_DRM_TDFX=m +# CONFIG_DRM_TDFX is not set CONFIG_DRM_R128=m CONFIG_DRM_RADEON=m CONFIG_DRM_MGA=m -CONFIG_DRM_SIS=m +# CONFIG_DRM_SIS is not set CONFIG_DRM_VIA=m CONFIG_DRM_SAVAGE=m @@ -1886,7 +1919,8 @@ CONFIG_DRM_SAVAGE=m # CONFIG_SYNCLINK_CS is not set CONFIG_CARDMAN_4000=m CONFIG_CARDMAN_4040=m -# CONFIG_RAW_DRIVER is not set +CONFIG_RAW_DRIVER=y +CONFIG_MAX_RAW_DEVS=8192 CONFIG_HANGCHECK_TIMER=m CONFIG_TCG_TPM=m CONFIG_TCG_ATMEL=m @@ -1895,13 +1929,13 @@ CONFIG_TELCLOCK=m # # I2C support # -CONFIG_I2C=y +CONFIG_I2C=m CONFIG_I2C_CHARDEV=m # # I2C Algorithms # -CONFIG_I2C_ALGOBIT=y +CONFIG_I2C_ALGOBIT=m CONFIG_I2C_ALGOPCF=m CONFIG_I2C_ALGOPCA=m @@ -1917,7 +1951,7 @@ CONFIG_I2C_ALGOPCA=m # CONFIG_I2C_I810 is not set CONFIG_I2C_PIIX4=m CONFIG_I2C_ISA=m -CONFIG_I2C_POWERMAC=y +CONFIG_I2C_POWERMAC=m CONFIG_I2C_NFORCE2=m # CONFIG_I2C_OCORES is not set CONFIG_I2C_PARPORT=m @@ -1931,7 +1965,7 @@ CONFIG_I2C_STUB=m # CONFIG_I2C_VIA is not set # CONFIG_I2C_VIAPRO is not set CONFIG_I2C_VOODOO3=m -CONFIG_I2C_PCA_ISA=m +# CONFIG_I2C_PCA_ISA is not set # # Miscellaneous I2C Chip support @@ -1958,26 +1992,26 @@ CONFIG_SENSORS_MAX6875=m # Dallas's 1-wire bus # # CONFIG_W1 is not set - -# -# Hardware Monitoring support -# CONFIG_HWMON=m CONFIG_HWMON_VID=m -# CONFIG_SENSORS_ABITUGURU is not set +CONFIG_SENSORS_AD7418=m CONFIG_SENSORS_ADM1021=m CONFIG_SENSORS_ADM1025=m CONFIG_SENSORS_ADM1026=m +CONFIG_SENSORS_ADM1029=m CONFIG_SENSORS_ADM1031=m CONFIG_SENSORS_ADM9240=m -CONFIG_SENSORS_ASB100=m +CONFIG_SENSORS_ADT7470=m +CONFIG_SENSORS_ADT7473=m CONFIG_SENSORS_ATXP1=m CONFIG_SENSORS_DS1621=m +CONFIG_SENSORS_I5K_AMB=m CONFIG_SENSORS_F71805F=m -CONFIG_SENSORS_FSCHER=m -CONFIG_SENSORS_FSCPOS=m +CONFIG_SENSORS_F71882FG=m +CONFIG_SENSORS_F75375S=m CONFIG_SENSORS_GL518SM=m CONFIG_SENSORS_GL520SM=m +CONFIG_SENSORS_IBMPEX=m # CONFIG_SENSORS_IT87 is not set CONFIG_SENSORS_LM63=m CONFIG_SENSORS_LM75=m @@ -1989,18 +2023,27 @@ CONFIG_SENSORS_LM85=m CONFIG_SENSORS_LM87=m CONFIG_SENSORS_LM90=m CONFIG_SENSORS_LM92=m +CONFIG_SENSORS_LM93=m CONFIG_SENSORS_MAX1619=m +CONFIG_SENSORS_MAX6650=m # CONFIG_SENSORS_PC87360 is not set +CONFIG_SENSORS_PC87427=m CONFIG_SENSORS_SIS5595=m +CONFIG_SENSORS_DME1737=m # CONFIG_SENSORS_SMSC47M1 is not set CONFIG_SENSORS_SMSC47M192=m # CONFIG_SENSORS_SMSC47B397 is not set +CONFIG_SENSORS_ADS7828=m +CONFIG_SENSORS_THMC50=m CONFIG_SENSORS_VIA686A=m +CONFIG_SENSORS_VT1211=m CONFIG_SENSORS_VT8231=m # CONFIG_SENSORS_W83781D is not set CONFIG_SENSORS_W83791D=m CONFIG_SENSORS_W83792D=m +CONFIG_SENSORS_W83793=m CONFIG_SENSORS_W83L785TS=m +CONFIG_SENSORS_W83L786NG=m # CONFIG_SENSORS_W83627HF is not set # CONFIG_SENSORS_W83627EHF is not set # CONFIG_HWMON_DEBUG_CHIP is not set @@ -2008,6 +2051,8 @@ CONFIG_SENSORS_W83L785TS=m # # Misc devices # +CONFIG_EEPROM_93CX6=m +CONFIG_HP_ILO=m # # Multimedia devices @@ -2027,32 +2072,21 @@ CONFIG_VIDEO_V4L2=y # CONFIG_VIDEO_ADV_DEBUG is not set # CONFIG_VIDEO_VIVI is not set CONFIG_VIDEO_BT848=m -CONFIG_VIDEO_BT848_DVB=y CONFIG_VIDEO_SAA6588=m -CONFIG_VIDEO_BWQCAM=m -CONFIG_VIDEO_CQCAM=m -CONFIG_VIDEO_W9966=m -CONFIG_VIDEO_CPIA=m -CONFIG_VIDEO_CPIA_PP=m -CONFIG_VIDEO_CPIA_USB=m +# CONFIG_VIDEO_BWQCAM is not set +# CONFIG_VIDEO_CQCAM is not set +# CONFIG_VIDEO_W9966 is not set +# CONFIG_VIDEO_CPIA is not set CONFIG_VIDEO_CPIA2=m -CONFIG_VIDEO_SAA5246A=m -CONFIG_VIDEO_SAA5249=m -CONFIG_TUNER_3036=m -CONFIG_VIDEO_SAA7134=m -CONFIG_VIDEO_SAA7134_ALSA=m -CONFIG_VIDEO_SAA7134_DVB=m -CONFIG_VIDEO_SAA7134_DVB_ALL_FRONTENDS=y -CONFIG_VIDEO_MXB=m -CONFIG_VIDEO_DPC=m -CONFIG_VIDEO_HEXIUM_ORION=m -CONFIG_VIDEO_HEXIUM_GEMINI=m -CONFIG_VIDEO_CX88_VP3054=m -CONFIG_VIDEO_CX88=m -CONFIG_VIDEO_CX88_ALSA=m -CONFIG_VIDEO_CX88_BLACKBIRD=m -CONFIG_VIDEO_CX88_DVB=m -CONFIG_VIDEO_CX88_DVB_ALL_FRONTENDS=y +# CONFIG_VIDEO_SAA5246A is not set +# CONFIG_VIDEO_SAA5249 is not set +# CONFIG_TUNER_3036 is not set +# CONFIG_VIDEO_SAA7134 is not set +# CONFIG_VIDEO_MXB is not set +# CONFIG_VIDEO_DPC is not set +# CONFIG_VIDEO_HEXIUM_ORION is not set +# CONFIG_VIDEO_HEXIUM_GEMINI is not set +# CONFIG_VIDEO_CX88 is not set # # Encoders and Decoders @@ -2072,6 +2106,7 @@ CONFIG_VIDEO_UPD64083=m # # V4L USB devices # +CONFIG_USB_VIDEO_CLASS=m CONFIG_VIDEO_PVRUSB2=m CONFIG_VIDEO_PVRUSB2_24XXX=y CONFIG_VIDEO_PVRUSB2_SYSFS=y @@ -2096,134 +2131,17 @@ CONFIG_USB_PWC=m # # Radio Adapters # -CONFIG_RADIO_GEMTEK_PCI=m -CONFIG_RADIO_MAXIRADIO=m -CONFIG_RADIO_MAESTRO=m +# CONFIG_RADIO_GEMTEK_PCI is not set +# CONFIG_RADIO_MAXIRADIO is not set +# CONFIG_RADIO_MAESTRO is not set CONFIG_USB_DSBR=m # # Digital Video Broadcasting Devices # -CONFIG_DVB=y -CONFIG_DVB_CORE=m - -# -# Supported SAA7146 based PCI Adapters -# -CONFIG_DVB_AV7110=m -CONFIG_DVB_AV7110_OSD=y -CONFIG_DVB_BUDGET=m -CONFIG_DVB_BUDGET_CI=m -CONFIG_DVB_BUDGET_AV=m -CONFIG_DVB_BUDGET_PATCH=m - -# -# Supported USB Adapters -# -CONFIG_DVB_USB=m -# CONFIG_DVB_USB_DEBUG is not set -CONFIG_DVB_USB_A800=m -CONFIG_DVB_USB_DIBUSB_MB=m -# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set -CONFIG_DVB_USB_DIBUSB_MC=m -CONFIG_DVB_USB_UMT_010=m -CONFIG_DVB_USB_CXUSB=m -CONFIG_DVB_USB_DIGITV=m -CONFIG_DVB_USB_VP7045=m -CONFIG_DVB_USB_VP702X=m -CONFIG_DVB_USB_GP8PSK=m -CONFIG_DVB_USB_NOVA_T_USB2=m -CONFIG_DVB_USB_DTT200U=m -CONFIG_DVB_TTUSB_BUDGET=m -CONFIG_DVB_TTUSB_DEC=m -CONFIG_DVB_CINERGYT2=m -CONFIG_DVB_CINERGYT2_TUNING=y -CONFIG_DVB_CINERGYT2_STREAM_URB_COUNT=32 -CONFIG_DVB_CINERGYT2_STREAM_BUF_SIZE=512 -CONFIG_DVB_CINERGYT2_QUERY_INTERVAL=250 -CONFIG_DVB_CINERGYT2_ENABLE_RC_INPUT_DEVICE=y -CONFIG_DVB_CINERGYT2_RC_QUERY_INTERVAL=100 - -# -# Supported FlexCopII (B2C2) Adapters -# -CONFIG_DVB_B2C2_FLEXCOP=m -CONFIG_DVB_B2C2_FLEXCOP_PCI=m -CONFIG_DVB_B2C2_FLEXCOP_USB=m -# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set - -# -# Supported BT878 Adapters -# -CONFIG_DVB_BT8XX=m - -# -# Supported Pluto2 Adapters -# -CONFIG_DVB_PLUTO2=m - -# -# Supported DVB Frontends -# - -# -# Customise DVB Frontends -# - -# -# DVB-S (satellite) frontends -# -CONFIG_DVB_STV0299=m -CONFIG_DVB_CX24110=m -CONFIG_DVB_CX24123=m -CONFIG_DVB_TDA8083=m -CONFIG_DVB_MT312=m -CONFIG_DVB_VES1X93=m -CONFIG_DVB_S5H1420=m - -# -# DVB-T (terrestrial) frontends -# -CONFIG_DVB_SP8870=m -CONFIG_DVB_SP887X=m -CONFIG_DVB_CX22700=m -CONFIG_DVB_CX22702=m -CONFIG_DVB_L64781=m -CONFIG_DVB_TDA1004X=m -CONFIG_DVB_NXT6000=m -CONFIG_DVB_MT352=m -CONFIG_DVB_ZL10353=m -CONFIG_DVB_DIB3000MB=m -CONFIG_DVB_DIB3000MC=m - -# -# DVB-C (cable) frontends -# -CONFIG_DVB_VES1820=m -CONFIG_DVB_TDA10021=m -CONFIG_DVB_STV0297=m - -# -# ATSC (North American/Korean Terrestrial/Cable DTV) frontends -# -CONFIG_DVB_NXT200X=m -CONFIG_DVB_OR51211=m -CONFIG_DVB_OR51132=m -CONFIG_DVB_BCM3510=m -CONFIG_DVB_LGDT330X=m - -# -# Miscellaneous devices -# -CONFIG_DVB_PLL=m -CONFIG_DVB_LNBP21=m -CONFIG_DVB_ISL6421=m -CONFIG_VIDEO_SAA7146=m -CONFIG_VIDEO_SAA7146_VV=m -CONFIG_VIDEO_VIDEOBUF=m +# CONFIG_DVB is not set CONFIG_VIDEO_TUNER=m CONFIG_VIDEO_BUF=m -CONFIG_VIDEO_BUF_DVB=m CONFIG_VIDEO_BTCX=m CONFIG_VIDEO_IR=m CONFIG_VIDEO_TVEEPROM=m @@ -2254,7 +2172,7 @@ CONFIG_FB_NVIDIA_I2C=y CONFIG_FB_RIVA=m # CONFIG_FB_RIVA_I2C is not set # CONFIG_FB_RIVA_DEBUG is not set -CONFIG_FB_MATROX=m +CONFIG_FB_MATROX=y CONFIG_FB_MATROX_MILLENIUM=y CONFIG_FB_MATROX_MYSTIQUE=y CONFIG_FB_MATROX_G=y @@ -2262,7 +2180,7 @@ CONFIG_FB_MATROX_I2C=m CONFIG_FB_MATROX_MAVEN=m CONFIG_FB_MATROX_MULTIHEAD=y CONFIG_FB_RADEON=y -CONFIG_FB_RADEON_I2C=y +# CONFIG_FB_RADEON_I2C is not set # CONFIG_FB_RADEON_DEBUG is not set # CONFIG_FB_ATY128 is not set # CONFIG_FB_ATY is not set @@ -2270,13 +2188,11 @@ CONFIG_FB_SAVAGE=m CONFIG_FB_SAVAGE_I2C=y CONFIG_FB_SAVAGE_ACCEL=y # CONFIG_FB_SIS is not set -CONFIG_FB_NEOMAGIC=m +# CONFIG_FB_NEOMAGIC is not set CONFIG_FB_KYRO=m -CONFIG_FB_3DFX=m -CONFIG_FB_3DFX_ACCEL=y -CONFIG_FB_VOODOO1=m -CONFIG_FB_TRIDENT=m -CONFIG_FB_TRIDENT_ACCEL=y +# CONFIG_FB_3DFX is not set +# CONFIG_FB_VOODOO1 is not set +# CONFIG_FB_TRIDENT is not set # CONFIG_FB_VIRTUAL is not set # @@ -2330,6 +2246,7 @@ CONFIG_SND_DYNAMIC_MINORS=y CONFIG_SND_VERBOSE_PROCFS=y # CONFIG_SND_VERBOSE_PRINTK is not set # CONFIG_SND_DEBUG is not set +CONFIG_SND_VMASTER=y # # Generic devices @@ -2366,6 +2283,7 @@ CONFIG_SND_CMIPCI=m CONFIG_SND_CS4281=m CONFIG_SND_CS46XX=m CONFIG_SND_CS46XX_NEW_DSP=y +CONFIG_SND_CTXFI=m CONFIG_SND_DARLA20=m CONFIG_SND_GINA20=m CONFIG_SND_LAYLA20=m @@ -2387,6 +2305,12 @@ CONFIG_SND_ES1968=m CONFIG_SND_FM801=m CONFIG_SND_FM801_TEA575X_BOOL=y CONFIG_SND_FM801_TEA575X=m +CONFIG_SND_HDA_POWER_SAVE=y +CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 +CONFIG_SND_HDA_HWDEP=y +CONFIG_SND_HDA_RECONFIG=y +CONFIG_SND_HDA_INPUT_BEEP=y +CONFIG_SND_HDA_GENERIC=y CONFIG_SND_HDA_INTEL=m CONFIG_SND_HDSP=m CONFIG_SND_HDSPM=m @@ -2554,6 +2478,7 @@ CONFIG_USB_RTL8150=m CONFIG_USB_USBNET=m CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_CDCETHER=m +CONFIG_USB_NET_CDC_EEM=m CONFIG_USB_NET_DM9601=m CONFIG_USB_NET_GL620A=m CONFIG_USB_NET_NET1080=m @@ -2612,8 +2537,10 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y CONFIG_USB_SERIAL_KLSI=m CONFIG_USB_SERIAL_KOBIL_SCT=m CONFIG_USB_SERIAL_MCT_U232=m +CONFIG_USB_SERIAL_MOS7840=m CONFIG_USB_SERIAL_NAVMAN=m CONFIG_USB_SERIAL_PL2303=m +CONFIG_USB_SERIAL_QUALCOMM=m CONFIG_USB_SERIAL_HP4X=m CONFIG_USB_SERIAL_SAFE=m CONFIG_USB_SERIAL_SAFE_PADDED=y @@ -2686,11 +2613,46 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m -# CONFIG_INFINIBAND is not set +CONFIG_INFINIBAND=m +CONFIG_INFINIBAND_USER_MAD=m +CONFIG_INFINIBAND_USER_ACCESS=m +CONFIG_INFINIBAND_USER_MEM=y +CONFIG_INFINIBAND_ADDR_TRANS=y +CONFIG_INFINIBAND_MTHCA=m +CONFIG_INFINIBAND_MTHCA_DEBUG=y +CONFIG_INFINIBAND_IPATH=m +CONFIG_INFINIBAND_EHCA=m +# CONFIG_INFINIBAND_AMSO1100 is not set +CONFIG_INFINIBAND_CXGB3=m +# CONFIG_INFINIBAND_CXGB3_DEBUG is not set +CONFIG_INFINIBAND_NES=m +# CONFIG_INFINIBAND_NES_DEBUG is not set +CONFIG_MLX4_INFINIBAND=m +CONFIG_INFINIBAND_IPOIB=m +CONFIG_INFINIBAND_IPOIB_CM=y +CONFIG_INFINIBAND_IPOIB_DEBUG=y +# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set +CONFIG_INFINIBAND_SRP=m +CONFIG_INFINIBAND_ISER=m +CONFIG_INFINIBAND_SDP=m +CONFIG_INFINIBAND_SDP_DEBUG=y +CONFIG_INFINIBAND_SDP_DEBUG_DATA=y +CONFIG_INFINIBAND_QLGC_VNIC=m +# CONFIG_INFINIBAND_QLGC_VNIC_STATS is not set +CONFIG_INFINIBAND_MADEYE=m # # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) # +CONFIG_EDAC=y + +# +# Reporting subsystems +# +# CONFIG_EDAC_DEBUG is not set +CONFIG_EDAC_MM_EDAC=m +CONFIG_EDAC_CELL=m +CONFIG_EDAC_POLL=y # # Real Time Clock @@ -2725,17 +2687,29 @@ CONFIG_RTC_DRV_V3020=m # # DMA Engine support # -CONFIG_DMA_ENGINE=y +CONFIG_DMA_ENGINE=m + +# +# DMA Devices +# +CONFIG_INTEL_IOATDMA=m +CONFIG_DCA=m # -# DMA Clients +# DMA Engine support version 3 +# +CONFIG_DMA_ENGINE_V3=y + +# +# DMA Clients V3 # CONFIG_NET_DMA=y # # DMA Devices # -CONFIG_INTEL_IOATDMA=m +# CONFIG_INTEL_IOATDMA_V3 is not set +CONFIG_UIO=m # # File systems @@ -2750,33 +2724,27 @@ CONFIG_EXT3_FS=m CONFIG_EXT3_FS_XATTR=y CONFIG_EXT3_FS_POSIX_ACL=y CONFIG_EXT3_FS_SECURITY=y +CONFIG_EXT4_FS=m +CONFIG_EXT4DEV_COMPAT=y +CONFIG_EXT4_FS_XATTR=y +CONFIG_EXT4_FS_POSIX_ACL=y +CONFIG_EXT4_FS_SECURITY=y +CONFIG_EXT4_DEBUG=y CONFIG_JBD=m # CONFIG_JBD_DEBUG is not set +CONFIG_JBD2=m +# CONFIG_JBD2_DEBUG is not set CONFIG_FS_MBCACHE=y -CONFIG_REISERFS_FS=m -# CONFIG_REISERFS_CHECK is not set -CONFIG_REISERFS_PROC_INFO=y -CONFIG_REISERFS_FS_XATTR=y -CONFIG_REISERFS_FS_POSIX_ACL=y -CONFIG_REISERFS_FS_SECURITY=y -CONFIG_JFS_FS=m -CONFIG_JFS_POSIX_ACL=y -CONFIG_JFS_SECURITY=y -# CONFIG_JFS_DEBUG is not set -# CONFIG_JFS_STATISTICS is not set +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set CONFIG_FS_POSIX_ACL=y -CONFIG_XFS_FS=m -CONFIG_XFS_QUOTA=y -CONFIG_XFS_SECURITY=y -CONFIG_XFS_POSIX_ACL=y -# CONFIG_XFS_RT is not set +# CONFIG_XFS_FS is not set CONFIG_GFS2_FS=m CONFIG_GFS2_FS_LOCKING_NOLOCK=m CONFIG_GFS2_FS_LOCKING_DLM=m -CONFIG_OCFS2_FS=m -# CONFIG_OCFS2_DEBUG_MASKLOG is not set -CONFIG_MINIX_FS=m -CONFIG_ROMFS_FS=m +# CONFIG_OCFS2_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_ROMFS_FS is not set CONFIG_INOTIFY=y CONFIG_INOTIFY_USER=y CONFIG_QUOTA=y @@ -2784,7 +2752,7 @@ CONFIG_QUOTA=y CONFIG_QFMT_V2=y CONFIG_QUOTACTL=y CONFIG_DNOTIFY=y -CONFIG_AUTOFS_FS=m +# CONFIG_AUTOFS_FS is not set CONFIG_AUTOFS4_FS=m CONFIG_FUSE_FS=m @@ -2831,14 +2799,13 @@ CONFIG_CONFIGFS_FS=m # Miscellaneous filesystems # # CONFIG_ADFS_FS is not set -CONFIG_AFFS_FS=m +# CONFIG_AFFS_FS is not set CONFIG_ECRYPT_FS=m CONFIG_HFS_FS=m CONFIG_HFSPLUS_FS=m -CONFIG_BEFS_FS=m -# CONFIG_BEFS_DEBUG is not set -CONFIG_BFS_FS=m -CONFIG_EFS_FS=m +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set # CONFIG_JFFS_FS is not set CONFIG_JFFS2_FS=m CONFIG_JFFS2_FS_DEBUG=0 @@ -2856,11 +2823,9 @@ CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 # CONFIG_SQUASHFS_VMALLOC is not set CONFIG_VXFS_FS=m # CONFIG_HPFS_FS is not set -CONFIG_QNX4FS_FS=m -CONFIG_SYSV_FS=m -CONFIG_UFS_FS=m -# CONFIG_UFS_FS_WRITE is not set -# CONFIG_UFS_DEBUG is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set # # Network File Systems @@ -2887,17 +2852,19 @@ CONFIG_RPCSEC_GSS_KRB5=m CONFIG_RPCSEC_GSS_SPKM3=m # CONFIG_SMB_FS is not set CONFIG_CIFS=m -# CONFIG_CIFS_STATS is not set +CONFIG_CIFS_STATS=y +# CONFIG_CIFS_STATS2 is not set CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y # CONFIG_CIFS_DEBUG2 is not set -# CONFIG_CIFS_EXPERIMENTAL is not set +CONFIG_CIFS_EXPERIMENTAL=y +CONFIG_CIFS_UPCALL=y +CONFIG_CIFS_DFS_UPCALL=y # CONFIG_NCP_FS is not set -CONFIG_CODA_FS=m -# CONFIG_CODA_FS_OLD_API is not set +# CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set -CONFIG_9P_FS=m +# CONFIG_9P_FS is not set # # Partition Types @@ -2975,10 +2942,12 @@ CONFIG_DLM_DEBUG=y # CONFIG_CRC_CCITT=m CONFIG_CRC16=m +CONFIG_CRC_ITU_T=m CONFIG_CRC32=y CONFIG_LIBCRC32C=y CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=m +CONFIG_GENERIC_ALLOCATOR=y CONFIG_TEXTSEARCH=y CONFIG_TEXTSEARCH_KMP=m CONFIG_TEXTSEARCH_BM=m @@ -3003,8 +2972,11 @@ CONFIG_KPROBES=y CONFIG_MAGIC_SYSRQ=y # CONFIG_UNUSED_SYMBOLS is not set CONFIG_DEBUG_KERNEL=y -CONFIG_LOG_BUF_SHIFT=18 +CONFIG_LOG_BUF_SHIFT=19 CONFIG_DETECT_SOFTLOCKUP=y +CONFIG_DETECT_HUNG_TASK=y +# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set +CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 CONFIG_SCHEDSTATS=y # CONFIG_DEBUG_SLAB is not set # CONFIG_DEBUG_RT_MUTEXES is not set @@ -3022,6 +2994,9 @@ CONFIG_DEBUG_LIST=y # CONFIG_FORCED_INLINING is not set CONFIG_BOOT_DELAY=y # CONFIG_RCU_TORTURE_TEST is not set +CONFIG_SAMPLES=y +CONFIG_SAMPLE_MARKERS=m +CONFIG_SAMPLE_TRACEPOINTS=m CONFIG_DEBUG_STACKOVERFLOW=y CONFIG_DEBUG_STACK_USAGE=y CONFIG_DEBUGGER=y @@ -3036,12 +3011,14 @@ CONFIG_BOOTX_TEXT=y # CONFIG_KEYS=y CONFIG_KEYS_DEBUG_PROC_KEYS=y +# CONFIG_SECURITY_DMESG_RESTRICT is not set CONFIG_SECURITY=y CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_CAPABILITIES=y # CONFIG_SECURITY_ROOTPLUG is not set # CONFIG_SECURITY_SECLVL is not set +CONFIG_LSM_MMAP_MIN_ADDR=4096 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 @@ -3058,11 +3035,13 @@ CONFIG_KEYS_COMPAT=y # CONFIG_CRYPTO=y CONFIG_CRYPTO_API=m +CONFIG_CRYPTO_FIPS=y CONFIG_CRYPTO_ALGAPI=m CONFIG_CRYPTO_AEAD=m CONFIG_CRYPTO_BLKCIPHER=m CONFIG_CRYPTO_SEQIV=m CONFIG_CRYPTO_HASH=m +CONFIG_CRYPTO_RNG=m CONFIG_CRYPTO_MANAGER=m CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_NHMAC=m @@ -3093,12 +3072,17 @@ CONFIG_CRYPTO_ANUBIS=m CONFIG_CRYPTO_DEFLATE=m CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_CRC32C=y -# CONFIG_CRYPTO_TEST is not set +CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_AUTHENC=m CONFIG_CRYPTO_SIGNATURE=y CONFIG_CRYPTO_SIGNATURE_DSA=y CONFIG_CRYPTO_MPILIB=y # +# Random Number Generation +# +CONFIG_CRYPTO_ANSI_CPRNG=m + +# # Hardware crypto devices # diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-x86_64.config index e18d195..d800674 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-x86_64.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-x86_64.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.18-prep -# Tue Jun 22 23:40:18 2010 +# Fri Apr 22 16:56:14 2011 # CONFIG_X86_64=y CONFIG_64BIT=y @@ -52,9 +52,10 @@ CONFIG_INITRAMFS_SOURCE="" CONFIG_CC_OPTIMIZE_FOR_SIZE=y # CONFIG_EMBEDDED is not set CONFIG_UID16=y +CONFIG_TASK_XACCT=y CONFIG_SYSCTL=y CONFIG_KALLSYMS=y -# CONFIG_KALLSYMS_ALL is not set +CONFIG_KALLSYMS_ALL=y CONFIG_KALLSYMS_EXTRA_PASS=y CONFIG_HOTPLUG=y CONFIG_PRINTK=y @@ -1129,6 +1130,7 @@ CONFIG_SCSI_BNX2_ISCSI=m CONFIG_BE2ISCSI=m CONFIG_BLK_DEV_3W_XXXX_RAID=m CONFIG_SCSI_3W_9XXX=m +CONFIG_SCSI_3W_SAS=m CONFIG_SCSI_ACARD=m CONFIG_SCSI_AACRAID=m CONFIG_SCSI_MVSAS=m @@ -1294,7 +1296,7 @@ CONFIG_FUSION=y CONFIG_FUSION_SPI=m CONFIG_FUSION_FC=m CONFIG_FUSION_SAS=m -CONFIG_FUSION_MAX_SGE=128 +CONFIG_FUSION_MAX_SGE=256 CONFIG_FUSION_CTL=m CONFIG_FUSION_LAN=m CONFIG_FUSION_LOGGING=y @@ -1469,6 +1471,7 @@ CONFIG_NETXEN_NIC=m CONFIG_NIU=m CONFIG_BNX2X=m CONFIG_MLX4_EN=m +CONFIG_QLCNIC=m CONFIG_QLGE=m CONFIG_MLX4_CORE=m CONFIG_MLX4_DEBUG=y @@ -1562,7 +1565,7 @@ CONFIG_ATH5K=m CONFIG_ATH9K=m # CONFIG_ATH9K_DEBUG is not set CONFIG_IWLWIFI=m -# CONFIG_IWLWIFI_LEDS is not set +CONFIG_IWLWIFI_LEDS=y # CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT is not set # CONFIG_IWLWIFI_DEBUG is not set CONFIG_IWLAGN=m @@ -1920,6 +1923,7 @@ CONFIG_PRINTER=m CONFIG_LP_CONSOLE=y CONFIG_PPDEV=m # CONFIG_TIPAR is not set +CONFIG_VIRTIO_CONSOLE=m # # IPMI @@ -2107,6 +2111,7 @@ CONFIG_SENSORS_ADM9240=m CONFIG_SENSORS_ADT7470=m CONFIG_SENSORS_ADT7473=m CONFIG_SENSORS_K8TEMP=m +CONFIG_SENSORS_K10TEMP=m CONFIG_SENSORS_ASB100=m CONFIG_SENSORS_ATXP1=m CONFIG_SENSORS_DS1621=m @@ -2422,7 +2427,7 @@ CONFIG_SND_FM801_TEA575X=m CONFIG_SND_HDA_POWER_SAVE=y CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 CONFIG_SND_HDA_HWDEP=y -# CONFIG_SND_HDA_RECONFIG is not set +CONFIG_SND_HDA_RECONFIG=y CONFIG_SND_HDA_INPUT_BEEP=y CONFIG_SND_HDA_GENERIC=y CONFIG_SND_HDA_INTEL=m @@ -2575,6 +2580,7 @@ CONFIG_USB_RTL8150=m CONFIG_USB_USBNET=m CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_CDCETHER=m +CONFIG_USB_NET_CDC_EEM=m CONFIG_USB_NET_DM9601=m CONFIG_USB_NET_GL620A=m CONFIG_USB_NET_NET1080=m @@ -2633,6 +2639,7 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y CONFIG_USB_SERIAL_KLSI=m CONFIG_USB_SERIAL_KOBIL_SCT=m CONFIG_USB_SERIAL_MCT_U232=m +CONFIG_USB_SERIAL_MOS7840=m CONFIG_USB_SERIAL_NAVMAN=m CONFIG_USB_SERIAL_PL2303=m CONFIG_USB_SERIAL_QUALCOMM=m @@ -2745,14 +2752,17 @@ CONFIG_EDAC=y # # CONFIG_EDAC_DEBUG is not set CONFIG_EDAC_MM_EDAC=m +CONFIG_EDAC_MCE=y CONFIG_EDAC_E752X=m CONFIG_EDAC_I3000=m CONFIG_EDAC_I3200=m CONFIG_EDAC_I5000=m CONFIG_EDAC_I5400=m +CONFIG_EDAC_I7CORE=m CONFIG_EDAC_K8=m CONFIG_EDAC_AMD64=m CONFIG_EDAC_POLL=y +CONFIG_EDAC_I7300=m # # Real Time Clock @@ -2966,7 +2976,8 @@ CONFIG_RPCSEC_GSS_KRB5=m CONFIG_RPCSEC_GSS_SPKM3=m # CONFIG_SMB_FS is not set CONFIG_CIFS=m -# CONFIG_CIFS_STATS is not set +CONFIG_CIFS_STATS=y +# CONFIG_CIFS_STATS2 is not set CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y @@ -3055,7 +3066,9 @@ CONFIG_DLM_DEBUG=y # CONFIG_PROFILING=y CONFIG_OPROFILE=m +CONFIG_HAVE_OPTPROBES=y CONFIG_KPROBES=y +CONFIG_OPTPROBES=y # # Kernel hacking @@ -3065,7 +3078,7 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y CONFIG_MAGIC_SYSRQ=y # CONFIG_UNUSED_SYMBOLS is not set CONFIG_DEBUG_KERNEL=y -CONFIG_LOG_BUF_SHIFT=18 +CONFIG_LOG_BUF_SHIFT=19 CONFIG_DETECT_SOFTLOCKUP=y CONFIG_DETECT_HUNG_TASK=y # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set @@ -3098,12 +3111,14 @@ CONFIG_DEBUG_RODATA=y # CONFIG_IOMMU_DEBUG is not set CONFIG_DEBUG_STACKOVERFLOW=y # CONFIG_DEBUG_STACK_USAGE is not set +CONFIG_X86_DECODER_SELFTEST=y # # Security options # CONFIG_KEYS=y CONFIG_KEYS_DEBUG_PROC_KEYS=y +# CONFIG_SECURITY_DMESG_RESTRICT is not set CONFIG_SECURITY=y CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_NETWORK_XFRM=y diff --git a/lustre/kernel_patches/patches/jbd2-jcberr-2.6-rhel5.patch b/lustre/kernel_patches/patches/jbd2-jcberr-2.6-rhel5.patch index 5c15956..3d7b761 100644 --- a/lustre/kernel_patches/patches/jbd2-jcberr-2.6-rhel5.patch +++ b/lustre/kernel_patches/patches/jbd2-jcberr-2.6-rhel5.patch @@ -137,13 +137,12 @@ Index: linux-2.6.18-128.1.6/fs/jbd2/journal.c =================================================================== --- linux-2.6.18-128.1.6.orig/fs/jbd2/journal.c 2009-04-15 08:35:28.000000000 +0530 +++ linux-2.6.18-128.1.6/fs/jbd2/journal.c 2009-05-28 17:13:35.000000000 +0530 -@@ -80,6 +80,9 @@ +@@ -80,6 +80,8 @@ EXPORT_SYMBOL(jbd2_journal_init_jbd_inode); EXPORT_SYMBOL(jbd2_journal_release_jbd_inode); EXPORT_SYMBOL(jbd2_journal_begin_ordered_truncate); +EXPORT_SYMBOL(jbd2_journal_callback_set); +EXPORT_SYMBOL(jbd2_journal_bmap); -+EXPORT_SYMBOL(jbd2_log_start_commit); static int journal_convert_superblock_v1(journal_t *, journal_superblock_t *); static void __journal_abort_soft (journal_t *journal, int errno); diff --git a/lustre/kernel_patches/targets/2.6-rhel5.target.in b/lustre/kernel_patches/targets/2.6-rhel5.target.in index a3e5af6..87f0e9c 100644 --- a/lustre/kernel_patches/targets/2.6-rhel5.target.in +++ b/lustre/kernel_patches/targets/2.6-rhel5.target.in @@ -1,5 +1,5 @@ lnxmaj="2.6.18" -lnxrel="194.17.1.el5" +lnxrel="238.9.1.el5" KERNEL_SRPM=kernel-${lnxmaj}-${lnxrel}.src.rpm SERIES=2.6-rhel5.series diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch index 13ba7c8..1f81015 100644 --- a/lustre/kernel_patches/which_patch +++ b/lustre/kernel_patches/which_patch @@ -1,11 +1,11 @@ SERIES VERSION COMMENT SUPPORTED KERNELS: -2.6-rhel5 RHEL5: 2.6.18-194.17.1.el5 -2.6-rhel5 OEL5: 2.6.18-194.17.1.0.1.el5 +2.6-rhel5 RHEL5: 2.6.18-238.9.1.el5 +2.6-rhel6 RHEL6: 2.6.32-71.18.2.el6 CLIENT SUPPORT FOR UNPATCHED KERNELS: - 2.6.18-194.17.1.el5 (RHEL 5), - 2.6.18-194.17.1.0.1.el5 (OEL 5) - 2.6.16.60-0.69.1 (SLES 10), - 2.6.27.19-5 (SLES11) + 2.6.18-238.9.1.el5 (RHEL5) + 2.6.32-71.18.2.el6 (RHEL6) + 2.6.16.60-0.69.1 (SLES10) + 2.6.27.19-5 (SLES11) diff --git a/lustre/lclient/glimpse.c b/lustre/lclient/glimpse.c index 268f5d7..c399268 100644 --- a/lustre/lclient/glimpse.c +++ b/lustre/lclient/glimpse.c @@ -174,8 +174,8 @@ int cl_glimpse_size(struct inode *inode) * cl_glimpse_size(), which doesn't make sense: glimpse locks are not * blocking anyway. */ - struct lu_env *env; - struct cl_io *io; + struct lu_env *env = NULL; + struct cl_io *io = NULL; int result; int refcheck; @@ -200,8 +200,8 @@ int cl_glimpse_size(struct inode *inode) int cl_local_size(struct inode *inode) { - struct lu_env *env; - struct cl_io *io; + struct lu_env *env = NULL; + struct cl_io *io = NULL; struct ccc_thread_info *cti; struct cl_object *clob; struct cl_lock_descr *descr;