From 05864ebb8713f63b45ad4a90eb647eea1d26947a Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@fedoraproject.org>
Date: Tue, 28 Jan 2014 08:16:56 -0500
Subject: Linux v3.13-8789-g54c0a4b

- Enable CONFIG_CC_STACKPROTECTOR_STRONG on x86
---
 config-powerpc64p7 | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'config-powerpc64p7')

diff --git a/config-powerpc64p7 b/config-powerpc64p7
index 8ff01178e..592476426 100644
--- a/config-powerpc64p7
+++ b/config-powerpc64p7
@@ -80,6 +80,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
@@ -90,6 +92,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
-- 
cgit