diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2014-01-29 12:29:01 -0500 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-01-29 12:29:01 -0500 |
| commit | b73117c49364551ff789db7c424a115ac5b77850 (patch) | |
| tree | e151d34e68ef6061f1ac10f5db0aff262dc3aff5 /arch/powerpc/Kconfig | |
| parent | 77f01bdfa5e55dc19d3eb747181d2730a9bb3ca8 (diff) | |
| parent | 4068890931f62752abc3591e7b3736e7537c6dcb (diff) | |
Merge branch 'kvm-ppc-next' of git://github.com/agraf/linux-2.6 into kvm-queue
Conflicts:
arch/powerpc/kvm/book3s_hv_rmhandlers.S
arch/powerpc/kvm/booke.c
Diffstat (limited to 'arch/powerpc/Kconfig')
| -rw-r--r-- | arch/powerpc/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index b2be8e8cb5c7..805420853ac1 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
| @@ -343,6 +343,8 @@ config PPC_TRANSACTIONAL_MEM | |||
| 343 | bool "Transactional Memory support for POWERPC" | 343 | bool "Transactional Memory support for POWERPC" |
| 344 | depends on PPC_BOOK3S_64 | 344 | depends on PPC_BOOK3S_64 |
| 345 | depends on SMP | 345 | depends on SMP |
| 346 | select ALTIVEC | ||
| 347 | select VSX | ||
| 346 | default n | 348 | default n |
| 347 | ---help--- | 349 | ---help--- |
| 348 | Support user-mode Transactional Memory on POWERPC. | 350 | Support user-mode Transactional Memory on POWERPC. |