diff options
author | Alexander Graf <agraf@suse.de> | 2010-08-17 16:08:39 -0400 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2010-10-24 04:52:19 -0400 |
commit | 591bd8e7b4c8b9246d7a1c81ffbd28e35dc5de4e (patch) | |
tree | 5d512d445bb6d74cc0d9e2bc84fc28d265d03c9c /arch/powerpc/kernel | |
parent | ebc65874e9e8f3b8bbbc69aa49acd7489cd41c52 (diff) |
KVM: PPC: Enable napping only for Book3s_64
Before I incorrectly enabled napping also for BookE, which would result in
needless dcache flushes. Since we only need to force enable napping on
Book3s_64 because it doesn't go into MSR_POW otherwise, we can just #ifdef
that code to this particular platform.
Reported-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'arch/powerpc/kernel')
-rw-r--r-- | arch/powerpc/kernel/kvm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/kvm.c b/arch/powerpc/kernel/kvm.c index 669d989be1d6..428d0e538aec 100644 --- a/arch/powerpc/kernel/kvm.c +++ b/arch/powerpc/kernel/kvm.c | |||
@@ -582,8 +582,10 @@ static int __init kvm_guest_init(void) | |||
582 | if (kvm_para_has_feature(KVM_FEATURE_MAGIC_PAGE)) | 582 | if (kvm_para_has_feature(KVM_FEATURE_MAGIC_PAGE)) |
583 | kvm_use_magic_page(); | 583 | kvm_use_magic_page(); |
584 | 584 | ||
585 | #ifdef CONFIG_PPC_BOOK3S_64 | ||
585 | /* Enable napping */ | 586 | /* Enable napping */ |
586 | powersave_nap = 1; | 587 | powersave_nap = 1; |
588 | #endif | ||
587 | 589 | ||
588 | free_tmp: | 590 | free_tmp: |
589 | kvm_free_tmp(); | 591 | kvm_free_tmp(); |