---

yaml --- r: 221650 b: refs/heads/master c: a36be10 h: refs/heads/master v: v3
git-mirror · Nov 5, 2010 · 62423f9 · 62423f9
1 parent 51cebb7
commit 62423f9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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 */