From: Maxim Uvarov Date: Thu, 5 Apr 2012 22:42:09 +0000 (-0700) Subject: adjust kernel configs X-Git-Tag: v2.6.39-400.9.0~426^2~20 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=fe0ae98f2950419d7e629d632043b92142c7718e;p=users%2Fjedix%2Flinux-maple.git adjust kernel configs Signed-off-by: Maxim Uvarov --- diff --git a/uek-rpm/ol5/config-generic b/uek-rpm/ol5/config-generic index 219602d6053b..57168a698811 100644 --- a/uek-rpm/ol5/config-generic +++ b/uek-rpm/ol5/config-generic @@ -1897,6 +1897,7 @@ CONFIG_BNX2X=m CONFIG_QLCNIC=m CONFIG_QLGE=m CONFIG_BNA=m +CONFIG_HXGE=m CONFIG_SFC=m CONFIG_SFC_MTD=y CONFIG_BE2NET=m diff --git a/uek-rpm/ol5/config-x86_64-generic b/uek-rpm/ol5/config-x86_64-generic index 85340f380d01..514678fb51bf 100644 --- a/uek-rpm/ol5/config-x86_64-generic +++ b/uek-rpm/ol5/config-x86_64-generic @@ -8,7 +8,6 @@ CONFIG_X86_MINIMUM_CPU_FAMILY=64 CONFIG_GENERIC_CPU=y CONFIG_X86_EXTENDED_PLATFORM=y # CONFIG_X86_VSMP is not set -# CONFIG_X86_UV is not set CONFIG_X86_MSR=y CONFIG_X86_CPUID=y CONFIG_X86_CPU_DEBUG=m @@ -17,7 +16,6 @@ CONFIG_NUMA=y CONFIG_K8_NUMA=y CONFIG_X86_64_ACPI_NUMA=y # CONFIG_NUMA_EMU is not set -CONFIG_NR_CPUS=256 CONFIG_X86_POWERNOW_K8=m CONFIG_X86_POWERNOW_K8_ACPI=y CONFIG_X86_P4_CLOCKMOD=m @@ -160,7 +158,6 @@ CONFIG_BLK_DEV_AMD74XX=y CONFIG_CRYPTO_DEV_PADLOCK=m CONFIG_CRYPTO_DEV_PADLOCK_AES=m CONFIG_CRYPTO_DEV_PADLOCK_SHA=m -# CONFIG_CRYPTO_AES is not set CONFIG_CRYPTO_AES_X86_64=m # CONFIG_CRYPTO_TWOFISH is not set CONFIG_CRYPTO_TWOFISH_X86_64=m @@ -276,7 +273,6 @@ CONFIG_ISCSI_IBFT=m CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y CONFIG_CPU_IDLE=y -# CONFIG_CPU_IDLE_GOV_LADDER is not set CONFIG_CPU_IDLE_GOV_MENU=y CONFIG_VIRTUALIZATION=y @@ -335,7 +331,6 @@ CONFIG_DIRECT_GBPAGES=y # CONFIG_MEMTEST is not set CONFIG_AMD_IOMMU=y CONFIG_AMD_IOMMU_STATS=y -# CONFIG_MAXSMP is not set CONFIG_MTRR_SANITIZER=y CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=1 CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 @@ -380,7 +375,6 @@ CONFIG_RCU_FANOUT=64 CONFIG_PERF_COUNTERS=y CONFIG_EVENT_PROFILE=y -# CONFIG_X86_MCE_INJECT is not set CONFIG_FUNCTION_GRAPH_TRACER=y diff --git a/uek-rpm/ol6/config-x86_64-generic b/uek-rpm/ol6/config-x86_64-generic index 85340f380d01..514678fb51bf 100644 --- a/uek-rpm/ol6/config-x86_64-generic +++ b/uek-rpm/ol6/config-x86_64-generic @@ -8,7 +8,6 @@ CONFIG_X86_MINIMUM_CPU_FAMILY=64 CONFIG_GENERIC_CPU=y CONFIG_X86_EXTENDED_PLATFORM=y # CONFIG_X86_VSMP is not set -# CONFIG_X86_UV is not set CONFIG_X86_MSR=y CONFIG_X86_CPUID=y CONFIG_X86_CPU_DEBUG=m @@ -17,7 +16,6 @@ CONFIG_NUMA=y CONFIG_K8_NUMA=y CONFIG_X86_64_ACPI_NUMA=y # CONFIG_NUMA_EMU is not set -CONFIG_NR_CPUS=256 CONFIG_X86_POWERNOW_K8=m CONFIG_X86_POWERNOW_K8_ACPI=y CONFIG_X86_P4_CLOCKMOD=m @@ -160,7 +158,6 @@ CONFIG_BLK_DEV_AMD74XX=y CONFIG_CRYPTO_DEV_PADLOCK=m CONFIG_CRYPTO_DEV_PADLOCK_AES=m CONFIG_CRYPTO_DEV_PADLOCK_SHA=m -# CONFIG_CRYPTO_AES is not set CONFIG_CRYPTO_AES_X86_64=m # CONFIG_CRYPTO_TWOFISH is not set CONFIG_CRYPTO_TWOFISH_X86_64=m @@ -276,7 +273,6 @@ CONFIG_ISCSI_IBFT=m CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y CONFIG_CPU_IDLE=y -# CONFIG_CPU_IDLE_GOV_LADDER is not set CONFIG_CPU_IDLE_GOV_MENU=y CONFIG_VIRTUALIZATION=y @@ -335,7 +331,6 @@ CONFIG_DIRECT_GBPAGES=y # CONFIG_MEMTEST is not set CONFIG_AMD_IOMMU=y CONFIG_AMD_IOMMU_STATS=y -# CONFIG_MAXSMP is not set CONFIG_MTRR_SANITIZER=y CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=1 CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 @@ -380,7 +375,6 @@ CONFIG_RCU_FANOUT=64 CONFIG_PERF_COUNTERS=y CONFIG_EVENT_PROFILE=y -# CONFIG_X86_MCE_INJECT is not set CONFIG_FUNCTION_GRAPH_TRACER=y