1 files changed, 26 insertions, 6 deletions

diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index 8a1b001d0b11..7949c203cb89 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -354,6 +354,14 @@ static void show_instructions(struct pt_regs *regs)
                 if (!(i % 8))
                         printk("\n");
 
+#if !defined(CONFIG_BOOKE)
+                /* If executing with the IMMU off, adjust pc rather
+                 * than print XXXXXXXX.
+                 */
+                if (!(regs->msr & MSR_IR))
+                        pc = (unsigned long)phys_to_virt(pc);
+#endif
+
                 /* We use __get_user here *only* to avoid an OOPS on a
                  * bad address because the pc *should* only be a
                  * kernel address.
@@ -556,10 +564,15 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
 
 #ifdef CONFIG_PPC64
         if (cpu_has_feature(CPU_FTR_SLB)) {
-                unsigned long sp_vsid = get_kernel_vsid(sp);
+                unsigned long sp_vsid;
                 unsigned long llp = mmu_psize_defs[mmu_linear_psize].sllp;
 
-                sp_vsid <<= SLB_VSID_SHIFT;
+                if (cpu_has_feature(CPU_FTR_1T_SEGMENT))
+                        sp_vsid = get_kernel_vsid(sp, MMU_SEGSIZE_1T)
+                                << SLB_VSID_SHIFT_1T;
+                else
+                        sp_vsid = get_kernel_vsid(sp, MMU_SEGSIZE_256M)
+                                << SLB_VSID_SHIFT;
                 sp_vsid |= SLB_VSID_KERNEL | llp;
                 p->thread.ksp_vsid = sp_vsid;
         }
@@ -676,9 +689,13 @@ int set_fpexc_mode(struct task_struct *tsk, unsigned int val)
          * mode (asyn, precise, disabled) for 'Classic' FP. */
         if (val & PR_FP_EXC_SW_ENABLE) {
 #ifdef CONFIG_SPE
-                tsk->thread.fpexc_mode = val &
-                        (PR_FP_EXC_SW_ENABLE | PR_FP_ALL_EXCEPT);
-                return 0;
+                if (cpu_has_feature(CPU_FTR_SPE)) {
+                        tsk->thread.fpexc_mode = val &
+                                (PR_FP_EXC_SW_ENABLE | PR_FP_ALL_EXCEPT);
+                        return 0;
+                } else {
+                        return -EINVAL;
+                }
 #else
                 return -EINVAL;
 #endif
@@ -704,7 +721,10 @@ int get_fpexc_mode(struct task_struct *tsk, unsigned long adr)
 
         if (tsk->thread.fpexc_mode & PR_FP_EXC_SW_ENABLE)
 #ifdef CONFIG_SPE
-                val = tsk->thread.fpexc_mode;
+                if (cpu_has_feature(CPU_FTR_SPE))
+                        val = tsk->thread.fpexc_mode;
+                else
+                        return -EINVAL;
 #else
                 return -EINVAL;
 #endif