diff options
| author | Avi Kivity <avi@redhat.com> | 2012-06-06 15:31:34 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2012-06-06 15:31:34 +0300 |
| commit | 25e531a988ea5a64bd97a72dc9d3c65ad5850120 (patch) | |
| tree | 5e5b7450fe08e4818a49b4248c9400a08b4cc463 /arch/powerpc/platforms | |
| parent | 79f702a6d18c75760c68202007265b2310d6f44e (diff) | |
| parent | d35b1075afc0172caa44b57b56a2b9b57e06d32e (diff) | |
Merge branch 'for-upstream' of git://github.com/agraf/linux-2.6 into next
Alex says:
"Changes this time include:
- Generalize KVM_GUEST support to overall ePAPR code
- Fix reset for Book3S HV
- Fix machine check deferral when CONFIG_KVM_GUEST=y
- Add support for BookE register DECAR"
* 'for-upstream' of git://github.com/agraf/linux-2.6:
KVM: PPC: Not optimizing MSR_CE and MSR_ME with paravirt.
KVM: PPC: booke: Added DECAR support
KVM: PPC: Book3S HV: Make the guest hash table size configurable
KVM: PPC: Factor out guest epapr initialization
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/powerpc/platforms')
| -rw-r--r-- | arch/powerpc/platforms/Kconfig | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig index a35ca44ade66..e7a896acd982 100644 --- a/arch/powerpc/platforms/Kconfig +++ b/arch/powerpc/platforms/Kconfig @@ -25,6 +25,7 @@ source "arch/powerpc/platforms/wsp/Kconfig" config KVM_GUEST bool "KVM Guest support" default n + select EPAPR_PARAVIRT ---help--- This option enables various optimizations for running under the KVM hypervisor. Overhead for the kernel when not running inside KVM should @@ -32,6 +33,14 @@ config KVM_GUEST In case of doubt, say Y +config EPAPR_PARAVIRT + bool "ePAPR para-virtualization support" + default n + help + Enables ePAPR para-virtualization support for guests. + + In case of doubt, say Y + config PPC_NATIVE bool depends on 6xx || PPC64 |