1 files changed, 2 insertions, 2 deletions

diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index ec2d0edeb134..8f53954e75a3 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -654,6 +654,8 @@ void show_regs(struct pt_regs * regs)
         printbits(regs->msr, msr_bits);
         printk("  CR: %08lx  XER: %08lx\n", regs->ccr, regs->xer);
         trap = TRAP(regs);
+        if ((regs->trap != 0xc00) && cpu_has_feature(CPU_FTR_CFAR))
+                printk("CFAR: "REG"\n", regs->orig_gpr3);
         if (trap == 0x300 || trap == 0x600)
 #ifdef CONFIG_PPC_ADV_DEBUG_REGS
                 printk("DEAR: "REG", ESR: "REG"\n", regs->dar, regs->dsisr);
@@ -835,8 +837,6 @@ 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 */
 #endif
 
-        set_fs(USER_DS);
-
         /*
          * If we exec out of a kernel thread then thread.regs will not be
          * set.  Do it now.