Security update, RHSA-2014:1392-2

[packages/centos6/kernel.git] / config-x86_64-generic-rhel

diff --git a/config-x86_64-generic-rhel b/config-x86_64-generic-rhel
index 95e9ca0f5b289709e51be18840c7ae64d99de53b..2fff3806a281368af60ad7b37bbee9e9ceef45cd 100644 (file)
--- a/config-x86_64-generic-rhel
+++ b/config-x86_64-generic-rhel
@@ -17,6 +17,7 @@ CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
 CONFIG_THINKPAD_ACPI_VIDEO=y
 CONFIG_MEMORY_HOTPLUG=y
 CONFIG_ACPI_HOTPLUG_MEMORY=y
+CONFIG_ACPI_HOTPLUG_CPU=y
 CONFIG_MEMORY_HOTPLUG_SPARSE=y
 CONFIG_DEBUG_NMI_TIMEOUT=30
 CONFIG_CRASH=y
@@ -54,6 +55,7 @@ CONFIG_VMWARE_BALLOON=m
 CONFIG_X86_PCC_CPUFREQ=m
 CONFIG_INTEL_IDLE=y
 CONFIG_INFINIBAND_QIB=m
+CONFIG_INFINIBAND_QIB_DCA=y
 CONFIG_INTEL_IPS=m
 CONFIG_INTEL_TXT=y
 CONFIG_HP_WATCHDOG=m
@@ -61,6 +63,7 @@ CONFIG_HPWDT_NMI_DECODING=y
 CONFIG_IB700_WDT=m
 CONFIG_HPET_MMAP=y
 CONFIG_SENSORS_FAM15H_POWER=m
+CONFIG_BLK_DEV_RSXX=m
 # CONFIG_DMAR_DEFAULT_ON is not set
 # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set
 # CONFIG_MEMORY_HOTREMOVE is not set
@@ -90,6 +93,7 @@ CONFIG_XEN_MAX_DOMAIN_MEMORY=128
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
 CONFIG_I2C_ISMT=m
 CONFIG_LPC_SCH=m
+CONFIG_LPC_ICH=m
 CONFIG_GPIOLIB=y
 #CONFIG_MFD_SM501_GPIO is not set
 CONFIG_GPIO_SCH=m
@@ -114,3 +118,14 @@ CONFIG_HYPERV_MOUSE=m
 CONFIG_HYPERV_STORAGE=m
 CONFIG_HYPERV_NET=m
 CONFIG_HYPERV_BALLOON=m
+CONFIG_X86_INTEL_PSTATE=m
+CONFIG_PVPANIC=y
+CONFIG_FB_HYPERV=m
+CONFIG_HYPERV_KEYBOARD=m
+CONFIG_BLK_DEV_NVME=m
+CONFIG_INTEL_POWERCLAMP=m
+CONFIG_EARLY_PRINTK_EFI=y
+CONFIG_POWERCAP=y
+CONFIG_INTEL_RAPL=m
+CONFIG_ACPI_EXTLOG=m
+CONFIG_CRYPTO_CRCT10DIF_PCLMUL=y