From 62423f91a990d5e1439ac6137ae834b44e5f35a2 Mon Sep 17 00:00:00 2001
From: Scott Wood <scottwood@freescale.com>
Date: Mon, 18 Oct 2010 17:35:48 -0500
Subject: [PATCH] --- yaml --- r: 221650 b: refs/heads/master c:
 a36be1003a80197714fc2b6e198df2f31f9eb270 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 49d87fa79361..de4a14ba7c06 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 453d9c57e27b4401bc3e98906bcac31ae8be0165
+refs/heads/master: a36be1003a80197714fc2b6e198df2f31f9eb270
diff --git a/trunk/arch/powerpc/kernel/kvm.c b/trunk/arch/powerpc/kernel/kvm.c
index 428d0e538aec..b06bdae04064 100644
--- a/trunk/arch/powerpc/kernel/kvm.c
+++ b/trunk/arch/powerpc/kernel/kvm.c
@@ -127,7 +127,7 @@ static void kvm_patch_ins_nop(u32 *inst)
 
 static void kvm_patch_ins_b(u32 *inst, int addr)
 {
-#ifdef CONFIG_RELOCATABLE
+#if defined(CONFIG_RELOCATABLE) && defined(CONFIG_PPC_BOOK3S)
 	/* On relocatable kernels interrupts handlers and our code
 	   can be in different regions, so we don't patch them */