From 2b25603af9e8ad1c1a02d35170e3cf375515a4f7 Mon Sep 17 00:00:00 2001 From: buffalo-pull Date: Thu, 23 Jun 2005 13:25:12 +0000 Subject: [PATCH] Bring these two configs into parity with each others' recent changes. --- .../kernel_configs/kernel-2.6.10-2.6-fc3-i686-smp.config | 6 +++++- lustre/kernel_patches/kernel_configs/kernel-2.6.10-smp.config | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.10-2.6-fc3-i686-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.10-2.6-fc3-i686-smp.config index 4ff09b8..539b045e 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.10-2.6-fc3-i686-smp.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.10-2.6-fc3-i686-smp.config @@ -522,7 +522,11 @@ CONFIG_MD_RAID5=m # CONFIG_MD_RAID6 is not set CONFIG_MD_MULTIPATH=m CONFIG_MD_FAULTY=m -# CONFIG_BLK_DEV_DM is not set +CONFIG_BLK_DEV_DM=m +CONFIG_DM_CRYPT=m +CONFIG_DM_SNAPSHOT=m +CONFIG_DM_MIRROR=m +CONFIG_DM_ZERO=m # # Fusion MPT device support diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.10-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.10-smp.config index 370cf6e..539b045e 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.10-smp.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.10-smp.config @@ -1954,8 +1954,8 @@ CONFIG_DEBUG_KERNEL=y CONFIG_MAGIC_SYSRQ=y # CONFIG_SCHEDSTATS is not set CONFIG_DEBUG_SLAB=y -# CONFIG_DEBUG_SPINLOCK is not set -# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +CONFIG_DEBUG_SPINLOCK=y +CONFIG_DEBUG_SPINLOCK_SLEEP=y # CONFIG_DEBUG_KOBJECT is not set # CONFIG_DEBUG_HIGHMEM is not set # CONFIG_DEBUG_INFO is not set -- 1.8.3.1