diff options
author | Anton Blanchard <anton@samba.org> | 2014-10-13 05:17:33 -0400 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2014-10-16 02:37:44 -0400 |
commit | 86be175a730bd98de2b75522eae08160ec2dec91 (patch) | |
tree | c44fbe0244fb71b0b71dd50c2e19cd6dae35e5c2 /arch/powerpc/configs/pseries_le_defconfig | |
parent | 2c186e05a5c6dc8fcfb1e8bf6901ad1598c40db6 (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_defconfig | 7 |
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 | |||
48 | CONFIG_IRQ_ALL_CPUS=y | 48 | CONFIG_IRQ_ALL_CPUS=y |
49 | CONFIG_MEMORY_HOTPLUG=y | 49 | CONFIG_MEMORY_HOTPLUG=y |
50 | CONFIG_MEMORY_HOTREMOVE=y | 50 | CONFIG_MEMORY_HOTREMOVE=y |
51 | CONFIG_CMA=y | ||
52 | CONFIG_PPC_64K_PAGES=y | 51 | CONFIG_PPC_64K_PAGES=y |
53 | CONFIG_PPC_SUBPAGE_PROT=y | 52 | CONFIG_PPC_SUBPAGE_PROT=y |
54 | CONFIG_SCHED_SMT=y | 53 | CONFIG_SCHED_SMT=y |
@@ -137,6 +136,7 @@ CONFIG_NETCONSOLE=y | |||
137 | CONFIG_NETPOLL_TRAP=y | 136 | CONFIG_NETPOLL_TRAP=y |
138 | CONFIG_TUN=m | 137 | CONFIG_TUN=m |
139 | CONFIG_VIRTIO_NET=m | 138 | CONFIG_VIRTIO_NET=m |
139 | CONFIG_VHOST_NET=m | ||
140 | CONFIG_VORTEX=y | 140 | CONFIG_VORTEX=y |
141 | CONFIG_ACENIC=m | 141 | CONFIG_ACENIC=m |
142 | CONFIG_ACENIC_OMIT_TIGON_I=y | 142 | CONFIG_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 |
303 | CONFIG_CRYPTO_DEV_NX=y | 303 | CONFIG_CRYPTO_DEV_NX=y |
304 | CONFIG_CRYPTO_DEV_NX_ENCRYPT=m | 304 | CONFIG_CRYPTO_DEV_NX_ENCRYPT=m |
305 | CONFIG_VIRTUALIZATION=y | ||
306 | CONFIG_KVM_BOOK3S_64=m | ||
307 | CONFIG_KVM_BOOK3S_64_HV=y | ||
308 | CONFIG_TRANSPARENT_HUGEPAGE=y | ||
309 | CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y | ||
305 | CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y | 310 | CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y |