From: Alexander Graf <agraf@suse.de>
Date: Tue, 17 Aug 2010 20:08:39 +0000 (+0200)
Subject: KVM: PPC: Enable napping only for Book3s_64
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=591bd8e7b4c8b9246d7a1c81ffbd28e35dc5de4e;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

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>
---

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)
 	if (kvm_para_has_feature(KVM_FEATURE_MAGIC_PAGE))
 		kvm_use_magic_page();
 
+#ifdef CONFIG_PPC_BOOK3S_64
 	/* Enable napping */
 	powersave_nap = 1;
+#endif
 
 free_tmp:
 	kvm_free_tmp();