git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
[pandora-kernel.git]
/
arch
/
powerpc
/
kernel
/
kvm.c
diff --git
a/arch/powerpc/kernel/kvm.c
b/arch/powerpc/kernel/kvm.c
index
428d0e5
..
b06bdae
100644
(file)
--- a/
arch/powerpc/kernel/kvm.c
+++ b/
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)
{
static void kvm_patch_ins_b(u32 *inst, int addr)
{
-#if
def 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 */
/* On relocatable kernels interrupts handlers and our code
can be in different regions, so we don't patch them */