From d5646273f7c9e564646fa34c553e0e8468186e2f Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Tue, 17 Aug 2010 22:08:39 +0200
Subject: [PATCH] --- yaml --- r: 215847 b: refs/heads/master c:
 591bd8e7b4c8b9246d7a1c81ffbd28e35dc5de4e h: refs/heads/master i:   215845:
 a73094d6b87dc5550bd50e37d2826c532a17b675   215843:
 5082be1389ca358e240c11b2dfacf409464abead   215839:
 9935b60867f45b37d6988b3a7715e56a1bd080eb v: v3

---
 [refs]                          | 2 +-
 trunk/arch/powerpc/kernel/kvm.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 47bd88bbb460..2e257b6f4195 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ebc65874e9e8f3b8bbbc69aa49acd7489cd41c52
+refs/heads/master: 591bd8e7b4c8b9246d7a1c81ffbd28e35dc5de4e
diff --git a/trunk/arch/powerpc/kernel/kvm.c b/trunk/arch/powerpc/kernel/kvm.c
index 669d989be1d6..428d0e538aec 100644
--- a/trunk/arch/powerpc/kernel/kvm.c
+++ b/trunk/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();