Merge branch 'topic/ppc-kvm' into next

[sfrench/cifs-2.6.git] / arch / powerpc / kernel / process.c

diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index 225705aac814ba84ff5f65d8d52d910e00b473d4..64e1494d3a1d4fae638e7ff34a320e4aed456ca4 100644 (file)
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -1730,7 +1730,8 @@ void start_thread(struct pt_regs *regs, unsigned long start, unsigned long sp)
        unsigned long load_addr = regs->gpr[2]; /* saved by ELF_PLAT_INIT */
 
 #ifdef CONFIG_PPC_BOOK3S_64
-       preload_new_slb_context(start, sp);
+       if (!radix_enabled())
+               preload_new_slb_context(start, sp);
 #endif
 #endif