summaryrefslogtreecommitdiffstats
path: root/config-powerpc64
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2014-04-12 19:57:02 -0400
committerJosh Boyer <jwboyer@redhat.com>2014-04-12 19:57:17 -0400
commitf9bb91845a30b5ec296ef6f01c9d2eca4cd0b0bb (patch)
treeae6f188c3254fa288da2b260e96c186010236a9c /config-powerpc64
parent58049b49658b32aa5195bc7517018539e6eba59c (diff)
downloadkernel-f9bb91845a30b5ec296ef6f01c9d2eca4cd0b0bb.tar.gz
kernel-f9bb91845a30b5ec296ef6f01c9d2eca4cd0b0bb.tar.xz
kernel-f9bb91845a30b5ec296ef6f01c9d2eca4cd0b0bb.zip
Linux v3.14.1-rc1
Diffstat (limited to 'config-powerpc64')
-rw-r--r--config-powerpc6412
1 files changed, 10 insertions, 2 deletions
diff --git a/config-powerpc64 b/config-powerpc64
index b430449e0..4b8ba84aa 100644
--- a/config-powerpc64
+++ b/config-powerpc64
@@ -14,6 +14,8 @@ CONFIG_PPC_PMAC=y
CONFIG_PPC_POWERNV=y
CONFIG_POWERNV_MSI=y
CONFIG_PPC_POWERNV_RTAS=y
+CONFIG_HW_RANDOM_POWERNV=m
+CONFIG_SCOM_DEBUGFS=y
# CONFIG_PPC_PASEMI is not set
# CONFIG_PPC_PASEMI_IOMMU_DMA_FORCE is not set
# CONFIG_PPC_PS3 is not set
@@ -87,6 +89,8 @@ CONFIG_NR_CPUS=1024
CONFIG_RTAS_PROC=y
CONFIG_IOMMU_VMERGE=y
CONFIG_NUMA=y
+CONFIG_NUMA_BALANCING=y
+CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
CONFIG_PPC_64K_PAGES=y
CONFIG_PPC_SUBPAGE_PROT=y
CONFIG_SCHED_SMT=y
@@ -97,6 +101,8 @@ CONFIG_HZ_100=y
CONFIG_MEMORY_HOTREMOVE=y
+CONFIG_PPC64_SUPPORTS_MEMORY_FAILURE=y
+
CONFIG_CGROUP_HUGETLB=y
# CONFIG_MV643XX_ETH is not set
@@ -139,7 +145,8 @@ CONFIG_RCU_FANOUT=64
CONFIG_CMA=y
# CONFIG_CMA_DEBUG is not set
CONFIG_KVM_BOOK3S_64=m
-CONFIG_KVM_BOOK3S_64_HV=y
+CONFIG_KVM_BOOK3S_64_HV=m
+CONFIG_KVM_BOOK3S_64_PR=m
# CONFIG_KVM_EXIT_TIMING is not set
CONFIG_KVM_XICS=y
@@ -156,7 +163,8 @@ CONFIG_PSERIES_ENERGY=m
CONFIG_CPU_IDLE=y
# CONFIG_CPU_IDLE_GOV_LADDER is not set
-CONFIG_PSERIES_IDLE=y
+CONFIG_PSERIES_CPUIDLE=y
+CONFIG_POWERNV_CPUIDLE=y
CONFIG_PPC_ICSWX=y
CONFIG_IO_EVENT_IRQ=y