aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/configs/pseries_le_defconfig
diff options
context:
space:
mode:
authorAnton Blanchard <anton@samba.org>2014-10-13 05:17:33 -0400
committerMichael Ellerman <mpe@ellerman.id.au>2014-10-16 02:37:44 -0400
commit86be175a730bd98de2b75522eae08160ec2dec91 (patch)
treec44fbe0244fb71b0b71dd50c2e19cd6dae35e5c2 /arch/powerpc/configs/pseries_le_defconfig
parent2c186e05a5c6dc8fcfb1e8bf6901ad1598c40db6 (diff)
powerpc: sync pseries_le_defconfig with pseries_defconfig
Now KVM is working on LE, enable it. Also enable transarent hugepage which has already been enabled on BE. Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/configs/pseries_le_defconfig')
-rw-r--r--arch/powerpc/configs/pseries_le_defconfig7
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/powerpc/configs/pseries_le_defconfig b/arch/powerpc/configs/pseries_le_defconfig
index 4428ee428f4e..96a230cd5ca7 100644
--- a/arch/powerpc/configs/pseries_le_defconfig
+++ b/arch/powerpc/configs/pseries_le_defconfig
@@ -48,7 +48,6 @@ CONFIG_KEXEC=y
48CONFIG_IRQ_ALL_CPUS=y 48CONFIG_IRQ_ALL_CPUS=y
49CONFIG_MEMORY_HOTPLUG=y 49CONFIG_MEMORY_HOTPLUG=y
50CONFIG_MEMORY_HOTREMOVE=y 50CONFIG_MEMORY_HOTREMOVE=y
51CONFIG_CMA=y
52CONFIG_PPC_64K_PAGES=y 51CONFIG_PPC_64K_PAGES=y
53CONFIG_PPC_SUBPAGE_PROT=y 52CONFIG_PPC_SUBPAGE_PROT=y
54CONFIG_SCHED_SMT=y 53CONFIG_SCHED_SMT=y
@@ -137,6 +136,7 @@ CONFIG_NETCONSOLE=y
137CONFIG_NETPOLL_TRAP=y 136CONFIG_NETPOLL_TRAP=y
138CONFIG_TUN=m 137CONFIG_TUN=m
139CONFIG_VIRTIO_NET=m 138CONFIG_VIRTIO_NET=m
139CONFIG_VHOST_NET=m
140CONFIG_VORTEX=y 140CONFIG_VORTEX=y
141CONFIG_ACENIC=m 141CONFIG_ACENIC=m
142CONFIG_ACENIC_OMIT_TIGON_I=y 142CONFIG_ACENIC_OMIT_TIGON_I=y
@@ -302,4 +302,9 @@ CONFIG_CRYPTO_LZO=m
302# CONFIG_CRYPTO_ANSI_CPRNG is not set 302# CONFIG_CRYPTO_ANSI_CPRNG is not set
303CONFIG_CRYPTO_DEV_NX=y 303CONFIG_CRYPTO_DEV_NX=y
304CONFIG_CRYPTO_DEV_NX_ENCRYPT=m 304CONFIG_CRYPTO_DEV_NX_ENCRYPT=m
305CONFIG_VIRTUALIZATION=y
306CONFIG_KVM_BOOK3S_64=m
307CONFIG_KVM_BOOK3S_64_HV=y
308CONFIG_TRANSPARENT_HUGEPAGE=y
309CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
305CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y 310CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y