diff options
author | Michael Neuling <mikey@neuling.org> | 2013-02-13 11:21:44 -0500 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-02-15 01:02:25 -0500 |
commit | 81afe7d1017ff7f1753fcfaa8b0fd3abc4c7219d (patch) | |
tree | 576e8a0d9e2f950886002295e0630e13cacfe314 /arch/powerpc/configs | |
parent | 3d72bbc40777437a78db70e398981c828240c81f (diff) |
powerpc: Add transactional memory to pseries and ppc64 defconfigs
Signed-off-by: Matt Evans <matt@ozlabs.org>
Signed-off-by: Michael Neuling <mikey@neuling.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/configs')
-rw-r--r-- | arch/powerpc/configs/ppc64_defconfig | 2 | ||||
-rw-r--r-- | arch/powerpc/configs/pseries_defconfig | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig index 6cbdeb4290e2..aef3f71de5ad 100644 --- a/arch/powerpc/configs/ppc64_defconfig +++ b/arch/powerpc/configs/ppc64_defconfig | |||
@@ -49,6 +49,8 @@ CONFIG_CPU_FREQ_GOV_USERSPACE=y | |||
49 | CONFIG_CPU_FREQ_PMAC64=y | 49 | CONFIG_CPU_FREQ_PMAC64=y |
50 | CONFIG_HZ_100=y | 50 | CONFIG_HZ_100=y |
51 | CONFIG_BINFMT_MISC=m | 51 | CONFIG_BINFMT_MISC=m |
52 | CONFIG_PPC_TRANSACTIONAL_MEM=y | ||
53 | CONFIG_HOTPLUG_CPU=y | ||
52 | CONFIG_KEXEC=y | 54 | CONFIG_KEXEC=y |
53 | CONFIG_IRQ_ALL_CPUS=y | 55 | CONFIG_IRQ_ALL_CPUS=y |
54 | CONFIG_MEMORY_HOTREMOVE=y | 56 | CONFIG_MEMORY_HOTREMOVE=y |
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig index 04fa7f2e295f..c4dfbaf8b192 100644 --- a/arch/powerpc/configs/pseries_defconfig +++ b/arch/powerpc/configs/pseries_defconfig | |||
@@ -43,6 +43,8 @@ CONFIG_RTAS_FLASH=m | |||
43 | CONFIG_IBMEBUS=y | 43 | CONFIG_IBMEBUS=y |
44 | CONFIG_HZ_100=y | 44 | CONFIG_HZ_100=y |
45 | CONFIG_BINFMT_MISC=m | 45 | CONFIG_BINFMT_MISC=m |
46 | CONFIG_PPC_TRANSACTIONAL_MEM=y | ||
47 | CONFIG_HOTPLUG_CPU=y | ||
46 | CONFIG_KEXEC=y | 48 | CONFIG_KEXEC=y |
47 | CONFIG_IRQ_ALL_CPUS=y | 49 | CONFIG_IRQ_ALL_CPUS=y |
48 | CONFIG_MEMORY_HOTPLUG=y | 50 | CONFIG_MEMORY_HOTPLUG=y |